Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
336cd2dc
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
336cd2dc
编写于
4月 11, 2019
作者:
A
Andrew Hall
提交者:
GitHub
4月 11, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #34914 Update upgrade fixer
Don’t suggest upgrading to an unsupported state
上级
af116e7d
e42bef98
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
19 deletion
+44
-19
src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
...arpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
+30
-17
src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
...ble/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
+4
-1
src/Features/Core/Portable/UpgradeProject/AbstractUpgradeProjectCodeFixProvider.cs
...e/UpgradeProject/AbstractUpgradeProjectCodeFixProvider.cs
+10
-1
未找到文件。
src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
浏览文件 @
336cd2dc
...
...
@@ -2,6 +2,7 @@
using
System
;
using
System.Linq
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.CodeFixes
;
using
Microsoft.CodeAnalysis.CSharp
;
...
...
@@ -46,10 +47,27 @@ internal override (DiagnosticAnalyzer, CodeFixProvider) CreateDiagnosticProvider
await
TestAsync
(
initialMarkup
,
initialMarkup
,
parseOptions
);
// no change to markup
}
private
async
Task
TestLanguageVersionNotUpgradedAsync
(
string
initialMarkup
,
#pragma warning disable IDE0060 // Remove unused parameter
LanguageVersion
expected
,
#pragma warning restore IDE0060 // Remove unused parameter
ParseOptions
parseOptions
,
int
index
=
0
)
{
var
parameters
=
new
TestParameters
(
parseOptions
:
parseOptions
,
index
:
index
);
using
(
var
workspace
=
CreateWorkspaceFromOptions
(
initialMarkup
,
parameters
))
{
var
(
actions
,
actionsToInvoke
)
=
await
GetCodeActionsAsync
(
workspace
,
parameters
);
Assert
.
Empty
(
actions
);
Assert
.
Null
(
actionsToInvoke
);
}
}
[
Fact
]
public
async
Task
UpgradeProjectFromCSharp7_2ToCSharp8
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"class C
{
object F = [|null!|];
...
...
@@ -61,7 +79,7 @@ public async Task UpgradeProjectFromCSharp7_2ToCSharp8()
[
Fact
]
public
async
Task
UpgradeProjectFromCSharp7ToCSharp8
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"class C
{
object F = [|null!|];
...
...
@@ -321,7 +339,7 @@ class Program
[
Fact
]
public
async
Task
UpgradeProjectForVerbatimInterpolatedString
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
class Program
{
...
...
@@ -366,7 +384,7 @@ void A()
[
Fact
]
public
async
Task
UpgradeAllProjectsToCSharp8
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"<Workspace>
<Project Language=""C#"" LanguageVersion=""6"">
<Document>
...
...
@@ -471,10 +489,8 @@ void A()
<Project Language=""C#"" LanguageVersion=""800"">
</Project>
</Workspace>"
,
new
[]
{
string
.
Format
(
CSharpFeaturesResources
.
Upgrade_this_project_to_csharp_language_version_0
,
versionPreview
),
string
.
Format
(
CSharpFeaturesResources
.
Upgrade_all_csharp_projects_to_language_version_0
,
versionPreview
)
});
new
string
[
0
]
);
}
[
Fact
]
...
...
@@ -578,10 +594,7 @@ class C
<Project Language=""Visual Basic"">
</Project>
</Workspace>"
,
new
[]
{
string
.
Format
(
CSharpFeaturesResources
.
Upgrade_this_project_to_csharp_language_version_0
,
previewVersion
),
string
.
Format
(
CSharpFeaturesResources
.
Upgrade_all_csharp_projects_to_language_version_0
,
previewVersion
)
});
new
string
[
0
]);
}
[
Fact
]
...
...
@@ -737,7 +750,7 @@ public void N()
[
Fact
]
public
async
Task
UpgradeProjectForDefaultInterfaceImplementation_CS8703
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
public interface I1
{
...
...
@@ -751,7 +764,7 @@ public interface I1
[
Fact
]
public
async
Task
UpgradeProjectForDefaultInterfaceImplementation_CS8706
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
<Workspace>
<Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
...
...
@@ -780,7 +793,7 @@ void M1()
[
Fact
]
public
async
Task
UpgradeProjectWithOpenTypeMatchingConstantPattern_01
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
class Test
{
...
...
@@ -793,7 +806,7 @@ class Test
[
Fact
]
public
async
Task
UpgradeProjectWithOpenTypeMatchingConstantPattern_02
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
class Test
{
...
...
@@ -806,7 +819,7 @@ class Test
[
Fact
]
public
async
Task
UpgradeProjectWithOpenTypeMatchingConstantPattern_03
()
{
await
TestLanguageVersionUpgradedAsync
(
await
TestLanguageVersion
Not
UpgradedAsync
(
@"
class Test
{
...
...
src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
浏览文件 @
336cd2dc
...
...
@@ -85,8 +85,11 @@ public override bool IsUpgrade(ParseOptions projectOptions, string newVersion)
var
parseOptions
=
(
CSharpParseOptions
)
projectOptions
;
Contract
.
ThrowIfFalse
(
LanguageVersionFacts
.
TryParse
(
newVersion
,
out
var
parsedNewVersion
));
var
mappedVersion
=
parsedNewVersion
.
MapSpecifiedToEffectiveVersion
();
// treat equivalent versions (one generic and one specific) to be a valid upgrade
return
parsedNewVersion
.
MapSpecifiedToEffectiveVersion
()
>=
parseOptions
.
LanguageVersion
&&
return
mappedVersion
>=
parseOptions
.
LanguageVersion
&&
mappedVersion
<
LanguageVersion
.
CSharp8
&&
parseOptions
.
SpecifiedLanguageVersion
.
ToDisplayString
()
!=
newVersion
;
}
}
...
...
src/Features/Core/Portable/UpgradeProject/AbstractUpgradeProjectCodeFixProvider.cs
浏览文件 @
336cd2dc
...
...
@@ -39,15 +39,24 @@ protected ImmutableArray<CodeAction> GetUpgradeProjectCodeActionsAsync(CodeFixCo
var
project
=
context
.
Document
.
Project
;
var
solution
=
project
.
Solution
;
var
newVersion
=
SuggestedVersion
(
context
.
Diagnostics
);
var
result
=
new
List
<
CodeAction
>();
var
language
=
project
.
Language
;
var
upgradeableProjects
=
solution
.
Projects
.
Where
(
p
=>
CanUpgrade
(
p
,
language
,
newVersion
)).
AsImmutable
();
if
(
upgradeableProjects
.
Length
==
0
)
{
return
ImmutableArray
<
CodeAction
>.
Empty
;
}
var
fixOneProjectTitle
=
string
.
Format
(
UpgradeThisProjectResource
,
newVersion
);
var
fixOneProject
=
new
ProjectOptionsChangeAction
(
fixOneProjectTitle
,
_
=>
Task
.
FromResult
(
UpgradeProject
(
project
,
newVersion
)));
result
.
Add
(
fixOneProject
);
if
(
solution
.
Projects
.
Count
(
p
=>
CanUpgrade
(
p
,
language
,
newVersion
))
>
1
)
if
(
upgradeableProjects
.
Length
>
1
)
{
var
fixAllProjectsTitle
=
string
.
Format
(
UpgradeAllProjectsResource
,
newVersion
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录