diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000000..e3e2abfdd7e8e --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,7 @@ + + + true + true + + + \ No newline at end of file diff --git a/Roslyn.sln b/Roslyn.sln index 1c21677a6c7f5..d3b342fd4d00b 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -363,8 +363,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Lang EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Debugger", "src\Tools\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", "{655A5B07-39B8-48CD-8590-8AC0C2B708D8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote", "src\Tools\ExternalAccess\Xamarin.Remote\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", "{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.VisualStudio.Setup.ServiceHub.Desktop.Config", "src\Setup\DevDivVsix\ServiceHubConfig\Roslyn.VisualStudio.Setup.ServiceHub.Desktop.Config.csproj", "{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests", "src\Tools\ExternalAccess\FSharpTest\Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests.csproj", "{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}" @@ -1096,10 +1094,6 @@ Global {655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.Build.0 = Release|Any CPU - {DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.Build.0 = Release|Any CPU {3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1516,7 +1510,6 @@ Global {686BF57E-A6FF-467B-AAB3-44DE916A9772} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A} {1DDE89EE-5819-441F-A060-2FF4A986F372} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A} {655A5B07-39B8-48CD-8590-8AC0C2B708D8} = {8977A560-45C2-4EC2-A849-97335B382C74} - {DE53934B-7FC1-48A0-85AB-C519FBBD02CF} = {8977A560-45C2-4EC2-A849-97335B382C74} {3D33BBFD-EC63-4E8C-A714-0A48A3809A87} = {BE25E872-1667-4649-9D19-96B83E75A44E} {BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5} = {8977A560-45C2-4EC2-A849-97335B382C74} {FC32EF16-31B1-47B3-B625-A80933CB3F29} = {8977A560-45C2-4EC2-A849-97335B382C74} diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props new file mode 100644 index 0000000000000..ce80d715ecdfe --- /dev/null +++ b/eng/Directory.Packages.props @@ -0,0 +1,306 @@ + + + + 3.11.0-beta1.23364.2 + 8.0.0-preview.23468.1 + 1.1.2-beta1.23411.1 + 0.1.187-beta + + 4.8.0-3.final + 17.9.80-preview + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 7.0.0-alpha.1.22060.1 + 17.5.0 + + 8.0.0 + 8.0.0 + 2.4.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 59ecdd109f41a..36303b9c44860 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -23,6 +23,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 619ef7e178bc3..67941162c0528 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -70,7 +70,7 @@ 27e584661980ee6d82c419a2a471ae505b7d122e - + https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 diff --git a/eng/Versions.props b/eng/Versions.props index 57a18183ad4ec..6a870cb623fa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,293 +15,31 @@ Keep the setting conditional. The toolset sets the assembly version to 42.42.42.42 if not set explicitly. --> $(MajorVersion).$(MinorVersion).0.0 - 4.8.0-3.final - - - - 3.11.0-beta1.23364.2 - 8.0.0-preview.23468.1 - 1.1.2-beta1.23411.1 - 0.1.187-beta - - 4.8.0-3.final - 17.9.3-preview - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 17.7.4-preview - 17.9.3-preview - 17.9.35111-preview.1 - - 17.3.2 - - 17.5.0 - - 4.1.0 - 8.0.0-rtm.23523.3 - 17.9.1-alpha - 17.9.12-alpha - 17.4.1 - 0.9.3 - 1.2.4 - 1.2.4 - 1.2.4 - 1.3.0 - 1.4.5 - 1.3.0 - 1.2.4 - 0.13.0 - 0.13.0 - 1.5.0 - 0.9.2 - 2.14.1 - 8.1.1.7464 - 1.0.7 - 1.6.10 - 6.0.0 - - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) - 6.0.0-preview.0.15 - 17.9.3-alpha - 7.0.0-preview.23525.7 - + 2.0.0-beta4.23407.1 + 7.0.0 + 7.0.0 + 8.0.0 + 8.0.0 + + 7.0.3 3.3.4 - 2.0.0-rc2-61102-09 - $(MicrosoftCodeAnalysisTestingVersion) - $(MicrosoftCodeAnalysisTestingVersion) - $(MicrosoftCodeAnalysisTestingVersion) - $(CodeStyleAnalyzerVersion) - 1.0.0 - 2.0.44 - $(MicrosoftCodeAnalysisTestingVersion) - $(MicrosoftCodeAnalysisTestingVersion) - $(MicrosoftCodeAnalysisTestingVersion) - $(CodeStyleAnalyzerVersion) 3.3.0 - 3.3.4-beta1.22504.1 - 4.7.0 - 1.0.803 - 0.8.31-beta - 1.0.35 + 8.0.0-preview.23468.1 2.0.0 - 1.1.0-beta2-22302-02 - 1.1.0-beta2-22302-02 - 17.0.0-beta1.21524.1 - 1.7.0-beta-21528-01 7.0.0 7.0.0 7.0.0 - 3.13.8 - 15.8.27812-alpha - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - 6.0.0 - 6.0.0 - 1.0.0-beta3.21075.2 - 2.2.101 - 5.0.0 - 1.0.0 - 1.0.0 - 1.0.0 - 1.0.0 - 1.0.1 - 1.1.0 - 1.0.0 - 2.0.0-alpha-20170405-2 - 0.1.0 - 0.1.2-dev - 4.2.1017 - 4.4.16 - 1.1.1-beta-21566-01 - 19.232.0-preview - $(MicrosoftTestPlatformVersion) - $(MicrosoftTestPlatformVersion) - 10.3.0 - 17.3.26-alpha - 15.8.27812-alpha - 15.8.27812-alpha - 17.9.3-preview - 17.7.26 - $(VisualStudioEditorPackagesVersion) - 17.9.0-beta.23614.1 - 17.9.0-beta.23614.1 - 17.8.1072001-preview - 17.8.1072001-preview - $(MicrosoftVisualStudioShellPackagesVersion) - 17.0.0-preview-1-30928-1112 - $(MicrosoftVisualStudioShellPackagesVersion) - 15.0.36 - $(VisualStudioEditorPackagesVersion) - $(MicrosoftVisualStudioExtensibilityTestingVersion) - $(MicrosoftVisualStudioExtensibilityTestingVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(VisualStudioEditorPackagesVersion) - 15.8.27812-alpha - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(MicrosoftVisualStudioLanguageServerClientPackagesVersion) - $(MicrosoftVisualStudioLanguageServerClientPackagesVersion) - $(VisualStudioEditorPackagesVersion) - 2.18.6 - 3.0.6 - 3.0.6 - 3.0.8 - $(VisualStudioEditorPackagesVersion) - 15.8.27812-alpha - 15.8.27812-alpha - 15.8.27812-alpha - 17.0.77-pre-g62a6cb5699 - 16.3.52 - 16.10.10 - 17.5.0-preview-2-33111-081 - 3.9.39 - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - 17.8.143 - 8.0.0.0-alpha - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(MicrosoftVisualStudioThreadingAnalyzersPackagesVersion) - $(MicrosoftVisualStudioThreadingPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - 16.3.56 - 17.8.8 - 4.0.0 - 4.0.0 - 17.0.0-previews-4-31709-430 - 17.1.11-preview-0002 - 4.3.0 - 5.0.0 - 2.2.158 - 0.1.0 - 6.6.0.161 - 4.10.1 - 2.10.69 - 6.0.0-preview.0.15 - 4.8.0 - 1.1.0-beta1-62506-02 - 105.2.3 - 0.1.1643-alpha - 0.9.8-beta - 3.0.0-beta2-19053-01 - $(RoslynDiagnosticsNugetPackageVersion) - 6.8.0-rc.112 - 1.1.0-beta3.22474.1 - 0.0.4 - 1.0.21 - 4.5.1 - 7.0.0 - 7.0.0 - 2.0.0-beta4.23407.1 - 7.0.0 - 7.0.0 - 7.0.0 - 4.3.0 - 4.3.0 - 8.0.0 - 5.0.0 - 7.0.0 - 7.0.0 - 4.5.5 - - 4.3.4 - 4.3.2 - 7.0.0 - 6.0.0 - 6.0.1 - 4.3.0 - 4.3.0 - 7.0.0 - 4.3.0 - - 7.0.3 - 7.0.0 - 7.0.0 - - 4.5.0 - 4.5.4 - 2.1.0 - 1.1.0.14 - 1.1.87 - 17.5.4074 - 17.0.1051901-preview - 8.0.50727 + 4.10.0-1.24061.4 + 17.9.3137-preview3 2.4.1 - 2.4.1 - 0.12.0-pre.20 - $(xunitVersion) - 1.3.2 - 2.1.26 - $(xunitVersion) - 2.4.5 - 1.0.51 - 2.4.5 - $(xunitVersion) - $(xunitVersion) - 2.0.3 - $(xunitVersion) - $(ILAsmPackageVersion) - $(ILAsmPackageVersion) - $(ILAsmPackageVersion) - $(ILDAsmPackageVersion) - $(ILDAsmPackageVersion) - $(ILDAsmPackageVersion) - - 13.0.3 - 2.17.9 - - 8.0.0 - 8.0.0 - 7.0.0 - - - true + true false true true @@ -309,7 +47,7 @@ true true true - true + false - 8.0.0-rc.1.23419.4 - 8.0.0-rc.1.23420.5 - diff --git a/eng/config/globalconfigs/Common.globalconfig b/eng/config/globalconfigs/Common.globalconfig index 206ebfe97cf26..028d94a89350e 100644 --- a/eng/config/globalconfigs/Common.globalconfig +++ b/eng/config/globalconfigs/Common.globalconfig @@ -124,6 +124,9 @@ dotnet_diagnostic.VSTHRD010.severity = none # VSTHRD110: Observe result of async calls dotnet_diagnostic.VSTHRD110.severity = none +# Workaround for old Microsoft.VisualStudio.Progression.* packages: https://github.com/dotnet/roslyn/issues/71404 +dotnet_diagnostic.VSIXCompatibility1001.severity = none + dotnet_diagnostic.HAA0101.severity = none dotnet_diagnostic.HAA0102.severity = none dotnet_diagnostic.HAA0201.severity = none diff --git a/eng/generate-vssdk-versions.csx b/eng/generate-vssdk-versions.csx new file mode 100644 index 0000000000000..04bca706caf33 --- /dev/null +++ b/eng/generate-vssdk-versions.csx @@ -0,0 +1,72 @@ +#r "System.Xml.Linq" + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Xml.Linq; + +var nugetPackageDir = Environment.GetEnvironmentVariable("NUGET_PACKAGES"); +if (!Directory.Exists(nugetPackageDir)) +{ + nugetPackageDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages"); +} + +var versions = XDocument.Parse(File.ReadAllText(Path.Combine(GetScriptDirectory(), "Directory.Packages.props"))); +var vssdkVersion = versions.Descendants().First(n => n.Name.LocalName == "PackageVersion" && n.Attribute("Include").Value == "Microsoft.VisualStudio.SDK").Attribute("Version").Value; + +var vssdkPackageSpecPath = Path.Combine(nugetPackageDir, "microsoft.visualstudio.sdk", vssdkVersion, "microsoft.visualstudio.sdk.nuspec"); + +Console.WriteLine($"NuGet package directory: '{nugetPackageDir}'"); +Console.WriteLine($"VSSDK version: '{vssdkVersion}'"); +Console.WriteLine(); + +if (!File.Exists(vssdkPackageSpecPath)) +{ + Console.Error.WriteLine($"File not found: {vssdkPackageSpecPath}. Please, restore packages."); + return 1; +} + +var vssdkPackageSpec = XDocument.Parse(File.ReadAllText(vssdkPackageSpecPath)); + +var properties = new List(); + +foreach (var node in vssdkPackageSpec.Descendants()) +{ + if (node.Name.LocalName == "dependency") + { + var id = node.Attribute("id")?.Value; + var version = node.Attribute("version")?.Value; + + if (id is null || version is null) + continue; + + if (!id.StartsWith("Microsoft.VisualStudio") && + !id.StartsWith("Microsoft.ServiceHub") && + id != "Newtonsoft.Json" && + id != "StreamJsonRpc") + { + continue; + } + + if (!versions.Descendants().Any(n => n.Name.LocalName == "PackageVersion" && n.Attribute("Include").Value == id)) + { + continue; + } + + properties.Add($""); + } +} + +properties.Sort(); + +foreach (var property in properties) +{ + Console.WriteLine(property); +} + +return 0; + +static string GetScriptDirectory([CallerFilePath] string path = null) + => Path.GetDirectoryName(path); diff --git a/eng/targets/DiaSymReaderNative.targets b/eng/targets/DiaSymReaderNative.targets index 1715ac203ae0c..6d52450769734 100644 --- a/eng/targets/DiaSymReaderNative.targets +++ b/eng/targets/DiaSymReaderNative.targets @@ -19,22 +19,22 @@ out. This logic is responsible for doing that. --> - + PreserveNewest false false - + PreserveNewest false false - + PreserveNewest false false - + \ No newline at end of file diff --git a/eng/targets/ILAsm.targets b/eng/targets/ILAsm.targets index 54c2d3789ef4d..edc2368e0ebad 100644 --- a/eng/targets/ILAsm.targets +++ b/eng/targets/ILAsm.targets @@ -6,27 +6,27 @@ exe. --> - + PreserveNewest runtimes false false - + PreserveNewest runtimes false false - + PreserveNewest runtimes false false - - - + + + \ No newline at end of file diff --git a/eng/targets/ILDAsm.targets b/eng/targets/ILDAsm.targets index 7d71640cdbf6b..9e94a720804b8 100644 --- a/eng/targets/ILDAsm.targets +++ b/eng/targets/ILDAsm.targets @@ -5,27 +5,27 @@ this target file. The build provenance tools need this to decompile IL for debugging purposes. --> - + PreserveNewest runtimes false false - + PreserveNewest runtimes false false - + PreserveNewest runtimes false false - - - + + + \ No newline at end of file diff --git a/eng/targets/Settings.props b/eng/targets/Settings.props index 909f321019bd5..99698db200629 100644 --- a/eng/targets/Settings.props +++ b/eng/targets/Settings.props @@ -10,6 +10,12 @@ RoslynDev + + $(NoWarn);VSIXCompatibility1001 + + + $(NoWarn);NU1507 + CommonExtensions Microsoft\VBCSharp\LanguageServices @@ -144,10 +150,10 @@ Analyzers --> - - - - + + + + @@ -159,7 +165,7 @@ Code indexing targets to help generating LSIF from indexing builds. --> - + diff --git a/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj b/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj index b2728ee6dbaa5..0b68a2d055d75 100644 --- a/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj +++ b/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj @@ -13,8 +13,8 @@ true - - + + diff --git a/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities.csproj b/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities.csproj index 4b14a9a3375fc..c786f471fa162 100644 --- a/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities.csproj +++ b/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities.csproj @@ -36,10 +36,10 @@ - - - - + + + + diff --git a/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj b/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj index c30bb525ad9e9..dfb88b7ef33a8 100644 --- a/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj +++ b/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj @@ -15,7 +15,7 @@ - + diff --git a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj index 6f128249769da..b6befa917364c 100644 --- a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj @@ -20,13 +20,13 @@ - + - + diff --git a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj index a44e8ae15b14f..3276fae69d6c0 100644 --- a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj @@ -22,11 +22,11 @@ - - - - - + + + + + diff --git a/src/Compilers/CSharp/Test/Emit2/Microsoft.CodeAnalysis.CSharp.Emit2.UnitTests.csproj b/src/Compilers/CSharp/Test/Emit2/Microsoft.CodeAnalysis.CSharp.Emit2.UnitTests.csproj index a44e8ae15b14f..3276fae69d6c0 100644 --- a/src/Compilers/CSharp/Test/Emit2/Microsoft.CodeAnalysis.CSharp.Emit2.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Emit2/Microsoft.CodeAnalysis.CSharp.Emit2.UnitTests.csproj @@ -22,11 +22,11 @@ - - - - - + + + + + diff --git a/src/Compilers/CSharp/Test/EndToEnd/Microsoft.CodeAnalysis.CSharp.EndToEnd.UnitTests.csproj b/src/Compilers/CSharp/Test/EndToEnd/Microsoft.CodeAnalysis.CSharp.EndToEnd.UnitTests.csproj index 827c7ffecf4d1..8ff71edc7a060 100644 --- a/src/Compilers/CSharp/Test/EndToEnd/Microsoft.CodeAnalysis.CSharp.EndToEnd.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/EndToEnd/Microsoft.CodeAnalysis.CSharp.EndToEnd.UnitTests.csproj @@ -20,8 +20,8 @@ Emit\MvidReader.cs - - + + diff --git a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj index db90495a229dc..197473c8fc89c 100644 --- a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj index bc3fcdfb604ab..38fcff0ef3a72 100644 --- a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj index 97722f2a71c34..1ed53ca827cc6 100644 --- a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj index 7a3a18b1fe140..e80335a1d132f 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj +++ b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj index bb84f73f486c1..d10e76332f630 100644 --- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj +++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj @@ -64,10 +64,10 @@ - - - - + + + + diff --git a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj index 867abd20e1d51..7f3264bb5f756 100644 --- a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj @@ -25,12 +25,9 @@ - - - - - - + + + diff --git a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj index c3f9818b5434c..1c8bac4881858 100644 --- a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj +++ b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj @@ -30,13 +30,13 @@ Note: PrivateAssets="ContentFiles" ensures that projects referencing Microsoft.CodeAnalysis.Common package will import everything but content files from Microsoft.CodeAnalysis.Analyzers, specifically, analyzers. --> - - - - - - - + + + + + + + diff --git a/src/Compilers/Core/Rebuild/Microsoft.CodeAnalysis.Rebuild.csproj b/src/Compilers/Core/Rebuild/Microsoft.CodeAnalysis.Rebuild.csproj index 8928c850ec2dc..3b8816f17b0d5 100644 --- a/src/Compilers/Core/Rebuild/Microsoft.CodeAnalysis.Rebuild.csproj +++ b/src/Compilers/Core/Rebuild/Microsoft.CodeAnalysis.Rebuild.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/Compilers/Core/RebuildTest/Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj b/src/Compilers/Core/RebuildTest/Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj index 3ba989b437ed3..52bbbb4a27ccb 100644 --- a/src/Compilers/Core/RebuildTest/Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj +++ b/src/Compilers/Core/RebuildTest/Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj index 31ece03c7f4d1..3bd263c493356 100644 --- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj +++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj @@ -109,16 +109,7 @@ - - - - - - - - - - - + + diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj index 9fe13547ebdba..a9654a0c6f52d 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj @@ -32,9 +32,9 @@ - - - + + + diff --git a/src/Compilers/Test/Core/Generate.ps1 b/src/Compilers/Test/Core/Generate.ps1 index 4bcd7f8243be0..4d5aaefa1d440 100644 --- a/src/Compilers/Test/Core/Generate.ps1 +++ b/src/Compilers/Test/Core/Generate.ps1 @@ -158,12 +158,12 @@ Add-TargetFramework "Net451" '$(PkgMicrosoft_NETFramework_ReferenceAssemblies_ne 'Facades\System.Threading.Tasks.dll' ) -Add-TargetFramework "MicrosoftCSharp" '$(NuGetPackageRoot)\microsoft.csharp\$(MicrosoftCSharpVersion)' @( +Add-TargetFramework "MicrosoftCSharp" '$(PkgMicrosoft_CSharp)' @( 'Netstandard10#ref\netstandard1.0\Microsoft.CSharp.dll' 'Netstandard13Lib#lib\netstandard1.3\Microsoft.CSharp.dll' ) -Add-TargetFramework "MicrosoftVisualBasic" '$(NuGetPackageRoot)\microsoft.visualbasic\$(MicrosoftVisualBasicVersion)\ref' @( +Add-TargetFramework "MicrosoftVisualBasic" '$(PkgMicrosoft_VisualBasic)\ref' @( 'Netstandard11#netstandard1.1\Microsoft.VisualBasic.dll' ) diff --git a/src/Compilers/Test/Core/Generated.cs b/src/Compilers/Test/Core/Generated.cs index 50839a01f76c0..137e93e893866 100644 --- a/src/Compilers/Test/Core/Generated.cs +++ b/src/Compilers/Test/Core/Generated.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Test/Core/Generated.targets b/src/Compilers/Test/Core/Generated.targets index 89317de9d8f18..c19be55d91ac4 100644 --- a/src/Compilers/Test/Core/Generated.targets +++ b/src/Compilers/Test/Core/Generated.targets @@ -1,4 +1,4 @@ - + net20.mscorlib.dll @@ -124,15 +124,15 @@ net451.System.Threading.Tasks.dll Resources\ReferenceAssemblies\net451\System.Threading.Tasks.dll - + netstandard10.microsoftcsharp.Microsoft.CSharp.dll Resources\ReferenceAssemblies\microsoftcsharp\Microsoft.CSharp.dll - + netstandard13lib.microsoftcsharp.Microsoft.CSharp.dll Resources\ReferenceAssemblies\microsoftcsharp\Microsoft.CSharp.dll - + netstandard11.microsoftvisualbasic.Microsoft.VisualBasic.dll Resources\ReferenceAssemblies\microsoftvisualbasic\Microsoft.VisualBasic.dll diff --git a/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj b/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj index 6b7b3cd41970f..3ceece94551d2 100644 --- a/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj +++ b/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj @@ -85,35 +85,35 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + diff --git a/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj b/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj index edd55502f536d..5251b4c1ca971 100644 --- a/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj +++ b/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj @@ -10,7 +10,7 @@ true Microsoft.CodeAnalysis.Compiler.Test.Resources This is an internal package for testing. Not meant for external or production uses. The API can and will break at our discretion. - NU5100,NU5106,CS1591 + $(NoWarn),NU5100,NU5106,CS1591 diff --git a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj index ad7ccbf9a19be..8d447cbc0f24e 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj @@ -19,11 +19,11 @@ - + - - + + diff --git a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj index 7f98418fa15dd..e4c7f4271902a 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj @@ -20,10 +20,10 @@ - + - + diff --git a/src/Compilers/VisualBasic/Test/Symbol/Microsoft.CodeAnalysis.VisualBasic.Symbol.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Symbol/Microsoft.CodeAnalysis.VisualBasic.Symbol.UnitTests.vbproj index e5d9243479466..72c9595f4978b 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/Microsoft.CodeAnalysis.VisualBasic.Symbol.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Symbol/Microsoft.CodeAnalysis.VisualBasic.Symbol.UnitTests.vbproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj index 70c878ff126cb..be31526b6c3c7 100644 --- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj +++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj @@ -19,11 +19,9 @@ $(NoWarn);NU5128 - - - + + + - - diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj index 05995b1cc168f..cbcddc860d25f 100644 --- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj +++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj index f014abc4537e3..b00c0cce75aa6 100644 --- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj +++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj @@ -19,9 +19,7 @@ $(NoWarn);NU5128 - - - + diff --git a/src/Deployment/RoslynDeployment.csproj b/src/Deployment/RoslynDeployment.csproj index 0e9a90b096749..c8eaed1f8ad34 100644 --- a/src/Deployment/RoslynDeployment.csproj +++ b/src/Deployment/RoslynDeployment.csproj @@ -45,7 +45,4 @@ VSIXContainerProjectOutputGroup%3b - - - \ No newline at end of file diff --git a/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj b/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj index 75824f35f4498..d23c1fd10d441 100644 --- a/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj +++ b/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj @@ -34,9 +34,6 @@ - - - diff --git a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj index feb52168e5ae8..8cd4779bdf502 100644 --- a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj @@ -41,27 +41,10 @@ - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj index b095ea8e60825..d32dd37eae5c9 100644 --- a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj @@ -41,12 +41,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj index 1e1343c1defaa..d3898b0112583 100644 --- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj +++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj @@ -31,18 +31,14 @@ - - - - - - - - - - - - + + + + + + + + diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj index 8a3dcdd8c83ad..6652c4d9e4045 100644 --- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj +++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj @@ -27,19 +27,14 @@ - - - + - - - - - - - - + + + + + diff --git a/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj index e5947e1f6390f..f8b91747a5b6d 100644 --- a/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj +++ b/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj @@ -49,26 +49,8 @@ - - - - - - - - - - - - - - - - - - - + + diff --git a/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj b/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj index 383dc55f5e70c..8184a0bcb1357 100644 --- a/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj +++ b/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj @@ -42,27 +42,10 @@ - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/EditorFeatures/TestUtilities/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj b/src/EditorFeatures/TestUtilities/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj index a01b4c25cfcf6..fdc90eda7c394 100644 --- a/src/EditorFeatures/TestUtilities/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj +++ b/src/EditorFeatures/TestUtilities/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj @@ -30,33 +30,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/EditorFeatures/TestUtilities2/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2.vbproj b/src/EditorFeatures/TestUtilities2/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2.vbproj index f548c6c38c234..e2d5d19866d35 100644 --- a/src/EditorFeatures/TestUtilities2/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2.vbproj +++ b/src/EditorFeatures/TestUtilities2/Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2.vbproj @@ -29,26 +29,8 @@ - - - - - - - - - - - - - - - - - - - + + diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj index 12fe6e28e2404..59c2c04e7cb76 100644 --- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj +++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj @@ -18,11 +18,9 @@ - - - - - + + + diff --git a/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj b/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj index 7bea4a4b14d79..6f4fcb44d0880 100644 --- a/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj +++ b/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj @@ -22,10 +22,6 @@ - - - - diff --git a/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj b/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj index 35ee69c0a1903..f3f79a926753b 100644 --- a/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj +++ b/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj @@ -40,23 +40,9 @@ - - - - - - - - - - - - - - - - - + + + diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj index 6b03baa6e3f81..5f039fa8b8cd2 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj index 63f1996f5d9c0..1ef60c7286ae7 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj +++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj index 9e16ec8e8cd6c..e38edfef0f10b 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj index fcb75f123f323..7f5217b0472a0 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj @@ -31,7 +31,7 @@ - - + + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj b/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj index 89d20fa56bcf6..3271d4fbd6d4d 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj @@ -59,15 +59,10 @@ - - - - - $(MicrosoftVisualStudioDebuggerMetadataimplementationVersion) - compile - - - + + + + diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj index 07ef4e8312da2..0783fd8706de6 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj @@ -79,9 +79,9 @@ - - - + + + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.Utilities.csproj b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.Utilities.csproj index 0b7d7555ac5e4..e062360b25301 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.Utilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.Utilities.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj b/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj index 89d587c4f25c1..0133b566b7aa3 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Microsoft.CodeAnalysis.ResultProvider.Utilities.csproj b/src/ExpressionEvaluator/Core/Test/ResultProvider/Microsoft.CodeAnalysis.ResultProvider.Utilities.csproj index 6a6bd57f0d563..df44ed3bb2df8 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/Microsoft.CodeAnalysis.ResultProvider.Utilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Microsoft.CodeAnalysis.ResultProvider.Utilities.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj index e4c897b2cdbf8..b3c6aa8857dac 100644 --- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj +++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj @@ -83,13 +83,4 @@ Designer - - - - - - - - - diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj index 1cafbb6c40a82..7d4ab68cab6fb 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj @@ -26,7 +26,7 @@ - + $(MicrosoftVisualStudioDebuggerMetadataimplementationVersion) compile diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj index cbb1a4706b70d..86d98eea7ee13 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj @@ -32,8 +32,8 @@ - - + + diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj index eeee4d9a5ad08..09fc271070543 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj @@ -24,8 +24,8 @@ - - + + diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index eb3727e6f114e..6e32457f3d747 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -64,7 +64,7 @@ - + diff --git a/src/Features/CSharpTest/Microsoft.CodeAnalysis.CSharp.Features.UnitTests.csproj b/src/Features/CSharpTest/Microsoft.CodeAnalysis.CSharp.Features.UnitTests.csproj index a6d283ef7f788..ac384219120d4 100644 --- a/src/Features/CSharpTest/Microsoft.CodeAnalysis.CSharp.Features.UnitTests.csproj +++ b/src/Features/CSharpTest/Microsoft.CodeAnalysis.CSharp.Features.UnitTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index 87d946bf5081e..01f6ead6fa1ad 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -134,11 +134,11 @@ - - - - - + + + + + diff --git a/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Microsoft.CodeAnalysis.LanguageServer.UnitTests.csproj b/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Microsoft.CodeAnalysis.LanguageServer.UnitTests.csproj index ffb1712315c79..d1514de4c67c8 100644 --- a/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Microsoft.CodeAnalysis.LanguageServer.UnitTests.csproj +++ b/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Microsoft.CodeAnalysis.LanguageServer.UnitTests.csproj @@ -9,10 +9,6 @@ false - - - - diff --git a/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj index 56aba538d2ad6..67f57e759325d 100644 --- a/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj +++ b/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj @@ -34,7 +34,7 @@ PackPublishContent;$(BeforePack) - NU5100 + $(NoWarn);NU5100 false @@ -69,17 +69,16 @@ - - - - - - - - - - - + + + + + + + + + + diff --git a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.Example/Microsoft.CommonLanguageServerProtocol.Framework.Example.csproj b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.Example/Microsoft.CommonLanguageServerProtocol.Framework.Example.csproj index 5af8ced8d7685..b3bc1079ab409 100644 --- a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.Example/Microsoft.CommonLanguageServerProtocol.Framework.Example.csproj +++ b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.Example/Microsoft.CommonLanguageServerProtocol.Framework.Example.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/Microsoft.CommonLanguageServerProtocol.Framework.csproj b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/Microsoft.CommonLanguageServerProtocol.Framework.csproj index 3c304c0719c78..4e6abaa06ddaf 100644 --- a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/Microsoft.CommonLanguageServerProtocol.Framework.csproj +++ b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/Microsoft.CommonLanguageServerProtocol.Framework.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj index 8c1be1fe87f44..bd8420b03bd5d 100644 --- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj +++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj @@ -19,9 +19,7 @@ - - - + diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj index d573e65204d55..4945ba47968d6 100644 --- a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj +++ b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj index 17846cbd0ce2b..20ba57b5f5573 100644 --- a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj +++ b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj @@ -60,13 +60,13 @@ - - - - - - - + + + + + + + diff --git a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj index e0a27a120461a..a226f3e723b76 100644 --- a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj +++ b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj @@ -42,7 +42,7 @@ - + diff --git a/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj b/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj index a17384a557b5d..1f981252b1675 100644 --- a/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj +++ b/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj @@ -65,7 +65,7 @@ - + diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj index 253e017054076..24f12e41615da 100644 --- a/src/Interactive/csi/csi.csproj +++ b/src/Interactive/csi/csi.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj index 377aadd465fa9..a3c0cda7f116e 100644 --- a/src/Interactive/vbi/vbi.vbproj +++ b/src/Interactive/vbi/vbi.vbproj @@ -17,7 +17,7 @@ - + diff --git a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj index 0382fe2abdb4d..d44d2b1dbb488 100644 --- a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj +++ b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj @@ -42,6 +42,6 @@ - + \ No newline at end of file diff --git a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj index 3d57ab638d577..ca855a03458bf 100644 --- a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj +++ b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Scripting/CoreTestUtilities/Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj b/src/Scripting/CoreTestUtilities/Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj index a02a54087599c..dd81f2e12f2aa 100644 --- a/src/Scripting/CoreTestUtilities/Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj +++ b/src/Scripting/CoreTestUtilities/Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - - + + \ No newline at end of file diff --git a/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj b/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj index fd378d8d0b5dd..4304fa9524e54 100644 --- a/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj +++ b/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj index dde68248f8483..f2822ce01f1f8 100644 --- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj +++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj @@ -94,7 +94,6 @@ @@ -104,14 +103,19 @@ <_Dependency Remove="@(_Dependency)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('Microsoft.Internal.VisualStudio.'))"/> <_Dependency Remove="EnvDTE"/> <_Dependency Remove="EnvDTE80"/> + <_Dependency Remove="EnvDTE90"/> + <_Dependency Remove="EnvDTE90A"/> + <_Dependency Remove="EnvDTE100"/> <_Dependency Remove="MessagePack"/> <_Dependency Remove="MessagePack.Annotations"/> <_Dependency Remove="Microsoft.Bcl.AsyncInterfaces"/> <_Dependency Remove="Microsoft.Build"/> <_Dependency Remove="Microsoft.Build.Framework"/> <_Dependency Remove="Microsoft.Diagnostics.Tracing.EventSource.Redist"/> - <_Dependency Remove="Microsoft.MSXML"/> + <_Dependency Remove="Microsoft.Extensions.DependencyInjection"/> + <_Dependency Remove="Microsoft.Extensions.DependencyInjection.Abstractions"/> <_Dependency Remove="Microsoft.Internal.Performance.CodeMarkers.DesignTime"/> + <_Dependency Remove="Microsoft.MSXML"/> <_Dependency Remove="Microsoft.NET.StringTools"/> <_Dependency Remove="Microsoft.Win32.Registry"/> <_Dependency Remove="Nerdbank.NetStandardBridge" /> @@ -125,6 +129,7 @@ <_Dependency Remove="System.Collections.Immutable"/> <_Dependency Remove="System.Diagnostics.DiagnosticSource"/> <_Dependency Remove="System.Drawing.Common"/> + <_Dependency Remove="System.IO.Packaging"/> <_Dependency Remove="System.IO.Pipelines"/> <_Dependency Remove="System.Memory"/> <_Dependency Remove="System.Numerics.Vectors"/> @@ -144,7 +149,14 @@ <_Dependency Remove="VSLangProj"/> <_Dependency Remove="VSLangProj2"/> <_Dependency Remove="VSLangProj80"/> + <_Dependency Remove="VSLangProj90"/> + <_Dependency Remove="VSLangProj100"/> + <_Dependency Remove="VSLangProj110"/> <_Dependency Remove="VSLangProj140"/> + <_Dependency Remove="VSLangProj150"/> + <_Dependency Remove="VSLangProj157"/> + <_Dependency Remove="VSLangProj158"/> + <_Dependency Remove="VSLangProj165"/> <_Dependency Remove="VsWebSite.Interop"/> <_Dependency Remove="Microsoft.NET.StringTools" /> <_Dependency Remove="Microsoft.IO.Redist" /> diff --git a/src/Setup/Installer/Installer.Package.csproj b/src/Setup/Installer/Installer.Package.csproj index 72b14ac7b1ed5..52641789c8dee 100644 --- a/src/Setup/Installer/Installer.Package.csproj +++ b/src/Setup/Installer/Installer.Package.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj index 07c4464c41a3e..0df9d36d6826e 100644 --- a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj +++ b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj @@ -34,23 +34,23 @@ - - - - - - - - + + + + + + + + - - - + + + diff --git a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj index 8d05beab2d92d..fb15b12995ec5 100644 --- a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj +++ b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj index 3498bc01d4000..d3e2de0ff5753 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj +++ b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj @@ -12,15 +12,8 @@ - - - - - - - + - @@ -48,10 +41,10 @@ - + - - + + diff --git a/src/Tools/BuildActionTelemetryTable/BuildActionTelemetryTable.csproj b/src/Tools/BuildActionTelemetryTable/BuildActionTelemetryTable.csproj index dc388aed0f372..783809b4edae9 100644 --- a/src/Tools/BuildActionTelemetryTable/BuildActionTelemetryTable.csproj +++ b/src/Tools/BuildActionTelemetryTable/BuildActionTelemetryTable.csproj @@ -19,17 +19,6 @@ - - - - - - - - - - - diff --git a/src/Tools/BuildBoss/BuildBoss.csproj b/src/Tools/BuildBoss/BuildBoss.csproj index 25280e95b884e..3098abf1c73ed 100644 --- a/src/Tools/BuildBoss/BuildBoss.csproj +++ b/src/Tools/BuildBoss/BuildBoss.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index fb83b8a28d541..2f8ac9a742752 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -64,7 +64,6 @@ public bool Check(TextWriter textWriter) allGood &= CheckTargetFrameworks(textWriter); allGood &= CheckProjectReferences(textWriter); - allGood &= CheckPackageReferences(textWriter); if (_isPrimarySolution) { @@ -73,10 +72,6 @@ public bool Check(TextWriter textWriter) allGood &= CheckDeploymentSettings(textWriter); } - else if (ProjectType == ProjectFileType.Tool) - { - allGood &= CheckPackageReferences(textWriter); - } return allGood; } @@ -123,44 +118,6 @@ private bool CheckNoGuidsOnProjectReferences(TextWriter textWriter, List GetAllowedPackageReferenceVersions(PackageReference packageReference) - { - // If this is a generator project, if it has a reference to Microsoft.CodeAnalysis.Common, that means it's - // a source generator. In that case, we require the version of the API being built against to match the toolset - // version, so that way the source generator can actually be loaded by the toolset. We don't apply this rule to - // any other project, as any other project having a reason to reference a version of Roslyn via a PackageReference - // probably doesn't fall under this rule. - if (ProjectFilePath.Contains("CompilerGeneratorTools") && packageReference.Name == "Microsoft.CodeAnalysis.Common") - { - yield return "$(SourceGeneratorMicrosoftCodeAnalysisVersion)"; - } - else - { - var name = packageReference.Name.Replace(".", "").Replace("-", ""); - yield return $"$({name}Version)"; - yield return $"$({name}FixedVersion)"; - yield return $"$(RefOnly{name}Version)"; - } - } - private bool CheckInternalsVisibleTo(TextWriter textWriter) { var allGood = true; diff --git a/src/Tools/BuildBoss/ProjectUtil.cs b/src/Tools/BuildBoss/ProjectUtil.cs index fa5808e17818c..c24bd202f6421 100644 --- a/src/Tools/BuildBoss/ProjectUtil.cs +++ b/src/Tools/BuildBoss/ProjectUtil.cs @@ -141,35 +141,6 @@ internal List GetDeclaredProjectReferences() return list; } - internal List GetPackageReferences() - { - var list = new List(); - foreach (var packageRef in Document.XPathSelectElements("//mb:ItemGroup/mb:PackageReference", Manager)) - { - list.Add(GetPackageReference(packageRef)); - } - - return list; - } - - internal PackageReference GetPackageReference(XElement element) - { - var name = element.Attribute("Include")?.Value ?? element.Attribute("Update")?.Value ?? ""; - var version = element.Attribute("Version"); - if (version != null) - { - return new PackageReference(name, version.Value); - } - - var elem = element.Element(Namespace.GetName("Version")); - if (element == null) - { - throw new Exception($"Could not find a Version for package reference {name}"); - } - - return new PackageReference(name, elem.Value.Trim()); - } - internal List GetInternalsVisibleTo() { var list = new List(); diff --git a/src/Tools/BuildValidator/BuildValidator.csproj b/src/Tools/BuildValidator/BuildValidator.csproj index 46168802379b5..3800558e4d50f 100644 --- a/src/Tools/BuildValidator/BuildValidator.csproj +++ b/src/Tools/BuildValidator/BuildValidator.csproj @@ -22,14 +22,17 @@ - - - - - - - - + + + + + + + + + + + diff --git a/src/Tools/ExternalAccess/Debugger/Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj b/src/Tools/ExternalAccess/Debugger/Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj index e8f78e3b996b5..8292da55aff00 100644 --- a/src/Tools/ExternalAccess/Debugger/Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj +++ b/src/Tools/ExternalAccess/Debugger/Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Tools/ExternalAccess/EditorConfigGenerator/Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj b/src/Tools/ExternalAccess/EditorConfigGenerator/Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj index 4464189642ff4..56b75939c6218 100644 --- a/src/Tools/ExternalAccess/EditorConfigGenerator/Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj +++ b/src/Tools/ExternalAccess/EditorConfigGenerator/Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj @@ -17,11 +17,6 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/Tools/ExternalAccess/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj b/src/Tools/ExternalAccess/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj index 7e1213a883755..54f8e62b5a5f1 100644 --- a/src/Tools/ExternalAccess/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj +++ b/src/Tools/ExternalAccess/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj b/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj index 9b95cd9e85d37..3f7a6cdf19ec9 100644 --- a/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj +++ b/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Shipped.txt b/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Shipped.txt deleted file mode 100644 index 7dc5c58110bfa..0000000000000 --- a/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Shipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Unshipped.txt b/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Unshipped.txt deleted file mode 100644 index 7dc5c58110bfa..0000000000000 --- a/src/Tools/ExternalAccess/Xamarin.Remote/InternalAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Tools/ExternalAccess/Xamarin.Remote/Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj b/src/Tools/ExternalAccess/Xamarin.Remote/Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj deleted file mode 100644 index c43af4d91f83c..0000000000000 --- a/src/Tools/ExternalAccess/Xamarin.Remote/Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Library - Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote - net472 - - - true - Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote - - A supporting package for Xamarin: - https://github.com/xamarin/CodeAnalysis - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Tools/ExternalAccess/Xamarin.Remote/PublicAPI.Shipped.txt b/src/Tools/ExternalAccess/Xamarin.Remote/PublicAPI.Shipped.txt deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/src/Tools/ExternalAccess/Xamarin.Remote/PublicAPI.Unshipped.txt b/src/Tools/ExternalAccess/Xamarin.Remote/PublicAPI.Unshipped.txt deleted file mode 100644 index 8b137891791fe..0000000000000 --- a/src/Tools/ExternalAccess/Xamarin.Remote/PublicAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj index 5865053d8c21c..1a57b395c0128 100644 --- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj +++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj @@ -7,14 +7,13 @@ net472 false $(NoWarn),CA2007 + + $(NoWarn),xUnit1013 true - - - - - + + diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj index b540fe40f5da1..f227201d4a49a 100644 --- a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj +++ b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj @@ -24,22 +24,9 @@ - - - - - - - - - - - - - - - - + + + diff --git a/src/Tools/ManifestGenerator/ManifestGenerator.csproj b/src/Tools/ManifestGenerator/ManifestGenerator.csproj index f3d2e30ad0fe3..04efba0ce5b03 100644 --- a/src/Tools/ManifestGenerator/ManifestGenerator.csproj +++ b/src/Tools/ManifestGenerator/ManifestGenerator.csproj @@ -7,6 +7,6 @@ false - + diff --git a/src/Tools/PrepareTests/PrepareTests.csproj b/src/Tools/PrepareTests/PrepareTests.csproj index f7a89181dcdc2..bd6513fe8d2f9 100644 --- a/src/Tools/PrepareTests/PrepareTests.csproj +++ b/src/Tools/PrepareTests/PrepareTests.csproj @@ -9,6 +9,6 @@ false - + diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 0f17ec889d312..e1794e71faf05 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -13,7 +13,7 @@ - + @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj index 113029735275c..245e8fcd8cbba 100644 --- a/src/Tools/Source/RunTests/RunTests.csproj +++ b/src/Tools/Source/RunTests/RunTests.csproj @@ -8,24 +8,24 @@ false - - - - - - - - + + + + + + + + - + - <_CopyItems Include="$(NuGetPackageRoot)roslyntools.vsixexpinstaller\$(RoslynToolsVSIXExpInstallerVersion)\tools\*.*" /> + <_CopyItems Include="$(PkgRoslynTools_VSIXExpInstaller)\tools\*.*" /> diff --git a/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj b/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj index dae283e5f6042..84032b5202050 100644 --- a/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj +++ b/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj @@ -7,18 +7,18 @@ - - - - - + + + + + - - - - + + + + diff --git a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj index 751821d084341..9814d14aa5285 100644 --- a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj +++ b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj @@ -48,14 +48,9 @@ - - - - - - - - + + + - + true + + - + e_sqlite3.dll PreserveNewest - + Core\e_sqlite3.dll PreserveNewest diff --git a/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj b/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj index 74ad00483fb97..293aa601e30f7 100644 --- a/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj +++ b/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj @@ -16,12 +16,6 @@ - - - - - - diff --git a/src/VisualStudio/Core/Def/Interactive/CommonVsUtils.cs b/src/VisualStudio/Core/Def/Interactive/CommonVsUtils.cs index 42c0bc4078eac..7fe305ad8770f 100644 --- a/src/VisualStudio/Core/Def/Interactive/CommonVsUtils.cs +++ b/src/VisualStudio/Core/Def/Interactive/CommonVsUtils.cs @@ -4,12 +4,8 @@ #nullable disable -using System; -using System.IO; -using Microsoft.VisualStudio; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.Editor; -using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; @@ -40,7 +36,7 @@ internal static string GetFilePath(ITextBuffer textBuffer) /// public static IWpfTextView GetActiveTextView() { - var monitorSelection = (IVsMonitorSelection)Package.GetGlobalService(typeof(SVsShellMonitorSelection)); + var monitorSelection = (IVsMonitorSelection)Shell.Package.GetGlobalService(typeof(SVsShellMonitorSelection)); if (monitorSelection == null) { return null; @@ -72,7 +68,7 @@ public static IWpfTextView GetActiveTextView() return null; } - var model = (IComponentModel)Package.GetGlobalService(typeof(SComponentModel)); + var model = (IComponentModel)Shell.Package.GetGlobalService(typeof(SComponentModel)); var adapterFactory = model.GetService(); var wpfTextView = adapterFactory.GetWpfTextView(textView); return wpfTextView; diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj index 816639fe576e3..e78861f0e5669 100644 --- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj +++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj @@ -24,11 +24,6 @@ .NET Compiler Platform ("Roslyn") support for Visual Studio. - - - - - 6cf2e545-6109-4730-8883-cf43d7aec3e1 @@ -116,50 +111,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + true @@ -202,4 +169,12 @@ + + + + + + + + diff --git a/src/VisualStudio/Core/Def/PreviewPane/PreviewPane.xaml.cs b/src/VisualStudio/Core/Def/PreviewPane/PreviewPane.xaml.cs index cb33a111f6d5a..55200137410a4 100644 --- a/src/VisualStudio/Core/Def/PreviewPane/PreviewPane.xaml.cs +++ b/src/VisualStudio/Core/Def/PreviewPane/PreviewPane.xaml.cs @@ -100,7 +100,7 @@ public PreviewPane( // Initialize preview (i.e. diff view) portion. InitializePreviewElement(previewContent); - _registerPriorityCommandTarget = Package.GetGlobalService(typeof(SVsRegisterPriorityCommandTarget)) as IVsRegisterPriorityCommandTarget; + _registerPriorityCommandTarget = Shell.Package.GetGlobalService(typeof(SVsRegisterPriorityCommandTarget)) as IVsRegisterPriorityCommandTarget; Debug.Assert(_registerPriorityCommandTarget != null); if (_registerPriorityCommandTarget != null) diff --git a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj index 3e68235b2a447..6e9d67ba44dcc 100644 --- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj +++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj @@ -38,19 +38,8 @@ - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/ContextMenuController.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/ContextMenuController.cs index 6f533a42bfff3..150f956950919 100644 --- a/src/VisualStudio/Core/Impl/SolutionExplorer/ContextMenuController.cs +++ b/src/VisualStudio/Core/Impl/SolutionExplorer/ContextMenuController.cs @@ -37,7 +37,7 @@ public bool ShowContextMenu(IEnumerable items, Point location) _updateMenu(); - var shell = Package.GetGlobalService(typeof(SVsUIShell)) as IVsUIShell; + var shell = Shell.Package.GetGlobalService(typeof(SVsUIShell)) as IVsUIShell; var guidContextMenu = Guids.RoslynGroupId; var locationPoints = new[] { new POINTS() { x = (short)location.X, y = (short)location.Y } }; return shell != null && ErrorHandler.Succeeded(shell.ShowContextMenu( diff --git a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj index 2533ebd50e39c..d8a923c36e1f9 100644 --- a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj +++ b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj @@ -49,37 +49,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + diff --git a/src/VisualStudio/Core/Test/ClassView/SyncClassViewTests.vb b/src/VisualStudio/Core/Test/ClassView/SyncClassViewTests.vb index 9582b765d8a23..3b4a9cd0162c2 100644 --- a/src/VisualStudio/Core/Test/ClassView/SyncClassViewTests.vb +++ b/src/VisualStudio/Core/Test/ClassView/SyncClassViewTests.vb @@ -11,6 +11,7 @@ Imports Microsoft.VisualStudio.Text.Editor.Commanding.Commands Imports Roslyn.Test.Utilities Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView + Public Class SyncClassViewTests @@ -35,9 +36,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -57,9 +58,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -79,9 +80,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -101,9 +102,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -126,9 +127,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -151,9 +152,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("X.Y"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("X.Y"), + ClassNode("C")) End Sub @@ -179,9 +180,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("X.Y"), - [Class]("C")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("X.Y"), + ClassNode("C")) End Sub @@ -204,10 +205,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -230,10 +231,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -256,10 +257,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -282,10 +283,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -308,10 +309,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -332,10 +333,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("i")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("i")) End Sub @@ -356,10 +357,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("i")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("i")) End Sub @@ -380,10 +381,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("P")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("P")) End Sub @@ -404,10 +405,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("P")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("P")) End Sub @@ -428,10 +429,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("E")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("E")) End Sub @@ -452,10 +453,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("E")) + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("E")) End Sub #End Region @@ -478,9 +479,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -498,9 +499,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -518,9 +519,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -538,9 +539,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -560,9 +561,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C")) End Sub @@ -582,9 +583,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("X.Y"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("X.Y"), + ClassNode("C")) End Sub @@ -606,9 +607,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("X.Y"), - [Class]("C")) + PackageNode("VBTestAssembly"), + NamespaceNode("X.Y"), + ClassNode("C")) End Sub @@ -629,10 +630,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -652,10 +653,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -675,10 +676,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -698,10 +699,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -721,10 +722,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()")) End Sub @@ -743,10 +744,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("i As Integer")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("i As Integer")) End Sub @@ -765,10 +766,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("i As Integer")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("i As Integer")) End Sub @@ -787,10 +788,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("P As Integer")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("P As Integer")) End Sub @@ -809,10 +810,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("P As Integer")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("P As Integer")) End Sub @@ -831,10 +832,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("E()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("E()")) End Sub @@ -853,10 +854,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView Test(workspace, - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("E()")) + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("E()")) End Sub #End Region diff --git a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj index 94ce52743db98..7e8b130d74ac7 100644 --- a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj +++ b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj @@ -46,26 +46,13 @@ - - - - - - - - - - - - - - - - + + + - - + + diff --git a/src/VisualStudio/Core/Test/Utilities/VsNavInfoHelpers.vb b/src/VisualStudio/Core/Test/Utilities/VsNavInfoHelpers.vb index 80af1c56077b4..928cff55c5326 100644 --- a/src/VisualStudio/Core/Test/Utilities/VsNavInfoHelpers.vb +++ b/src/VisualStudio/Core/Test/Utilities/VsNavInfoHelpers.vb @@ -26,23 +26,23 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Utilities.VsNavInfo End Sub End Function - Public Function Package(expectedName As String) As NodeVerifier + Public Function PackageNode(expectedName As String) As NodeVerifier Return Node(_LIB_LISTTYPE.LLT_PACKAGE, expectedName) End Function - Public Function [Namespace](expectedName As String) As NodeVerifier + Public Function NamespaceNode(expectedName As String) As NodeVerifier Return Node(_LIB_LISTTYPE.LLT_NAMESPACES, expectedName) End Function - Public Function [Class](expectedName As String) As NodeVerifier + Public Function ClassNode(expectedName As String) As NodeVerifier Return Node(_LIB_LISTTYPE.LLT_CLASSES, expectedName) End Function - Public Function Member(expectedName As String) As NodeVerifier + Public Function MemberNode(expectedName As String) As NodeVerifier Return Node(_LIB_LISTTYPE.LLT_MEMBERS, expectedName) End Function - Public Function Hierarchy(expectedName As String) As NodeVerifier + Public Function HierarchyNode(expectedName As String) As NodeVerifier Return Node(_LIB_LISTTYPE.LLT_HIERARCHY, expectedName) End Function diff --git a/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb b/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb index 4fd514756e3fd..c8e8cea79bac9 100644 --- a/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb +++ b/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb @@ -32,12 +32,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N") }, presentationNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N") }) End Function @@ -57,14 +57,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C") }, presentationNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C") }) End Function @@ -87,16 +87,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()") }, presentationNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()") }) End Function @@ -122,16 +122,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M(int, int)") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M(int, int)") }, presentationNodes:={ - Package("CSharpTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M(int, int)") + PackageNode("CSharpTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M(int, int)") }) End Function @@ -152,14 +152,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String") }) End Function @@ -180,15 +180,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Text"), - [Class]("StringBuilder") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Text"), + ClassNode("StringBuilder") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Text"), - [Class]("StringBuilder") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Text"), + ClassNode("StringBuilder") }) End Function @@ -209,17 +209,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Text"), - [Class]("StringBuilder"), - Member("StringBuilder()") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Text"), + ClassNode("StringBuilder"), + MemberNode("StringBuilder()") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Text"), - [Class]("StringBuilder"), - Member("StringBuilder()") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Text"), + ClassNode("StringBuilder"), + MemberNode("StringBuilder()") }) End Function @@ -240,16 +240,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("String(char, int)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("String(char, int)") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("String(char, int)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("String(char, int)") }) End Function @@ -270,16 +270,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("Replace(char, char)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("Replace(char, char)") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("Replace(char, char)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("Replace(char, char)") }) End Function @@ -300,16 +300,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Collections"), - [Namespace]("Generic"), - [Class]("List") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Collections"), + NamespaceNode("Generic"), + ClassNode("List") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Collections.Generic"), - [Class]("List") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Collections.Generic"), + ClassNode("List") }) End Function @@ -334,16 +334,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("Array"), - Member("AsReadOnly(T[])") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("Array"), + MemberNode("AsReadOnly(T[])") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("Array"), - Member("AsReadOnly(T[])") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("Array"), + MemberNode("AsReadOnly(T[])") }) End Function @@ -423,12 +423,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("VBTestAssembly"), - [Namespace]("N") + PackageNode("VBTestAssembly"), + NamespaceNode("N") }, presentationNodes:={ - Package("VBTestAssembly"), - [Namespace]("N") + PackageNode("VBTestAssembly"), + NamespaceNode("N") }) End Function @@ -448,14 +448,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C") }, presentationNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C") }) End Function @@ -477,16 +477,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()") }, presentationNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M()") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M()") }) End Function @@ -508,16 +508,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M() As Integer") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M() As Integer") }, presentationNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M() As Integer") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M() As Integer") }) End Function @@ -539,16 +539,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M(Integer, Integer) As Integer") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M(Integer, Integer) As Integer") }, presentationNodes:={ - Package("VBTestAssembly"), - [Namespace]("N"), - [Class]("C"), - Member("M(Integer, Integer) As Integer") + PackageNode("VBTestAssembly"), + NamespaceNode("N"), + ClassNode("C"), + MemberNode("M(Integer, Integer) As Integer") }) End Function @@ -568,14 +568,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String") }) End Function @@ -595,15 +595,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Text"), - [Class]("StringBuilder") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Text"), + ClassNode("StringBuilder") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Text"), - [Class]("StringBuilder") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Text"), + ClassNode("StringBuilder") }) End Function @@ -623,17 +623,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Text"), - [Class]("StringBuilder"), - Member("New()") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Text"), + ClassNode("StringBuilder"), + MemberNode("New()") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Text"), - [Class]("StringBuilder"), - Member("New()") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Text"), + ClassNode("StringBuilder"), + MemberNode("New()") }) End Function @@ -653,16 +653,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("New(Char, Integer)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("New(Char, Integer)") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("New(Char, Integer)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("New(Char, Integer)") }) End Function @@ -682,16 +682,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("Replace(Char, Char) As String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("Replace(Char, Char) As String") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("String"), - Member("Replace(Char, Char) As String") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("String"), + MemberNode("Replace(Char, Char) As String") }) End Function @@ -711,16 +711,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Namespace]("Collections"), - [Namespace]("Generic"), - [Class]("List(Of T)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + NamespaceNode("Collections"), + NamespaceNode("Generic"), + ClassNode("List(Of T)") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System.Collections.Generic"), - [Class]("List(Of T)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System.Collections.Generic"), + ClassNode("List(Of T)") }) End Function @@ -743,16 +743,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo Await TestAsync(workspace, canonicalNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("Array"), - Member("AsReadOnly(Of T)(T()) As System.Collections.ObjectModel.ReadOnlyCollection(Of T)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("Array"), + MemberNode("AsReadOnly(Of T)(T()) As System.Collections.ObjectModel.ReadOnlyCollection(Of T)") }, presentationNodes:={ - Package("Z:\FxReferenceAssembliesUri"), - [Namespace]("System"), - [Class]("Array"), - Member("AsReadOnly(Of T)(T()) As System.Collections.ObjectModel.ReadOnlyCollection(Of T)") + PackageNode("Z:\FxReferenceAssembliesUri"), + NamespaceNode("System"), + ClassNode("Array"), + MemberNode("AsReadOnly(Of T)(T()) As System.Collections.ObjectModel.ReadOnlyCollection(Of T)") }) End Function diff --git a/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj b/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj index 93d5564d381b0..81afe558ddda7 100644 --- a/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj +++ b/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj @@ -12,7 +12,7 @@ CollectPackInputs;$(BeforePack) - NU5100 + $(NoWarn);NU5100 @@ -27,18 +27,18 @@ - - + + - - - - - + + + + + diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj b/src/VisualStudio/IntegrationTest/New.IntegrationTests/Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj index dc7fddd20b8ed..e0a177535935d 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj @@ -52,14 +52,12 @@ - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj index ec9ec30ad27a6..76dc705fa5b96 100644 --- a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj +++ b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj @@ -19,13 +19,6 @@ Designer - - - - - - - diff --git a/src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj b/src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj index 72734c5360afb..b613d243d3e73 100644 --- a/src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj +++ b/src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj @@ -19,24 +19,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/VisualStudio/LiveShare/Test/Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests.csproj b/src/VisualStudio/LiveShare/Test/Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests.csproj index 47232bf6e17c5..7a58e9546b2a2 100644 --- a/src/VisualStudio/LiveShare/Test/Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests.csproj +++ b/src/VisualStudio/LiveShare/Test/Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests.csproj @@ -7,12 +7,6 @@ Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests UnitTest - - - - - - @@ -41,8 +35,4 @@ - - - - diff --git a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj index 3d4b1dd0d9019..6e47eb1fdd17f 100644 --- a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj +++ b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj @@ -46,7 +46,6 @@ - @@ -57,35 +56,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/VisualStudio/Setup.ServiceHub/Directory.Build.props b/src/VisualStudio/Setup.ServiceHub/Directory.Build.props index 214e431c50cd9..97c5e74599af2 100644 --- a/src/VisualStudio/Setup.ServiceHub/Directory.Build.props +++ b/src/VisualStudio/Setup.ServiceHub/Directory.Build.props @@ -28,7 +28,7 @@ - + e_sqlite3.dll PreserveNewest true @@ -36,6 +36,7 @@ - + + diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj index a7db082b5ee9f..5fe30f9a1a073 100644 --- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj +++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj @@ -91,12 +91,6 @@ true BindingRedirect - - Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote - BuiltProjectOutputGroup - true - BindingRedirect - Workspaces.Desktop BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup @@ -349,7 +343,7 @@ - + e_sqlite3.dll PreserveNewest true @@ -365,14 +359,9 @@ - - - - - - - - - + + + + diff --git a/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj b/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj index d29503b6b042e..adc0bb659b430 100644 --- a/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj +++ b/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj @@ -46,32 +46,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj index 726c666a83112..0b326d99a0166 100644 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj +++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj @@ -49,10 +49,7 @@ - - - - + diff --git a/src/VisualStudio/Xaml/Impl/Microsoft.VisualStudio.LanguageServices.Xaml.csproj b/src/VisualStudio/Xaml/Impl/Microsoft.VisualStudio.LanguageServices.Xaml.csproj index 4c8f5a2006c23..27baeda3c0e68 100644 --- a/src/VisualStudio/Xaml/Impl/Microsoft.VisualStudio.LanguageServices.Xaml.csproj +++ b/src/VisualStudio/Xaml/Impl/Microsoft.VisualStudio.LanguageServices.Xaml.csproj @@ -21,18 +21,6 @@ - - - - - - - - - - - - diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj index 5c69f7a398f50..92415ddba7007 100644 --- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj +++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj index fca82d606508c..2086ffedd9f66 100644 --- a/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj +++ b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj @@ -11,7 +11,7 @@ true - + diff --git a/src/Workspaces/Core/MSBuild.BuildHost/MSBuild/Logging/MSBuildDiagnosticLogger.cs b/src/Workspaces/Core/MSBuild.BuildHost/MSBuild/Logging/MSBuildDiagnosticLogger.cs index 6cd0c3545b892..0454566bdb2f8 100644 --- a/src/Workspaces/Core/MSBuild.BuildHost/MSBuild/Logging/MSBuildDiagnosticLogger.cs +++ b/src/Workspaces/Core/MSBuild.BuildHost/MSBuild/Logging/MSBuildDiagnosticLogger.cs @@ -26,13 +26,13 @@ public void SetProjectAndLog(string projectFilePath, DiagnosticLog log) private void OnErrorRaised(object sender, MSB.Framework.BuildErrorEventArgs e) { RoslynDebug.AssertNotNull(_projectFilePath); - _log?.Add(new MSBuildDiagnosticLogItem(WorkspaceDiagnosticKind.Failure, _projectFilePath, e.Message, e.File, e.LineNumber, e.ColumnNumber)); + _log?.Add(new MSBuildDiagnosticLogItem(WorkspaceDiagnosticKind.Failure, _projectFilePath, e.Message ?? "", e.File, e.LineNumber, e.ColumnNumber)); } private void OnWarningRaised(object sender, MSB.Framework.BuildWarningEventArgs e) { RoslynDebug.AssertNotNull(_projectFilePath); - _log?.Add(new MSBuildDiagnosticLogItem(WorkspaceDiagnosticKind.Warning, _projectFilePath, e.Message, e.File, e.LineNumber, e.ColumnNumber)); + _log?.Add(new MSBuildDiagnosticLogItem(WorkspaceDiagnosticKind.Warning, _projectFilePath, e.Message ?? "", e.File, e.LineNumber, e.ColumnNumber)); } public void Initialize(MSB.Framework.IEventSource eventSource) diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj index 346d434c20869..9abe5f533521d 100644 --- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj @@ -22,14 +22,14 @@ AnyCPU - - - - - - - - + + + + + + + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj index 6cdc0841b0bdf..73173603cb27c 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -22,15 +22,13 @@ - - - - + + - - + + @@ -108,7 +106,7 @@ <_NetFrameworkBuildHostProjectReference Include="..\..\..\Workspaces\Core\MSBuild.BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj"> - $(NetRoslyn) + $(NetRoslynToolset) BuildHost-netcore diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj index 3cad99fbaddc5..e6c9282509741 100644 --- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj @@ -22,15 +22,15 @@ - - - + + + - - - + + + diff --git a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj index 6191135c40a08..e6d89e9db00e0 100644 --- a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj +++ b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj @@ -11,11 +11,6 @@ - - - - - diff --git a/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj b/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj index f5c09c922a519..67e1cf5f9b163 100644 --- a/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj +++ b/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj @@ -20,19 +20,12 @@ - - - - - - - - - - - - - + + + + + + diff --git a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj index 7aab8e031a549..2a2b29384f61b 100644 --- a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj +++ b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj @@ -23,14 +23,10 @@ - - - - - - - - + + + + diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets index f2ceaccba7853..8ce2d5ff4c0e0 100644 --- a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets +++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets @@ -9,7 +9,6 @@ false true - $(MicrosoftNetCoreAppRuntimePackagesVersion) @@ -24,8 +23,8 @@ - - + + - + diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/arm64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.arm64.csproj b/src/Workspaces/Remote/ServiceHub.CoreComponents/arm64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.arm64.csproj index e7f35fb812759..6f87afcb2454f 100644 --- a/src/Workspaces/Remote/ServiceHub.CoreComponents/arm64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.arm64.csproj +++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/arm64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.arm64.csproj @@ -5,16 +5,12 @@ Exe $(NetVS) arm64 - $(NoWarn);NETSDK1206 - - $(MicrosoftNetCoreAppRuntimePackagesVersion) - $(MicrosoftWindowsDesktopAppRuntimePackagesVersion) - - + + <_RuntimeLibrariesPath>$(PkgMicrosoft_NETCore_App_Runtime_win-arm64)\runtimes\win-arm64\ diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/x64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.x64.csproj b/src/Workspaces/Remote/ServiceHub.CoreComponents/x64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.x64.csproj index 29c838734462c..da1891a99ac5f 100644 --- a/src/Workspaces/Remote/ServiceHub.CoreComponents/x64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.x64.csproj +++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/x64/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.x64.csproj @@ -8,13 +8,10 @@ $(NoWarn);NETSDK1206 - - $(MicrosoftNetCoreAppRuntimePackagesVersion) - $(MicrosoftWindowsDesktopAppRuntimePackagesVersion) - - + + <_RuntimeLibrariesPath>$(PkgMicrosoft_NETCore_App_Runtime_win-x64)\runtimes\win-x64\ diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj index 9261d2030498c..dc17be6ae5811 100644 --- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj +++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj @@ -20,13 +20,12 @@ - - - - - - - + + + + + + diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SemanticFacts/CSharpSemanticFacts.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SemanticFacts/CSharpSemanticFacts.cs index dc8f653006fbb..ad3702f260dc8 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SemanticFacts/CSharpSemanticFacts.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SemanticFacts/CSharpSemanticFacts.cs @@ -205,7 +205,7 @@ public ImmutableArray GetDeconstructionAssignmentMethods(Semantic return builder.ToImmutableAndClear(); } - return []; + return ImmutableArray.Empty; } public ImmutableArray GetDeconstructionForEachMethods(SemanticModel semanticModel, SyntaxNode node) @@ -217,7 +217,7 @@ public ImmutableArray GetDeconstructionForEachMethods(SemanticMod return builder.ToImmutableAndClear(); } - return []; + return ImmutableArray.Empty; } private static void FlattenDeconstructionMethods(DeconstructionInfo deconstruction, ref TemporaryArray builder) @@ -282,7 +282,7 @@ public IEnumerable GetDeclaredSymbols( public ImmutableArray GetBestOrAllSymbols(SemanticModel semanticModel, SyntaxNode? node, SyntaxToken token, CancellationToken cancellationToken) { if (node == null) - return []; + return ImmutableArray.Empty; return node switch { @@ -295,7 +295,7 @@ ForEachVariableStatementSyntax _ when token.Kind() == SyntaxKind.InKeyword => Ge static ImmutableArray GetCallingConventionSymbols(SemanticModel model, FunctionPointerUnmanagedCallingConventionSyntax syntax) { var type = model.Compilation.TryGetCallingConventionSymbol(syntax.Name.ValueText); - return type is null ? [] : [type]; + return type is null ? ImmutableArray.Empty : ImmutableArray.Create(type); } } @@ -355,7 +355,7 @@ private static ImmutableArray GetSymbolInfo(SemanticModel semanticModel //Only in the orderby clause a comma can bind to a symbol. if (token.IsKind(SyntaxKind.CommaToken)) - return []; + return ImmutableArray.Empty; // If we're on 'var' then asking for the symbol-info will get us the symbol *without* nullability // information. Check for that, and try to return the type with nullability info if it has it. @@ -367,7 +367,7 @@ private static ImmutableArray GetSymbolInfo(SemanticModel semanticModel type.Equals(symbol, SymbolEqualityComparer.Default) && !type.Equals(symbol, SymbolEqualityComparer.IncludeNullability)) { - return [type]; + return ImmutableArray.Create(type); } } diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/SymbolInfoExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/SymbolInfoExtensions.cs index c47992b1890ff..207c2b732ca14 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/SymbolInfoExtensions.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/SymbolInfoExtensions.cs @@ -16,7 +16,7 @@ public static ImmutableArray GetAllSymbols(this SymbolInfo info) => GetAllSymbolsWorker(info).Distinct(); private static ImmutableArray GetAllSymbolsWorker(this SymbolInfo info) - => info.Symbol == null ? info.CandidateSymbols : [info.Symbol, .. info.CandidateSymbols]; + => info.Symbol == null ? info.CandidateSymbols : info.CandidateSymbols.Insert(0, info.Symbol); public static ISymbol? GetAnySymbol(this SymbolInfo info) => info.Symbol ?? info.CandidateSymbols.FirstOrDefault(); @@ -24,7 +24,7 @@ private static ImmutableArray GetAllSymbolsWorker(this SymbolInfo info) public static ImmutableArray GetBestOrAllSymbols(this SymbolInfo info) { if (info.Symbol != null) - return [info.Symbol]; + return ImmutableArray.Create(info.Symbol); if (info.CandidateSymbols.Contains(null!)) {