Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 8c019917 编写于 作者: M Manish Vasani
浏览文件
操作

Resolve some more merge conflicts.

上级 7a62d3ee
展开全部 隐藏空白更改
内联 并排
Showing with 930 addition and 4 deletion
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
浏览文件 @ 8c019917
......@@ -396,7 +396,7 @@ public async Task<ImmutableArray<Diagnostic>> GetDiagnosticsAsync(Compilation co
if (reportSuppressedDiagnostics || !d.IsSuppressed)
{
allDiagnostics.Add(d);
}
}
}
return allDiagnostics.ToReadOnlyAndFree();
......@@ -635,7 +635,7 @@ private async Task ProcessEventAsync(CompilationEvent e, AnalysisScope analysisS
if (analysisStateOpt != null)
{
await analysisStateOpt.OnCompilationEventProcessedAsync(e, analysisScope, cancellationToken).ConfigureAwait(false);
}
}
}
private async Task ProcessEventCoreAsync(CompilationEvent e, AnalysisScope analysisScope, AnalysisState analysisStateOpt, CancellationToken cancellationToken)
......@@ -991,14 +991,14 @@ internal AnalyzerDriver(ImmutableArray<DiagnosticAnalyzer> analyzers, Func<Synta
if (analyzerAndActions.Any())
{
actionsByKind = AnalyzerExecutor.GetOperationActionsByKind(analyzerAndActions);
}
}
else
{
actionsByKind = ImmutableDictionary<OperationKind, ImmutableArray<OperationAnalyzerAction>>.Empty;
}
builder.Add(analyzerAndActions.Key, actionsByKind);
}
}
analyzerActionsByKind = builder.ToImmutable();
}
......
src/Test/Utilities/Portable.FX45/project.lock.json
浏览文件 @ 8c019917
......@@ -233,6 +233,468 @@
}
}
},
".NETFramework,Version=v4.5/osx.10.10": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary/1.2.0-beta-20151016-11": {
"compile": {
"lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
},
"runtime": {
"lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
}
},
"Microsoft.DiaSymReader/1.0.6": {
"compile": {
"lib/net20/Microsoft.DiaSymReader.dll": {}
},
"runtime": {
"lib/net20/Microsoft.DiaSymReader.dll": {}
}
},
"Microsoft.DiaSymReader.Native/1.3.3": {},
"System.Collections/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Collections.Immutable/1.1.37": {
"dependencies": {
"System.Collections": "[4.0.0, )",
"System.Diagnostics.Debug": "[4.0.0, )",
"System.Globalization": "[4.0.0, )",
"System.Linq": "[4.0.0, )",
"System.Resources.ResourceManager": "[4.0.0, )",
"System.Runtime": "[4.0.0, )",
"System.Runtime.Extensions": "[4.0.0, )",
"System.Threading": "[4.0.0, )"
},
"compile": {
"lib/dotnet/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/dotnet/System.Collections.Immutable.dll": {}
}
},
"System.Diagnostics.Debug/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Globalization/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.IO/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Linq/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection.Metadata/1.1.0": {
"dependencies": {
"System.Collections": "[4.0.0, )",
"System.Collections.Immutable": "[1.1.37, )",
"System.Diagnostics.Debug": "[4.0.0, )",
"System.IO": "[4.0.0, )",
"System.Reflection": "[4.0.0, )",
"System.Reflection.Extensions": "[4.0.0, )",
"System.Reflection.Primitives": "[4.0.0, )",
"System.Resources.ResourceManager": "[4.0.0, )",
"System.Runtime": "[4.0.0, )",
"System.Runtime.Extensions": "[4.0.0, )",
"System.Runtime.InteropServices": "[4.0.0, )",
"System.Text.Encoding": "[4.0.0, )",
"System.Text.Encoding.Extensions": "[4.0.0, )",
"System.Threading": "[4.0.0, )"
},
"compile": {
"lib/dotnet5.2/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/dotnet5.2/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Resources.ResourceManager/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime.InteropServices/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Text.Encoding/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Text.Encoding.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Threading/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"xunit/2.1.0": {
"dependencies": {
"xunit.assert": "[2.1.0, 2.1.0]",
"xunit.core": "[2.1.0, 2.1.0]"
}
},
"xunit.abstractions/2.0.0": {
"compile": {
"lib/net35/xunit.abstractions.dll": {}
},
"runtime": {
"lib/net35/xunit.abstractions.dll": {}
}
},
"xunit.assert/2.1.0": {
"compile": {
"lib/dotnet/xunit.assert.dll": {}
},
"runtime": {
"lib/dotnet/xunit.assert.dll": {}
}
},
"xunit.core/2.1.0": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0, 2.1.0]",
"xunit.extensibility.execution": "[2.1.0, 2.1.0]"
}
},
"xunit.extensibility.core/2.1.0": {
"dependencies": {
"xunit.abstractions": "[2.0.0, 2.0.0]"
},
"compile": {
"lib/dotnet/xunit.core.dll": {}
},
"runtime": {
"lib/dotnet/xunit.core.dll": {}
}
},
"xunit.extensibility.execution/2.1.0": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0, 2.1.0]"
},
"compile": {
"lib/net45/xunit.execution.desktop.dll": {}
},
"runtime": {
"lib/net45/xunit.execution.desktop.dll": {}
}
}
},
".NETFramework,Version=v4.5/osx.10.10-anycpu": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary/1.2.0-beta-20151016-11": {
"compile": {
"lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
},
"runtime": {
"lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
}
},
"Microsoft.DiaSymReader/1.0.6": {
"compile": {
"lib/net20/Microsoft.DiaSymReader.dll": {}
},
"runtime": {
"lib/net20/Microsoft.DiaSymReader.dll": {}
}
},
"Microsoft.DiaSymReader.Native/1.3.3": {},
"System.Collections/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Collections.Immutable/1.1.37": {
"dependencies": {
"System.Collections": "[4.0.0, )",
"System.Diagnostics.Debug": "[4.0.0, )",
"System.Globalization": "[4.0.0, )",
"System.Linq": "[4.0.0, )",
"System.Resources.ResourceManager": "[4.0.0, )",
"System.Runtime": "[4.0.0, )",
"System.Runtime.Extensions": "[4.0.0, )",
"System.Threading": "[4.0.0, )"
},
"compile": {
"lib/dotnet/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/dotnet/System.Collections.Immutable.dll": {}
}
},
"System.Diagnostics.Debug/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Globalization/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.IO/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Linq/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Reflection.Metadata/1.1.0": {
"dependencies": {
"System.Collections": "[4.0.0, )",
"System.Collections.Immutable": "[1.1.37, )",
"System.Diagnostics.Debug": "[4.0.0, )",
"System.IO": "[4.0.0, )",
"System.Reflection": "[4.0.0, )",
"System.Reflection.Extensions": "[4.0.0, )",
"System.Reflection.Primitives": "[4.0.0, )",
"System.Resources.ResourceManager": "[4.0.0, )",
"System.Runtime": "[4.0.0, )",
"System.Runtime.Extensions": "[4.0.0, )",
"System.Runtime.InteropServices": "[4.0.0, )",
"System.Text.Encoding": "[4.0.0, )",
"System.Text.Encoding.Extensions": "[4.0.0, )",
"System.Threading": "[4.0.0, )"
},
"compile": {
"lib/dotnet5.2/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/dotnet5.2/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Resources.ResourceManager/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Runtime.InteropServices/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Text.Encoding/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Text.Encoding.Extensions/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"System.Threading/4.0.0": {
"compile": {
"ref/net45/_._": {}
},
"runtime": {
"lib/net45/_._": {}
}
},
"xunit/2.1.0": {
"dependencies": {
"xunit.assert": "[2.1.0, 2.1.0]",
"xunit.core": "[2.1.0, 2.1.0]"
}
},
"xunit.abstractions/2.0.0": {
"compile": {
"lib/net35/xunit.abstractions.dll": {}
},
"runtime": {
"lib/net35/xunit.abstractions.dll": {}
}
},
"xunit.assert/2.1.0": {
"compile": {
"lib/dotnet/xunit.assert.dll": {}
},
"runtime": {
"lib/dotnet/xunit.assert.dll": {}
}
},
"xunit.core/2.1.0": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0, 2.1.0]",
"xunit.extensibility.execution": "[2.1.0, 2.1.0]"
}
},
"xunit.extensibility.core/2.1.0": {
"dependencies": {
"xunit.abstractions": "[2.0.0, 2.0.0]"
},
"compile": {
"lib/dotnet/xunit.core.dll": {}
},
"runtime": {
"lib/dotnet/xunit.core.dll": {}
}
},
"xunit.extensibility.execution/2.1.0": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0, 2.1.0]"
},
"compile": {
"lib/net45/xunit.execution.desktop.dll": {}
},
"runtime": {
"lib/net45/xunit.execution.desktop.dll": {}
}
}
},
".NETFramework,Version=v4.5/ubuntu.14.04": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary/1.2.0-beta-20151016-11": {
"compile": {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或