Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

提交 d184c2d8 编写于 作者: N Neal Gafter
浏览文件
操作

Merge branch 'future' of https://github.com/dotnet/roslyn into features/patterns

上级 4fc6720f 694d5d78
隐藏空白更改
内联 并排
Showing with 359 addition and 417 deletion
build/Targets/VSL.Versions.targets
浏览文件 @ d184c2d8
......@@ -5,8 +5,8 @@
<!-- Currently we version IW the same as Roslyn. -->
<MicrosoftVisualStudioInteractiveWindowVersion>$(RoslynSemanticVersion)</MicrosoftVisualStudioInteractiveWindowVersion>
<!-- These are the versions of dependencies we insert into VS -->
<SystemReflectionMetadataVersion>1.3.0-rc3-24005-00</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>1.2.0-rc3-24005-00</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>1.3.0-rc3-24011-00</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>1.2.0-rc3-24011-00</SystemCollectionsImmutableVersion>
<MicrosoftDiaSymReaderVersion>1.0.8-rc2-60325</MicrosoftDiaSymReaderVersion>
<MicrosoftDiaSymReaderNativeVersion>1.3.3</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion>
......
build/scripts/crossgen.sh
浏览文件 @ d184c2d8
......@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then
fi
# Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc3-24005-00/tools/crossgen
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc3-24011-00/tools/crossgen
cd $BIN_DIR
......
netci.groovy
浏览文件 @ d184c2d8
......@@ -2,94 +2,10 @@
// Jenkins DSL: https://github.com/jenkinsci/job-dsl-plugin/wiki
import jobs.generation.Utilities;
import static Constants.*;
def project = GithubProject
class Constants {
// Number of minutes a build job is given to complete.
static final BuildTimeLimit = 120;
}
static void addLogRotator(def myJob) {
myJob.with {
logRotator {
daysToKeep(90)
numToKeep(-1)
artifactDaysToKeep(21)
artifactNumToKeep(-1)
}
}
}
static void addConcurrentBuild(def myJob, String category) {
myJob.with {
concurrentBuild(true)
if (category != null) {
throttleConcurrentBuilds {
throttleDisabled(false)
maxTotal(0)
maxPerNode(1)
categories([category])
}
}
}
}
static void addScm(def myJob, String branchName, String refspecName = '') {
myJob.with {
scm {
git {
remote {
github('dotnet/roslyn', 'https', 'github.com')
name('')
refspec(refspecName)
}
branch(branchName)
wipeOutWorkspace(true)
shallowClone(true)
}
}
}
}
static void addWrappers(def myJob) {
myJob.with {
wrappers {
timeout {
absolute(BuildTimeLimit)
abortBuild()
}
timestamps()
}
}
}
static void addArtifactArchiving(def myJob, String patternString, String excludeString) {
myJob.with {
publishers {
flexiblePublish {
conditionalAction {
condition {
status('ABORTED', 'FAILURE')
}
publishers {
archiveArtifacts {
allowEmpty(true)
defaultExcludes(false)
exclude(excludeString)
fingerprint(false)
onlyIfSuccessful(false)
pattern(patternString)
}
}
}
}
}
}
}
// Email the results of aborted / failed jobs to our infrastructure alias
static void addEmailPublisher(def myJob) {
myJob.with {
publishers {
......@@ -101,94 +17,29 @@ static void addEmailPublisher(def myJob) {
}
}
static void addUnitPublisher(def myJob) {
myJob.with {
configure { node ->
node / 'publishers' << {
'xunit'('plugin': 'xunit@1.97') {
'types' {
'XUnitDotNetTestType' {
'pattern'('**/xUnitResults/*.xml')
'skipNoTestFiles'(false)
'failIfNotNew'(true)
'deleteOutputFiles'(true)
'stopProcessingIfError'(true)
}
}
'thresholds' {
'org.jenkinsci.plugins.xunit.threshold.FailedThreshold' {
'unstableThreshold'('')
'unstableNewThreshold'('')
'failureThreshold'('0')
'failureNewThreshold'('')
}
'org.jenkinsci.plugins.xunit.threshold.SkippedThreshold' {
'unstableThreshold'('')
'unstableNewThreshold'('')
'failureThreshold'('')
'failureNewThreshold'('')
}
}
'thresholdMode'('1')
'extraConfiguration' {
testTimeMargin('3000')
}
}
}
}
}
}
static void addPushTrigger(def myJob) {
myJob.with {
triggers {
githubPush()
}
}
}
// Generates the standard trigger phrases. This is the regex which ends up matching lines like:
// test win32 please
static String generateTriggerPhrase(String jobName, String opsysName, String triggerKeyword = 'this') {
return "(?i).*test\\W+(${jobName.replace('_', '/').substring(7)}|${opsysName}|${triggerKeyword}|${opsysName}\\W+${triggerKeyword}|${triggerKeyword}\\W+${opsysName})\\W+please.*";
}
static void addPullRequestTrigger(def myJob, String jobName, String triggerPhraseText, Boolean triggerPhraseOnly = false) {
myJob.with {
triggers {
pullRequest {
admin('Microsoft')
useGitHubHooks(true)
triggerPhrase(triggerPhraseText)
onlyTriggerPhrase(triggerPhraseOnly)
autoCloseFailedPullRequests(false)
orgWhitelist('Microsoft')
allowMembersOfWhitelistedOrgsAsAdmin(true)
permitAll(true)
extensions {
commitStatus {
context(jobName.replace('_', '/').substring(7))
}
}
}
}
}
}
static void addStandardJob(def myJob, String jobName, String branchName, String triggerPhrase, Boolean triggerPhraseOnly = false) {
addLogRotator(myJob)
addWrappers(myJob)
static void addRoslynJob(def myJob, String jobName, String branchName, String triggerPhrase, Boolean triggerPhraseOnly = false) {
def includePattern = "Binaries/**/*.pdb,Binaries/**/*.xml,Binaries/**/*.log,Binaries/**/*.dmp,Binaries/**/*.zip,Binaries/**/*.png,Binaries/**/*.xml"
def excludePattern = "Binaries/Obj/**,Binaries/Bootstrap/**,Binaries/**/nuget*.zip"
addArtifactArchiving(myJob, includePattern, excludePattern)
if (branchName == 'prtest') {
addPullRequestTrigger(myJob, jobName, triggerPhrase, triggerPhraseOnly);
addScm(myJob, '${sha1}', '+refs/pull/*:refs/remotes/origin/pr/*')
Utilities.addArchival(myJob, includePattern, excludePattern)
// Create the standard job. This will setup parameter, SCM, timeout, etc ...
def projectName = 'dotnet/roslyn'
def isPr = branchName == 'prtest'
def defaultBranch = "*/${branchName}"
Utilities.standardJobSetup(myJob, projectName, isPr, defaultBranch)
// Need to setup the triggers for the job
if (isPr) {
def contextName = jobName.replace('_', '/').substring(7)
Utilities.addGithubPRTrigger(myJob, contextName, triggerPhrase, triggerPhraseOnly)
} else {
addPushTrigger(myJob)
addScm(myJob, "*/${branchName}")
Utilities.addGithubPushTrigger(myJob)
addEmailPublisher(myJob)
}
}
......@@ -237,7 +88,6 @@ set TMP=%TEMP%
}
Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto')
// Generic throttling for Windows, no category
addConcurrentBuild(myJob, null)
break;
case 'linux':
myJob.with {
......@@ -246,7 +96,6 @@ set TMP=%TEMP%
shell("./cibuild.sh --nocache --debug")
}
}
addConcurrentBuild(myJob, 'roslyn/lin/unit')
break;
case 'mac':
myJob.with {
......@@ -255,13 +104,12 @@ set TMP=%TEMP%
shell("./cibuild.sh --nocache --debug")
}
}
addConcurrentBuild(myJob, 'roslyn/mac/unit')
triggerPhraseOnly = true;
break;
}
addUnitPublisher(myJob)
addStandardJob(myJob, jobName, branchName, triggerPhrase, triggerPhraseOnly);
Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
addRoslynJob(myJob, jobName, branchName, triggerPhrase, triggerPhraseOnly)
}
}
}
......@@ -284,7 +132,6 @@ set TMP=%TEMP%
}
Utilities.setMachineAffinity(determinismJob, 'Windows_NT', 'latest-or-auto')
addConcurrentBuild(determinismJob, null)
addStandardJob(determinismJob, determinismJobName, branchName, "(?i).*test\\W+determinism.*", true);
addRoslynJob(determinismJob, determinismJobName, branchName, "(?i).*test\\W+determinism.*", true);
}
src/Compilers/CSharp/Test/Performance/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0023",
"System.IO.FileSystem": "4.0.1-rc3-24005-00"
"System.IO.FileSystem": "4.0.1-rc3-24011-00"
},
"frameworks": {
"net46": {}
......
src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs
浏览文件 @ d184c2d8
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq;
using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using System.Linq;
using Xunit;
namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Metadata.PE
......@@ -105,5 +104,36 @@ public void Test1()
Assert.Equal(SymbolKind.Field, csFields.GetMembers("Fff").Single().Kind);
Assert.Equal(SymbolKind.Method, csFields.GetMembers("FfF").Single().Kind);
}
[Fact]
[WorkItem(193333, "https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?_a=edit&id=193333")]
public void EnumWithPrivateValueField()
{
var il = @"
.class public auto ansi sealed TestEnum
extends [mscorlib]System.Enum
{
.field private specialname rtspecialname int32 value__
.field public static literal valuetype TestEnum Value1 = int32(0x00000000)
.field public static literal valuetype TestEnum Value2 = int32(0x00000001)
} // end of class TestEnum
";
var text = @"
class Program
{
static void Main()
{
TestEnum val = TestEnum.Value1;
System.Console.WriteLine(val.ToString());
val = TestEnum.Value2;
System.Console.WriteLine(val.ToString());
}
}
";
var compilation = CreateCompilationWithCustomILSource(text, il, options:TestOptions.DebugExe);
CompileAndVerify(compilation, expectedOutput: @"Value1
Value2");
}
}
}
src/Compilers/Core/MSBuildTask/Portable/project.json
浏览文件 @ d184c2d8
......@@ -5,13 +5,13 @@
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00005",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
"Microsoft.Win32.Primitives": "4.0.0",
"System.Console": "4.0.0-rc3-24005-00",
"System.Console": "4.0.0-rc3-24011-00",
"System.Diagnostics.Tools": "4.0.0",
"System.Diagnostics.Process": "4.1.0-rc3-24005-00",
"System.IO.Pipes": "4.0.0-rc3-24005-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24005-00"
"System.Diagnostics.Process": "4.1.0-rc3-24011-00",
"System.IO.Pipes": "4.0.0-rc3-24011-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24011-00",
"System.IO.FileSystem": "4.0.1-rc3-24011-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24011-00"
},
"frameworks": {
"netstandard1.3": {
......
src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb
浏览文件 @ d184c2d8
......@@ -1115,17 +1115,30 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE
Dim moduleSymbol = Me.ContainingPEModule
Dim [module] = moduleSymbol.Module
Dim isOrdinaryStruct As Boolean = Me.TypeKind = TypeKind.Structure AndAlso
(Me.SpecialType = SpecialType.None OrElse Me.SpecialType = SpecialType.System_Nullable_T)
Try
For Each fieldDef In [module].GetFieldsOfTypeOrThrow(_handle)
Dim import As Boolean = True
Dim import As Boolean
Try
If Not ([module].ShouldImportField(fieldDef, moduleSymbol.ImportOptions) OrElse
isOrdinaryStruct AndAlso ([module].GetFieldDefFlagsOrThrow(fieldDef) And FieldAttributes.Static) = 0) Then
import = False
import = [module].ShouldImportField(fieldDef, moduleSymbol.ImportOptions)
If Not import Then
Select Case Me.TypeKind
Case TypeKind.Structure
Dim specialType = Me.SpecialType
If specialType = SpecialType.None OrElse specialType = SpecialType.System_Nullable_T Then
' This is an ordinary struct
If ([module].GetFieldDefFlagsOrThrow(fieldDef) And FieldAttributes.Static) = 0 Then
import = True
End If
End If
Case TypeKind.Enum
If ([module].GetFieldDefFlagsOrThrow(fieldDef) And FieldAttributes.Static) = 0 Then
import = True
End If
End Select
End If
Catch mrEx As BadImageFormatException
End Try
......
src/Compilers/VisualBasic/Test/Performance/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0023",
"System.IO.FileSystem": "4.0.1-rc3-24005-00"
"System.IO.FileSystem": "4.0.1-rc3-24011-00"
},
"frameworks": {
"net46": {}
......
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb
浏览文件 @ d184c2d8
......@@ -240,6 +240,39 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE
Assert.Equal(-8L, Int64Value.GetConstantValue(SymbolsInProgress(Of FieldSymbol).Empty).Int64Value)
End Sub
<Fact>
<WorkItem(193333, "https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?_a=edit&id=193333")>
Public Sub EnumWithPrivateValueField()
Dim ilSource = "
.class public auto ansi sealed TestEnum
extends [mscorlib]System.Enum
{
.field private specialname rtspecialname int32 value__
.field public static literal valuetype TestEnum Value1 = int32(0x00000000)
.field public static literal valuetype TestEnum Value2 = int32(0x00000001)
} // end of class TestEnum
"
Dim vbSource =
<compilation>
<file>
Module Module1
Sub Main()
Dim val as TestEnum = TestEnum.Value1
System.Console.WriteLine(val.ToString())
val = TestEnum.Value2
System.Console.WriteLine(val.ToString())
End Sub
End Module
</file>
</compilation>
Dim compilation = CreateCompilationWithCustomILSource(vbSource, ilSource, includeVbRuntime:=True, options:=TestOptions.DebugExe)
CompileAndVerify(compilation, expectedOutput:="Value1
Value2")
End Sub
End Class
......
src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections": "4.0.11-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.Collections": "4.0.11-rc3-24011-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24011-00",
"System.Runtime": "4.1.0-rc3-24011-00",
"System.Runtime.Extensions": "4.1.0-rc3-24011-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24011-00",
"System.IO.FileSystem": "4.0.1-rc3-24011-00",
"xunit": "2.1.0"
},
"frameworks": {
......
src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
浏览文件 @ d184c2d8
......@@ -14,21 +14,21 @@
</group>
<group targetFramework="netstandard1.1">
<dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60406-06" />
<dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.0-rc3-24005-00" />
<dependency id="System.IO" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24011-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24011-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24011-00" />
<dependency id="System.Globalization" version="4.0.0-rc3-24011-00" />
<dependency id="System.IO" version="4.1.0-rc3-24011-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24011-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24011-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24011-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24011-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24011-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24011-00" />
</group>
</dependencies>
<language>en-US</language>
......
src/Dependencies/Immutable/project.json
浏览文件 @ d184c2d8
{
"supports": {},
"dependencies": {
"System.Collections.Immutable": "1.2.0-rc3-24005-00"
"System.Collections.Immutable": "1.2.0-rc3-24011-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
......
src/Dependencies/Metadata/project.json
浏览文件 @ d184c2d8
{
"supports": {},
"dependencies": {
"System.Reflection.Metadata": "1.3.0-rc3-24005-00"
"System.Reflection.Metadata": "1.3.0-rc3-24011-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
......
src/Dependencies/Microsoft.DiaSymReader/Microsoft.DiaSymReader.nuspec
浏览文件 @ d184c2d8
......@@ -8,9 +8,9 @@
</description>
<dependencies>
<group targetFramework="netstandard1.1">
<dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24011-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24011-00" />
</group>
</dependencies>
<language>en-US</language>
......
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
浏览文件 @ d184c2d8
......@@ -840,8 +840,9 @@ public async Task DottedPattern7()
}
[WorkItem(1174255, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174255")]
[WorkItem(8009, "https://github.com/dotnet/roslyn/issues/8009")]
[Fact, Trait(Traits.Feature, Traits.Features.NavigateTo)]
public async Task NoNavigationToGeneratedFiles()
public async Task NavigateToGeneratedFiles()
{
using (var workspace = await TestWorkspace.CreateAsync(@"
<Workspace>
......@@ -860,7 +861,7 @@ namespace N
{
public partial class C
{
public void VisibleMethod_Not() { }
public void VisibleMethod_Generated() { }
}
}
</Document>
......@@ -876,7 +877,8 @@ public partial class C
var items = _aggregator.GetItems("VisibleMethod");
var expectedItems = new List<NavigateToItem>()
{
new NavigateToItem("VisibleMethod", NavigateToItemKind.Method, "csharp", null, null, MatchKind.Exact, true, null)
new NavigateToItem("VisibleMethod", NavigateToItemKind.Method, "csharp", null, null, MatchKind.Exact, true, null),
new NavigateToItem("VisibleMethod_Generated", NavigateToItemKind.Method, "csharp", null, null, MatchKind.Prefix, true, null)
};
// The pattern matcher should match 'VisibleMethod' to both 'VisibleMethod' and 'VisibleMethod_Not', except that
......
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.cs
浏览文件 @ d184c2d8
......@@ -29,7 +29,8 @@ public static IEnumerable<INavigableItem> GetItemsFromPreferredSourceLocations(S
return locations.Select(loc => GetItemFromSymbolLocation(solution, symbol, loc, displayString));
}
public static IEnumerable<Location> GetPreferredSourceLocations(Solution solution, ISymbol symbol)
public static IEnumerable<Location> GetPreferredSourceLocations(
Solution solution, ISymbol symbol)
{
// Prefer non-generated source locations over generated ones.
......
src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_TypeChar.cs
浏览文件 @ d184c2d8
......@@ -25,6 +25,7 @@ void ICommandHandler<TypeCharCommandArgs>.ExecuteCommand(TypeCharCommandArgs arg
var allProviders = GetProviders();
if (allProviders == null)
{
nextHandler();
return;
}
......
src/EditorFeatures/Core/Implementation/NavigateTo/NavigateToSymbolFinder.cs
浏览文件 @ d184c2d8
......@@ -16,11 +16,10 @@ internal static class NavigateToSymbolFinder
{
internal static async Task<IEnumerable<ValueTuple<DeclaredSymbolInfo, Document, IEnumerable<PatternMatch>>>> FindNavigableDeclaredSymbolInfos(Project project, string pattern, CancellationToken cancellationToken)
{
var generatedCodeRecognitionService = project.LanguageServices.WorkspaceServices.GetService<IGeneratedCodeRecognitionService>();
var patternMatcher = new PatternMatcher(pattern);
var result = new List<ValueTuple<DeclaredSymbolInfo, Document, IEnumerable<PatternMatch>>>();
foreach (var document in project.Documents.Where(d => !generatedCodeRecognitionService?.IsGeneratedCode(d) ?? true))
foreach (var document in project.Documents)
{
cancellationToken.ThrowIfCancellationRequested();
var declaredSymbolInfos = await document.GetDeclaredSymbolInfosAsync(cancellationToken).ConfigureAwait(false);
......
src/Interactive/CsiCore/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"System.AppContext": "4.1.0-rc3-24005-00"
"System.AppContext": "4.1.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {
......
src/Interactive/VbiCore/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"System.AppContext": "4.1.0-rc3-24005-00"
"System.AppContext": "4.1.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {
......
src/NuGet/Microsoft.CodeAnalysis.CSharp.Workspaces.nuspec
浏览文件 @ d184c2d8
......@@ -27,6 +27,8 @@ Supported Platforms:
<file src="Microsoft.CodeAnalysis.CSharp.Workspaces.xml" target="lib\portable-net45+win8" />
<file src="Microsoft.CodeAnalysis.CSharp.Workspaces.dll" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.CSharp.Workspaces.xml" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.CSharp.Workspaces.dll" target="lib\netstandard1.3" />
<file src="Microsoft.CodeAnalysis.CSharp.Workspaces.xml" target="lib\netstandard1.3" />
<file src="$thirdPartyNoticesPath$" target="" />
</files>
</package>
src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
浏览文件 @ d184c2d8
......@@ -21,44 +21,44 @@ Supported Platforms:
<group targetFramework="netstandard1.3">
<dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" />
<dependency id="System.AppContext" version="4.1.0-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Console" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24005-00" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24005-00" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24005-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24005-00" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.AppContext" version="4.1.0-rc3-24011-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24011-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24011-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24011-00" />
<dependency id="System.Console" version="4.0.0-rc3-24011-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24011-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24011-00" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24011-00" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24011-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24011-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24011-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24011-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24011-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24011-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24011-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24011-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24011-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24011-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24011-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24011-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24011-00" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24011-00" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24011-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24011-00" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24011-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24011-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24011-00" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24011-00" exclude="Compile" />
</group>
</dependencies>
......
src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Workspaces.nuspec
浏览文件 @ d184c2d8
......@@ -27,6 +27,8 @@ Supported Platforms:
<file src="Microsoft.CodeAnalysis.VisualBasic.Workspaces.xml" target="lib\portable-net45+win8" />
<file src="Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.VisualBasic.Workspaces.xml" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" target="lib\netstandard1.3" />
<file src="Microsoft.CodeAnalysis.VisualBasic.Workspaces.xml" target="lib\netstandard1.3" />
<file src="$thirdPartyNoticesPath$" target="" />
</files>
</package>
src/NuGet/Microsoft.CodeAnalysis.Workspaces.Common.nuspec
浏览文件 @ d184c2d8
......@@ -32,6 +32,8 @@ Supported Platforms:
<file src="Microsoft.CodeAnalysis.Workspaces.xml" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.Workspaces.Desktop.dll" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.Workspaces.Desktop.xml" target="lib\net45" />
<file src="Microsoft.CodeAnalysis.Workspaces.dll" target="lib\netstandard1.3" />
<file src="Microsoft.CodeAnalysis.Workspaces.xml" target="lib\netstandard1.3" />
<file src="$thirdPartyNoticesPath$" target="" />
</files>
</package>
src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
浏览文件 @ d184c2d8
......@@ -19,30 +19,30 @@
<group targetFramework="dnxcore50">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" />
<dependency id="System.AppContext" version="4.0.1-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.0.21-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.0.21-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
<dependency id="System.AppContext" version="4.0.1-rc3-24011-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24011-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24011-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24011-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24011-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24011-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24011-00" />
<dependency id="System.IO" version="4.0.11-rc3-24011-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24011-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Linq" version="4.0.1-rc3-24011-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24011-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24011-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime" version="4.0.21-rc3-24011-00" />
<dependency id="System.Runtime.Extensions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime.InteropServices" version="4.0.21-rc3-24011-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24011-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24011-00" />
</group>
</dependencies>
</metadata>
......
src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
浏览文件 @ d184c2d8
......@@ -18,44 +18,44 @@
<dependencies>
<group targetFramework="dnxcore50">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Console" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Loader" version="4.0.0-rc3-24005-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24005-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24005-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24005-00" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24005-00" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24005-00" />
<dependency id="System.AppContext" version="4.1.0-rc3-24011-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24011-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24011-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24011-00" />
<dependency id="System.Console" version="4.0.0-rc3-24011-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24011-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24011-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24011-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24011-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24011-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24011-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24011-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24011-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24011-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24011-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24011-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24011-00" />
<dependency id="System.Runtime.Loader" version="4.0.0-rc3-24011-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24011-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24011-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24011-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24011-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24011-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24011-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24011-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24011-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24011-00" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24011-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24011-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24011-00" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24011-00" />
</group>
</dependencies>
</metadata>
......
src/ProjectSystem/DeployTestDependencies/project.json
浏览文件 @ d184c2d8
......@@ -4,7 +4,7 @@
"xunit.runner.console": "2.1.0",
"xunit.runner.visualstudio": "2.1.0",
"Moq": "4.2.1402.2112",
"System.Collections.Immutable": "1.2.0-rc3-24005-00"
"System.Collections.Immutable": "1.2.0-rc3-24011-00"
},
"frameworks": {
"net46": { }
......
src/Scripting/CSharpTest.Desktop/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"System.Diagnostics.Process": "4.1.0-rc3-24005-00"
"System.Diagnostics.Process": "4.1.0-rc3-24011-00"
},
"frameworks": {
"net46": {}
......
src/Scripting/Core/Scripting.csproj
浏览文件 @ d184c2d8
......@@ -39,7 +39,7 @@
</PropertyGroup>
<ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc3-24005-00\ref\netstandard1.5\System.Runtime.Loader.dll">
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc3-24011-00\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
......
src/Scripting/Core/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections": "4.0.11-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.Globalization": "4.0.11-rc3-24005-00",
"System.IO": "4.1.0-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.Linq": "4.1.0-rc3-24005-00",
"System.Linq.Expressions": "4.0.11-rc3-24005-00",
"System.Reflection": "4.1.0-rc3-24005-00",
"System.Reflection.Extensions": "4.0.1-rc3-24005-00",
"System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
"System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.Threading": "4.0.11-rc3-24005-00",
"System.Threading.Tasks": "4.0.11-rc3-24005-00"
"System.Collections": "4.0.11-rc3-24011-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24011-00",
"System.Diagnostics.StackTrace": "4.0.1-rc3-24011-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24011-00",
"System.Globalization": "4.0.11-rc3-24011-00",
"System.IO": "4.1.0-rc3-24011-00",
"System.IO.FileSystem": "4.0.1-rc3-24011-00",
"System.Linq": "4.1.0-rc3-24011-00",
"System.Linq.Expressions": "4.0.11-rc3-24011-00",
"System.Reflection": "4.1.0-rc3-24011-00",
"System.Reflection.Extensions": "4.0.1-rc3-24011-00",
"System.Resources.ResourceManager": "4.0.1-rc3-24011-00",
"System.Runtime": "4.1.0-rc3-24011-00",
"System.Runtime.Extensions": "4.1.0-rc3-24011-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24011-00",
"System.Threading": "4.0.11-rc3-24011-00",
"System.Threading.Tasks": "4.0.11-rc3-24011-00"
},
"frameworks": {
"netstandard1.3": {
......
src/Test/Utilities/Portable/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24011-00",
"Microsoft.CSharp": "4.0.0",
"System.Collections.Concurrent": "4.0.12-rc3-24005-00",
"System.Console": "4.0.0-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24005-00",
"System.Threading.Thread": "4.0.0-rc3-24005-00",
"System.Xml.XDocument": "4.0.11-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.1-rc3-24005-00",
"System.Collections.Concurrent": "4.0.12-rc3-24011-00",
"System.Console": "4.0.0-rc3-24011-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24011-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24011-00",
"System.IO.FileSystem": "4.0.1-rc3-24011-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24011-00",
"System.Threading.Thread": "4.0.0-rc3-24011-00",
"System.Xml.XDocument": "4.0.11-rc3-24011-00",
"System.Xml.XmlDocument": "4.0.1-rc3-24011-00",
"xunit": "2.1.0",
"xunit.extensibility.execution": "2.1.0"
},
......
src/Tools/CommonNetCoreReferences/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24005-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24005-00",
"System.AppContext": "4.1.0-rc3-24005-00",
"System.Collections": "4.0.11-rc3-24005-00",
"System.Collections.Concurrent": "4.0.12-rc3-24005-00",
"System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Console": "4.0.0-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24005-00",
"System.Diagnostics.Process": "4.1.0-rc3-24005-00",
"System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24005-00",
"System.Globalization": "4.0.11-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.Primitives": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-24005-00",
"System.IO.Pipes": "4.0.0-rc3-24005-00",
"System.Linq": "4.1.0-rc3-24005-00",
"System.Linq.Expressions": "4.0.11-rc3-24005-00",
"System.Net.NameResolution": "4.0.0-rc3-24005-00",
"System.Net.Sockets": "4.1.0-rc3-24005-00",
"System.Reflection": "4.1.0-rc3-24005-00",
"System.Reflection.Primitives": "4.0.1-rc3-24005-00",
"System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
"System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.Handles": "4.0.1-rc3-24005-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.Runtime.Loader": "4.0.0-rc3-24005-00",
"System.Runtime.Numerics": "4.0.1-rc3-24005-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-24005-00",
"System.Security.Cryptography.Encoding": "4.0.0-rc3-24005-00",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24005-00",
"System.Text.Encoding": "4.0.11-rc3-24005-00",
"System.Text.Encoding.CodePages": "4.0.1-rc3-24005-00",
"System.Text.Encoding.Extensions": "4.0.11-rc3-24005-00",
"System.Threading": "4.0.11-rc3-24005-00",
"System.Threading.Tasks": "4.0.11-rc3-24005-00",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-24005-00",
"System.Threading.Thread": "4.0.0-rc3-24005-00",
"System.Xml.ReaderWriter": "4.0.11-rc3-24005-00",
"System.Xml.XDocument": "4.0.11-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.1-rc3-24005-00",
"System.Xml.XPath.XDocument": "4.0.1-rc3-24005-00"
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24011-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24011-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24011-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24011-00",
"System.AppContext": "4.1.0-rc3-24011-00",
"System.Collections": "4.0.11-rc3-24011-00",
"System.Collections.Concurrent": "4.0.12-rc3-24011-00",
"System.Collections.Immutable": "1.2.0-rc3-24011-00",
"System.Console": "4.0.0-rc3-24011-00",
"System.Diagnostics.Debug": "4.0.11-rc3-24011-00",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24011-00",
"System.Diagnostics.Process": "4.1.0-rc3-24011-00",
"System.Diagnostics.StackTrace": "4.0.1-rc3-24011-00",
"System.Diagnostics.Tools": "4.0.1-rc3-24011-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24011-00",
"System.Globalization": "4.0.11-rc3-24011-00",
"System.IO.FileSystem": "4.0.1-rc3-24011-00",
"System.IO.FileSystem.Primitives": "4.0.1-rc3-24011-00",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-24011-00",
"System.IO.Pipes": "4.0.0-rc3-24011-00",
"System.Linq": "4.1.0-rc3-24011-00",
"System.Linq.Expressions": "4.0.11-rc3-24011-00",
"System.Net.NameResolution": "4.0.0-rc3-24011-00",
"System.Net.Sockets": "4.1.0-rc3-24011-00",
"System.Reflection": "4.1.0-rc3-24011-00",
"System.Reflection.Primitives": "4.0.1-rc3-24011-00",
"System.Resources.ResourceManager": "4.0.1-rc3-24011-00",
"System.Runtime": "4.1.0-rc3-24011-00",
"System.Runtime.Extensions": "4.1.0-rc3-24011-00",
"System.Runtime.Handles": "4.0.1-rc3-24011-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24011-00",
"System.Runtime.Loader": "4.0.0-rc3-24011-00",
"System.Runtime.Numerics": "4.0.1-rc3-24011-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-24011-00",
"System.Security.Cryptography.Encoding": "4.0.0-rc3-24011-00",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24011-00",
"System.Text.Encoding": "4.0.11-rc3-24011-00",
"System.Text.Encoding.CodePages": "4.0.1-rc3-24011-00",
"System.Text.Encoding.Extensions": "4.0.11-rc3-24011-00",
"System.Threading": "4.0.11-rc3-24011-00",
"System.Threading.Tasks": "4.0.11-rc3-24011-00",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-24011-00",
"System.Threading.Thread": "4.0.0-rc3-24011-00",
"System.Xml.ReaderWriter": "4.0.11-rc3-24011-00",
"System.Xml.XDocument": "4.0.11-rc3-24011-00",
"System.Xml.XmlDocument": "4.0.1-rc3-24011-00",
"System.Xml.XPath.XDocument": "4.0.1-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {
......
src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24005-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24005-00"
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24011-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24011-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24011-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {
......
src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NETStandard.Library": "1.5.0-rc3-24005-00",
"NETStandard.Library": "1.5.0-rc3-24011-00",
"System.Xml.XmlDocument": "4.0.0",
"System.Xml.XmlSerializer": "4.0.10"
},
......
src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NETStandard.Library": "1.5.0-rc3-24005-00"
"NETStandard.Library": "1.5.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {}
......
src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NETStandard.Library": "1.5.0-rc3-24005-00",
"NETStandard.Library": "1.5.0-rc3-24011-00",
"System.Xml.XmlDocument": "4.0.0",
"System.Xml.XmlSerializer": "4.0.10"
},
......
src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NETStandard.Library": "1.5.0-rc3-24005-00"
"NETStandard.Library": "1.5.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": { }
......
src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
浏览文件 @ d184c2d8
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NETStandard.Library": "1.5.0-rc3-24005-00",
"System.Console": "4.0.0-rc3-24005-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-24005-00"
"NETStandard.Library": "1.5.0-rc3-24011-00",
"System.Console": "4.0.0-rc3-24011-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-24011-00"
},
"frameworks": {
"dnxcore50": {}
......
src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
浏览文件 @ d184c2d8
......@@ -156,7 +156,6 @@
<NuGetPackageToIncludeInVsix Include="System.Collections.Immutable" />
<NuGetPackageToIncludeInVsix Include="System.Reflection.Metadata" />
<!-- Other interactive host process dependencies -->
<NuGetPackageToIncludeInVsix Include="System.AppContext" />
<NuGetPackageToIncludeInVsix Include="System.Diagnostics.StackTrace" />
<NuGetPackageToIncludeInVsix Include="System.IO.FileSystem" />
<NuGetPackageToIncludeInVsix Include="System.IO.FileSystem.Primitives" />
......
src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeInfo.cs
浏览文件 @ d184c2d8
......@@ -5,6 +5,7 @@
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.ErrorReporting;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
using Microsoft.CodeAnalysis.Shared.Utilities;
......@@ -170,10 +171,20 @@ public static Task<SyntaxTreeDeclarationInfo> GetDeclarationInfoAsync(Document d
// TryGetDeclaredSymbolInfo, then this will at least prevent us from returning bad spans
// and will prevent the crash from occurring.
DeclaredSymbolInfo declaredSymbolInfo;
if (syntaxFacts.TryGetDeclaredSymbolInfo(node, out declaredSymbolInfo) &&
root.FullSpan.Contains(declaredSymbolInfo.Span))
if (syntaxFacts.TryGetDeclaredSymbolInfo(node, out declaredSymbolInfo))
{
declaredSymbolInfos.Add(declaredSymbolInfo);
if (root.FullSpan.Contains(declaredSymbolInfo.Span))
{
declaredSymbolInfos.Add(declaredSymbolInfo);
}
else
{
var message =
$@"Invalid span in {nameof(declaredSymbolInfo)}.
{nameof(declaredSymbolInfo.Span)} = {declaredSymbolInfo.Span}
{nameof(root.FullSpan)} = {root.FullSpan}";
FatalError.ReportWithoutCrash(new InvalidOperationException(message));
}
}
}
else
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或