Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
cf3206d2
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,发现更多精彩内容 >>
提交
cf3206d2
编写于
8月 24, 2017
作者:
N
Nat Ayewah
提交者:
GitHub
8月 24, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21715 from dotnet/merges/dev15.4.x-to-master-20170824-070011
Merge dev15.4.x to master
上级
250fac98
1d31b1b0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
61 addition
and
16 deletion
+61
-16
build/Targets/Packages.props
build/Targets/Packages.props
+1
-1
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs
...ilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs
+28
-0
src/VisualStudio/Core/Def/Implementation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
...mentation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
+18
-15
src/VisualStudio/Core/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb
...e/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb
+14
-0
未找到文件。
build/Targets/Packages.props
浏览文件 @
cf3206d2
...
...
@@ -139,7 +139,7 @@
<RestSharpVersion>
105.2.3
</RestSharpVersion>
<RoslynBuildUtilVersion>
0.9.8-beta
</RoslynBuildUtilVersion>
<RoslynDependenciesMicrosoftVisualStudioWorkspaceVersion>
14.0.983-pre-ge167e81694
</RoslynDependenciesMicrosoftVisualStudioWorkspaceVersion>
<RoslynDependenciesOptimizationDataVersion>
2.
3.0-beta3-61801-06
</RoslynDependenciesOptimizationDataVersion>
<RoslynDependenciesOptimizationDataVersion>
2.
6.0-beta1-62010-04
</RoslynDependenciesOptimizationDataVersion>
<RoslynToolsMicrosoftLocateVSVersion>
0.2.4-beta
</RoslynToolsMicrosoftLocateVSVersion>
<RoslynToolsMicrosoftSignToolVersion>
0.3.0-beta
</RoslynToolsMicrosoftSignToolVersion>
<RoslynToolsMicrosoftVSIXExpInstallerVersion>
0.4.0-beta
</RoslynToolsMicrosoftVSIXExpInstallerVersion>
...
...
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs
浏览文件 @
cf3206d2
...
...
@@ -7703,6 +7703,34 @@ static void Main()
CompileAndVerify
(
comp
,
expectedOutput
:
"once"
);
}
[
WorkItem
(
21028
,
"https://github.com/dotnet/roslyn/issues/21028"
)]
[
Fact
]
public
void
InferredName
()
{
var
source
=
@"class C
{
static void Main()
{
int x = 0, y = 1;
var t = (x, y);
var (a, b) = t;
}
}"
;
// C# 7.0
var
comp
=
CreateStandardCompilation
(
source
,
parseOptions
:
TestOptions
.
Regular
.
WithLanguageVersion
(
LanguageVersion
.
CSharp7
),
references
:
new
[]
{
ValueTupleRef
,
SystemRuntimeFacadeRef
});
comp
.
VerifyEmitDiagnostics
();
// C# 7.1
comp
=
CreateStandardCompilation
(
source
,
parseOptions
:
TestOptions
.
Regular
.
WithLanguageVersion
(
LanguageVersion
.
CSharp7_1
),
references
:
new
[]
{
ValueTupleRef
,
SystemRuntimeFacadeRef
});
comp
.
VerifyEmitDiagnostics
();
}
[
WorkItem
(
21028
,
"https://github.com/dotnet/roslyn/issues/21028"
)]
[
Fact
]
public
void
InferredName_ConditionalOperator
()
...
...
src/VisualStudio/Core/Def/Implementation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
浏览文件 @
cf3206d2
...
...
@@ -418,26 +418,29 @@ public void Done()
public
bool
SupportedDiagnosticId
(
ProjectId
projectId
,
string
id
)
{
if
(
_diagnosticIdMap
.
TryGetValue
(
projectId
,
out
var
ids
)
)
lock
(
_diagnosticIdMap
)
{
return
ids
.
Contains
(
id
);
}
if
(
_diagnosticIdMap
.
TryGetValue
(
projectId
,
out
var
ids
))
{
return
ids
.
Contains
(
id
);
}
// set ids set
var
map
=
new
HashSet
<
string
>();
_diagnosticIdMap
.
Add
(
projectId
,
map
);
// set ids set
var
map
=
new
HashSet
<
string
>();
_diagnosticIdMap
.
Add
(
projectId
,
map
);
var
project
=
_solution
.
GetProject
(
projectId
);
if
(
project
==
null
)
{
// projectId no longer exist, return false;
return
false
;
}
var
project
=
_solution
.
GetProject
(
projectId
);
if
(
project
==
null
)
{
// projectId no longer exist, return false;
return
false
;
}
var
descriptorMap
=
_owner
.
_diagnosticService
.
GetDiagnosticDescriptors
(
project
);
map
.
UnionWith
(
descriptorMap
.
Values
.
SelectMany
(
v
=>
v
.
Select
(
d
=>
d
.
Id
)));
var
descriptorMap
=
_owner
.
_diagnosticService
.
GetDiagnosticDescriptors
(
project
);
map
.
UnionWith
(
descriptorMap
.
Values
.
SelectMany
(
v
=>
v
.
Select
(
d
=>
d
.
Id
)));
return
map
.
Contains
(
id
);
return
map
.
Contains
(
id
);
}
}
public
ImmutableArray
<
DiagnosticData
>
GetBuildDiagnostics
()
...
...
src/VisualStudio/Core/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb
浏览文件 @
cf3206d2
...
...
@@ -68,6 +68,20 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Diagnostics
End
Using
End
Sub
<
Fact
>
Public
Sub
TestExternalDiagnostics_SupportedDiagnosticId_Concurrent
()
Using
workspace
=
TestWorkspace
.
CreateCSharp
(
String
.
Empty
)
Dim
waiter
=
New
Waiter
()
Dim
service
=
New
TestDiagnosticAnalyzerService
()
Dim
source
=
New
ExternalErrorDiagnosticUpdateSource
(
workspace
,
service
,
New
MockDiagnosticUpdateSourceRegistrationService
(),
waiter
)
Dim
project
=
workspace
.
CurrentSolution
.
Projects
.
First
()
source
.
OnSolutionBuild
(
Me
,
Shell
.
UIContextChangedEventArgs
.
From
(
True
))
Parallel
.
For
(
0
,
100
,
Sub
(
i
As
Integer
)
source
.
SupportedDiagnosticId
(
project
.
Id
,
"CS1002"
))
End
Using
End
Sub
<
Fact
>
Public
Async
Function
TestExternalDiagnostics_DuplicatedError
()
As
Task
Using
workspace
=
TestWorkspace
.
CreateCSharp
(
String
.
Empty
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录