Update Roslyn to 4.13.0-3.24620.4 (OmniSharp#2642)

cheerio-pixel · Dec 31, 2024 · 606e1f3 · 606e1f3
2 parents c16eb2a + 1f765d8
commit 606e1f3
Show file tree

Hide file tree

Showing 39 changed files with 195 additions and 165 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.0.0",
+      "version": "4.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -23,3 +23,8 @@ indent_size = 4
 
 [*.{yml,yaml}]
 indent_size = 2
+
+[tests/**/*.cs]
+dotnet_diagnostic.RS1038.severity = none
+dotnet_diagnostic.RS1041.severity = none
+dotnet_diagnostic.RS1042.severity = none
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,6 @@
-
-name: 'Build'
+name: "Build"
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
+  DotNetVersion: "9.0.101"
   DotNetVersion2: "8.0.303"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
@@ -19,30 +18,22 @@ on:
       - master
       - feature/*
     tags:
-      - '*'
+      - "*"
   workflow_dispatch:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
-    name: 'Build'
+        os: [ubuntu-20.04, windows-2022, macos-13]
+    name: "Build"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          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 }}
+          clean: "false"
+          fetch-depth: "0"
 
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
@@ -71,41 +62,41 @@ 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: "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: "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: "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: "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:
-          name: 'scripts - ${{ matrix.os }}'
-          path: '${{ env.Artifacts }}/scripts/'
+          name: "scripts - ${{ matrix.os }}"
+          path: "${{ env.Artifacts }}/scripts/"
diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -1,7 +1,6 @@
-
-name: 'Tests net6.0'
+name: "Tests net6.0"
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
+  DotNetVersion: "9.0.101"
   DotNetVersion2: "8.0.303"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
@@ -19,33 +18,25 @@ on:
       - master
       - feature/*
     tags:
-      - '*'
+      - "*"
   workflow_dispatch:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
+        os: [ubuntu-20.04, windows-2022, macos-13]
         testProjects:
           - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
           - OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
-    name: 'Test'
+    name: "Test"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          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 }}
+          clean: "false"
+          fetch-depth: "0"
 
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
@@ -82,9 +73,9 @@ 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:
-          name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
-          path: '${{ env.Artifacts }}/logs/'
+          name: "logs - ${{ github.workflow }} ${{ matrix.os }}"
+          path: "${{ env.Artifacts }}/logs/"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,7 +1,6 @@
-
-name: 'Tests'
+name: "Tests"
 env:
-  DotNetVersion: "9.0.100-preview.6.24328.19"
+  DotNetVersion: "9.0.101"
   DotNetVersion2: "8.0.303"
   DotNetVersion3: "7.0.410"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
@@ -19,33 +18,25 @@ on:
       - master
       - feature/*
     tags:
-      - '*'
+      - "*"
   workflow_dispatch:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
+        os: [ubuntu-20.04, windows-2022, macos-13]
         testProjects:
           - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
           - OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
-    name: 'Test'
+    name: "Test"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          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 }}
+          clean: "false"
+          fetch-depth: "0"
 
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
@@ -82,9 +73,9 @@ 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:
-          name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
-          path: '${{ env.Artifacts }}/logs/'
+          name: "logs - ${{ github.workflow }} ${{ matrix.os }}"
+          path: "${{ env.Artifacts }}/logs/"
diff --git a/.pipelines/init.yml b/.pipelines/init.yml
@@ -1,7 +1,7 @@
 parameters:
   # Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "8.0.201"
+  DotNetVersion: "8.0.303"
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"
   MonoVersion: ""

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,18 +8,18 @@
         <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.13.0-rc.95</NuGetPackageVersion>
+        <RoslynPackageVersion>4.13.0-3.24620.4</RoslynPackageVersion>
         <XunitPackageVersion>2.6.1</XunitPackageVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
         <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
 
-        <PackageVersion Include="Cake.Scripting.Transport" Version="0.15.0" />
+        <PackageVersion Include="Cake.Scripting.Transport" Version="0.16.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" />
@@ -43,7 +43,7 @@
         <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" Version="$(RoslynPackageVersion)" />
         <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="$(RoslynPackageVersion)" />
 
-        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionPackageVersion)" />
@@ -55,7 +55,7 @@
         <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionPackageVersion)" />
-        <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
         <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
 
         <PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
@@ -88,7 +88,7 @@
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
         <PackageVersion Include="System.Memory" Version="4.5.5" />
         <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
-        <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+        <PackageVersion Include="System.Text.Json" Version="8.0.5" />
         <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
         <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,7 +18,7 @@ resources:
 variables:
   Verbosity: Diagnostic
   DotNetVersion: "8.0.303"
-  CakeVersion: "3.0.0"
+  CakeVersion: "4.2.0"
   NuGetVersion: "6.5.0"
   GitVersionVersion: "5.0.1"
   MonoVersion: "6.12.0"
@@ -91,7 +91,7 @@ stages:
 
       - job: macOS
         pool:
-          vmImage: "macos-12"
+          vmImage: "macos-13"
         dependsOn: GitVersion
         steps:
           - template: ./.pipelines/init.yml

diff --git a/build.json b/build.json
@@ -5,7 +5,7 @@
         "6.0.203",
         "7.0.410",
         "8.0.303",
-        "9.0.100-preview.6.24328.19"
+        "9.0.101"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

diff --git a/global.json b/global.json
@@ -3,4 +3,4 @@
         "version": "8.0.303",
         "rollForward": "latestMinor"
     }
-}
+}
diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/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");
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
             "version": "8.0.303",
             "rollForward": "latestMinor"
         }
-    }
+    }