Build for .NET 5, 6, 7, 8 & 9 and ReferenceAssemblies.Default to loca…

eng/Versions.props

@@ -12,7 +12,7 @@
     <UsingToolSymbolUploader>true</UsingToolSymbolUploader>
     <UsingToolNuGetRepack>true</UsingToolNuGetRepack>
     <UsingToolIbcOptimization>true</UsingToolIbcOptimization>
-    <MicrosoftNetCompilersToolsetVersion>4.8.0</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.12.0-3.final</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>$(MicrosoftNetCompilersToolsetVersion)</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
     <MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>$(MicrosoftNetCompilersToolsetVersion)</MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>
     <!-- Force prior version due to https://github.com/microsoft/vstest/pull/2192 and https://github.com/microsoft/vstest/pull/2067 -->
@@ -60,6 +60,7 @@
     <MicrosoftVisualStudioValidationVersion>17.0.64</MicrosoftVisualStudioValidationVersion>
     <NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
     <StreamJsonRpcVersion>2.12.27</StreamJsonRpcVersion>
+    <SystemResourcesExtensionsVersion>9.0.0</SystemResourcesExtensionsVersion>
     <VSLangProjVersion>$(MicrosoftVisualStudioShellPackagesVersion)</VSLangProjVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>17.0.0-preview-1-30928-1111</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.0.4207-preview4</MicrosoftVSSDKBuildToolsVersion>

global.json

@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "8.0.101",
+    "version": "9.0.100",
     "allowPrerelease": false,
     "rollForward": "latestPatch"
   },
   "tools": {
-    "dotnet": "8.0.101",
+    "dotnet": "9.0.100",
     "runtimes": {
       "dotnet": [
         "3.1.0"
       ]
     },
     "vs": {
-      "version": "17.8.0"
+      "version": "17.12.0"
     },
     "xcopy-msbuild": "17.8.1-2"
   },

src/Microsoft.CodeAnalysis.Testing/Directory.Build.props

@@ -10,19 +10,22 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
+    <!--    Required for the .NET 9 SDK to still build .NET Standard 1.6-->
+    <CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>
+
     <!--
       netcoreapp3.1: Ensures full support for nullable reference types
       netstandard1.6/net452: Roslyn 1.x
       netstandard1.6/net46: Roslyn 2.x
       netstandard2.0/net472: Roslyn 3.x
     -->
-    <TestingLibraryTargetFrameworks>netcoreapp3.1;netstandard1.6;netstandard2.0;net452;net46;net472</TestingLibraryTargetFrameworks>
+    <TestingLibraryTargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard1.6;netstandard2.0;net452;net46;net472</TestingLibraryTargetFrameworks>
 
     <!--
       netcoreapp3.1: Ensures full support for nullable reference types
       netstandard2.0/net472: Roslyn 3.x, starting with 3.8.0
     -->
-    <TestingLibrarySourceGeneratorTargetFrameworks>netcoreapp3.1;netstandard2.0;net472</TestingLibrarySourceGeneratorTargetFrameworks>
+    <TestingLibrarySourceGeneratorTargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;net472</TestingLibrarySourceGeneratorTargetFrameworks>
   </PropertyGroup>
 
   <Choose>

src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/AnalyzerTest`1.cs

@@ -1310,7 +1310,7 @@ where parameterTypes.SequenceEqual(new[] { ienumerableOfISourceGeneratorType, ty
                                              where method is { Name: "AsSourceGenerator", IsStatic: true, IsPublic: true }
                                              let parameterTypes = method.GetParameters().Select(parameter => parameter.ParameterType).ToArray()
                                              where parameterTypes.SequenceEqual(new[] { iincrementalGeneratorType })
-                                             select method).SingleOrDefault();
+                                             select method).Single();
                     convertedSourceGeneratorsArray.SetValue(asGeneratorMethod.Invoke(null, new[] { sourceGenerators[i] }), i);
                 }
             }
@@ -1319,7 +1319,7 @@ where parameterTypes.SequenceEqual(new[] { iincrementalGeneratorType })
                                      where method is { Name: nameof(ImmutableArray.CreateRange), IsStatic: true, IsPublic: true }
                                      let parameterTypes = method.GetParameters().Select(static parameter => parameter.ParameterType).ToArray()
                                      where parameterTypes.Length == 1 && parameterTypes[0].GetGenericTypeDefinition() == typeof(IEnumerable<>)
-                                     select method).SingleOrDefault();
+                                     select method).Single();
             var convertedSourceGenerators = createRangeMethod.MakeGenericMethod(isourceGeneratorType).Invoke(null, new object[] { convertedSourceGeneratorsArray });
 
             var analyzerOptions = project.AnalyzerOptions;

src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/CodeActionTest`1.cs

@@ -368,7 +368,7 @@ public bool Equals((string filename, SourceText content) x, (string filename, So
 
                 if (x.content is null || y.content is null)
                 {
-                    return ReferenceEquals(x, y);
+                    return Equals(x, y);
                 }
 
                 return x.content.Encoding == y.content.Encoding

src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/Lightup/LightupHelpers.cs

@@ -61,7 +61,7 @@ public static Func<T, TResult> CreatePropertyAccessor<T, TResult>(Type? type, st
 
             Expression<Func<T, TResult>> expression =
                 Expression.Lambda<Func<T, TResult>>(
-                    Expression.Convert(Expression.Call(instance, property.GetMethod), typeof(TResult)),
+                    Expression.Convert(Expression.Call(instance, property.GetMethod!), typeof(TResult)),
                     parameter);
             return expression.Compile();
         }

src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies+FileSystemSemaphore.cs

@@ -19,7 +19,7 @@ public FileSystemSemaphore(string path)
             {
                 _path = path ?? throw new ArgumentNullException(nameof(path));
 
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
+                Directory.CreateDirectory(Path.GetDirectoryName(path)!);
             }
 
             internal async Task<Releaser> WaitAsync(CancellationToken cancellationToken)

src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs

@@ -91,7 +91,17 @@ public static ReferenceAssemblies Default
         {
             get
             {
-#if NETSTANDARD1_6
+#if NET9_0_OR_GREATER
+                return Net.Net90;
+#elif NET8_0_OR_GREATER
+                return Net.Net80;
+#elif NET7_0_OR_GREATER
+                return Net.Net70;
+#elif NET6_0_OR_GREATER
+                return Net.Net60;
+#elif NET5_0_OR_GREATER
+                return Net.Net50;
+#elif NETSTANDARD1_6
                 return NetStandard.NetStandard16;
 #elif NETSTANDARD2_0
                 return NetStandard.NetStandard20;
@@ -1532,6 +1542,7 @@ public int GetHashCode(ImmutableArray<T> obj)
         }
 
         private sealed class ImmutableDictionaryWithImmutableArrayValuesEqualityComparer<TKey, TValue> : IEqualityComparer<ImmutableDictionary<TKey, ImmutableArray<TValue>>?>
+            where TKey : notnull
         {
             public static readonly ImmutableDictionaryWithImmutableArrayValuesEqualityComparer<TKey, TValue> Instance = new();
 

src/VisualStudio.Roslyn.SDK/ComponentDebugger/Roslyn.ComponentDebugger.csproj

@@ -30,6 +30,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="$(MicrosoftVisualStudioShellPackagesVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(MicrosoftVisualStudioShellPackagesVersion)" PrivateAssets="all" />
-   <PackageReference Include="Microsoft.ServiceHub.Framework" Version="$(MicrosoftServiceHubFrameworkVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.ServiceHub.Framework" Version="$(MicrosoftServiceHubFrameworkVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
   </ItemGroup>
 </Project>

src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.DgmlHelper/SyntaxDgmlHelper.vb

@@ -1,8 +1,8 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports System
 Imports System.Collections.Generic
 Imports System.Linq
-Imports System
 Imports System.Resources
 Imports System.Runtime.CompilerServices
 Imports System.Xml.Linq

src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj

@@ -16,6 +16,7 @@
     <Ngen>false</Ngen>
     <UseCodeBase>true</UseCodeBase>
     <SetupProductArch>Neutral</SetupProductArch>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <!-- References -->
@@ -45,6 +46,7 @@
     <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
     <!-- Explicit reference to avoid missing package warning -->
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" />
+    <PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
   </ItemGroup>
 
   <!-- Project References -->