Update Roslyn to 4.13.0-3.24620.4

.github/workflows/build.yml

@@ -1,8 +1,8 @@
 
 name: 'Build'
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
-  DotNetVersion2: "8.0.303"
+  DotNetVersion: "9.0.100-rc.1.24452.12"
+  DotNetVersion2: "8.0.402"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
@@ -36,14 +36,6 @@ jobs:
           clean: 'false'
           fetch-depth: '0'
 
-      # TODO: Need to figure out the correct way to install mono on linux / mac
-      # Currently the latest image has mono 6.12
-      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
-      # - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
-      #   uses: maxim-lobanov/setup-xamarin@v1
-      #   with:
-      #     mono-version: ${{ env.MonoVersion }}
-
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
         with:
@@ -71,39 +63,39 @@ jobs:
           dotnet cake --configuration=Release --verbosity=Verbose --target=CI --publish-all --archive
 
       - name: ⬆ Publish Logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:
           name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
           path: '${{ env.Artifacts }}/logs/'
 
       - name: ⬆ Publish Packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:
           name: 'packages'
           path: '${{ env.Artifacts }}/package/'
 
       - name: ⬆ Publish Deployment
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:
           name: 'deployment'
           path: '${{ env.Artifacts }}/deployment/'
 
       - name: ⬆ Publish NuGet
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:
           name: 'nuget'
           path: '${{ env.Artifacts }}/nuget/'
 
       - name: ⬆ Publish Scripts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:

.github/workflows/tests-net6.yml

@@ -1,8 +1,8 @@
 
 name: 'Tests net6.0'
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
-  DotNetVersion2: "8.0.303"
+  DotNetVersion: "9.0.100-rc.1.24452.12"
+  DotNetVersion2: "8.0.402"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
@@ -39,14 +39,6 @@ jobs:
           clean: 'false'
           fetch-depth: '0'
 
-      # TODO: Need to figure out the correct way to install mono on linux / mac
-      # Currently the latest image has mono 6.12
-      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
-      # - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
-      #   uses: maxim-lobanov/setup-xamarin@v1
-      #   with:
-      #     mono-version: ${{ env.MonoVersion }}
-
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
         with:
@@ -82,7 +74,7 @@ jobs:
           TEST_PROJECT: ${{ matrix.testProjects }}
 
       - name: ⬆ Publish Logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:

.github/workflows/tests.yml

@@ -1,8 +1,8 @@
 
 name: 'Tests'
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
-  DotNetVersion2: "8.0.303"
+  DotNetVersion: "9.0.100-rc.1.24452.12"
+  DotNetVersion2: "8.0.402"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
@@ -39,14 +39,6 @@ jobs:
           clean: 'false'
           fetch-depth: '0'
 
-      # TODO: Need to figure out the correct way to install mono on linux / mac
-      # Currently the latest image has mono 6.12
-      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
-      # - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
-      #   uses: maxim-lobanov/setup-xamarin@v1
-      #   with:
-      #     mono-version: ${{ env.MonoVersion }}
-
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
         with:
@@ -82,7 +74,7 @@ jobs:
           TEST_PROJECT: ${{ matrix.testProjects }}
 
       - name: ⬆ Publish Logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         if: ${{ always() }}
         with:

.pipelines/init.yml

@@ -1,7 +1,7 @@
 parameters:
   # Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "8.0.201"
+  DotNetVersion: "8.0.402"
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"
   MonoVersion: ""

Directory.Packages.props

@@ -8,8 +8,8 @@
         <MicrosoftExtensionPackageVersion>8.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
-        <NuGetPackageVersion>6.11.0-rc.110</NuGetPackageVersion>
-        <RoslynPackageVersion>4.12.0-1.24358.3</RoslynPackageVersion>
+        <NuGetPackageVersion>6.12.0-preview.1.81</NuGetPackageVersion>
+        <RoslynPackageVersion>4.13.0-1.24477.2</RoslynPackageVersion>
         <XunitPackageVersion>2.6.1</XunitPackageVersion>
     </PropertyGroup>
 
@@ -19,7 +19,7 @@
 
         <PackageVersion Include="Cake.Scripting.Transport" Version="0.15.0" />
 
-        <PackageVersion Include="DiffPlex" Version="1.7.1" />
+        <PackageVersion Include="DiffPlex" Version="1.7.2" />
 
         <PackageVersion Include="Dotnet.Script.DependencyModel" Version="1.5.0" />
         <PackageVersion Include="Dotnet.Script.DependencyModel.NuGet" Version="1.5.0" />

azure-pipelines.yml

@@ -17,7 +17,7 @@ resources:
 
 variables:
   Verbosity: Diagnostic
-  DotNetVersion: "8.0.303"
+  DotNetVersion: "8.0.402"
   CakeVersion: "3.0.0"
   NuGetVersion: "6.5.0"
   GitVersionVersion: "5.0.1"

build.json

@@ -4,8 +4,8 @@
     "DotNetVersions": [
         "6.0.203",
         "7.0.410",
-        "8.0.303",
-        "9.0.100-preview.6.24328.19"
+        "8.0.402",
+        "9.0.100-rc.1.24452.12"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.303",
+        "version": "8.0.402",
         "rollForward": "latestMinor"
     }
 }

src/OmniSharp.Abstractions/Configuration.cs

@@ -4,7 +4,7 @@ internal static class Configuration
     {
         public static bool ZeroBasedIndices = false;
 
-        public const string RoslynVersion = "4.12.0.0";
+        public const string RoslynVersion = "4.13.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

src/OmniSharp.Roslyn/Utilities/ShadowCopyAnalyzerAssemblyLoader.cs

@@ -5,6 +5,8 @@ namespace OmniSharp.Roslyn.Utilities
 {
     public static class ShadowCopyAnalyzerAssemblyLoader
     {
-        public static readonly IAnalyzerAssemblyLoader Instance = OmnisharpAnalyzerAssemblyLoaderFactory.CreateShadowCopyAnalyzerAssemblyLoader();
+        public static readonly IAnalyzerAssemblyLoader Instance = CreateShadowCopyLoader();
+
+        public static IAnalyzerAssemblyLoader CreateShadowCopyLoader() => OmnisharpAnalyzerAssemblyLoaderFactory.CreateShadowCopyAnalyzerAssemblyLoader();
     }
 }

test-assets/test-projects/Net80Project/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.303"
+        "version": "8.0.402"
     }
-}
+}

test-assets/test-projects/Net90Project/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100-preview.6.24328.19"
+        "version": "9.0.100-rc.1.24452.12"
     }
-}
+}

tests/OmniSharp.MSBuild.Tests/AbstractMSBuildTestFixture.cs

@@ -16,13 +16,11 @@ public abstract class AbstractMSBuildTestFixture : AbstractTestFixture, IDisposa
     {
         private readonly IAssemblyLoader _assemblyLoader;
         private readonly IMSBuildLocator _msbuildLocator;
-        private readonly IAnalyzerAssemblyLoader _analyzerAssemblyLoader;
 
         public AbstractMSBuildTestFixture(ITestOutputHelper output)
             : base(output)
         {
             _assemblyLoader = new AssemblyLoader(this.LoggerFactory);
-            _analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.Instance;
 
             // Since we can only load MSBuild once into our process we need to include
             // prerelease version so that our .NET 7 tests will pass.
@@ -47,7 +45,7 @@ protected OmniSharpTestHost CreateMSBuildTestHost(string path, IEnumerable<Expor
             IConfiguration configurationData = null)
         {
             var environment = new OmniSharpEnvironment(path, logLevel: LogLevel.Trace);
-            var serviceProvider = TestServiceProvider.Create(this.TestOutput, environment, this.LoggerFactory, _assemblyLoader, _analyzerAssemblyLoader, _msbuildLocator,
+            var serviceProvider = TestServiceProvider.Create(this.TestOutput, environment, this.LoggerFactory, _assemblyLoader, ShadowCopyAnalyzerAssemblyLoader.CreateShadowCopyLoader(), _msbuildLocator,
                 configurationData);
 
             return OmniSharpTestHost.Create(serviceProvider, additionalExports);

tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs

@@ -243,7 +243,7 @@ public async Task The_correct_sdk_version_is_emitted_NET8()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net80Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("8.0.303"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("8.0.402"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(DotnetRuntimeOnly))]
@@ -255,7 +255,7 @@ public async Task The_correct_sdk_version_is_emitted_NET9()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net90Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("9.0.100-preview.6.24328.19"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("9.0.100-rc.1.24452.12"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         private string GetHashedFileExtension(string fileExtension)

tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs

@@ -120,7 +120,7 @@ private async Task VerifyImplementType(string code, string expectedChange, Dicti
                     Column = point.Offset,
                     FileName = testFile.FileName,
                     Buffer = testFile.Content.Code,
-                    Identifier = "False;False;True:global::IFoo;AssemblyName;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;",
+                    Identifier = "False;False;True:global::IFoo;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;",
                     WantsTextChanges = true,
                     WantsAllCodeActionOperations = true
                 };

tests/OmniSharp.Tests/DotNetCliServiceFacts.cs

@@ -7,7 +7,7 @@ namespace OmniSharp.Tests
 {
     public class DotNetCliServiceFacts : AbstractTestFixture
     {
-        private const string DotNetVersion = "8.0.303";
+        private const string DotNetVersion = "8.0.402";
         private int Major { get; }
         private int Minor { get; }
         private int Patch { get; }

tests/TestUtility/TestServiceProvider.cs

@@ -87,7 +87,7 @@ public static IServiceProvider Create(
             var configuration = CreateConfiguration(configurationData);
             var msbuildLocator = CreateMSBuildLocator(loggerFactory, assemblyLoader, configurationData);
             var sharedTextWriter = CreateSharedTextWriter(testOutput);
-            var analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.Instance;
+            var analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.CreateShadowCopyLoader();
 
             return new TestServiceProvider(
                 environment, loggerFactory, assemblyLoader, analyzerAssemblyLoader, sharedTextWriter,