Update Roslyn to 4.13.0-3.24620.4

.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

.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.13.0-rc.95</NuGetPackageVersion>
+        <RoslynPackageVersion>4.13.0-3.24617.3</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" />
@@ -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" />
 

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.Host/WorkspaceInitializer.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Composition.Hosting;
 using System.Linq;
+using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.ImplementType;
+using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Options;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -33,13 +35,15 @@
 
             logger.LogDebug("Starting with OmniSharp options: {options}", options.CurrentValue);
             ProvideWorkspaceOptions(compositionHost, workspace, options, logger, omnisharpEnvironment);
+            ProvideFallbackAnalyzerConfigOptions(workspace, options, logger);
 
             // when configuration options change
             // run workspace options providers automatically
             options.OnChange(o =>
             {
                 logger.LogDebug("OmniSharp options changed: {options}", options.CurrentValue);
                 ProvideWorkspaceOptions(compositionHost, workspace, options, logger, omnisharpEnvironment);
+                ProvideFallbackAnalyzerConfigOptions(workspace, options, logger);
             });
 
             var projectSystems = compositionHost.GetExports<IProjectSystem>();
@@ -100,5 +104,53 @@
                 }
             }
         }
+
+        private static void ProvideFallbackAnalyzerConfigOptions(
+            OmniSharpWorkspace workspace,
+            IOptionsMonitor<OmniSharpOptions> options,
+            ILogger logger)
+        {
+            logger.LogInformation($"Updating the solution's fallback AnalyzerConfigOptions.");
+            OmniSharpSolutionAnalyzerConfigOptionsUpdater.UpdateOptions(workspace, ToOmniSharpEditorConfigOptions(options.CurrentValue));
+        }
+
+        private static OmniSharpEditorConfigOptions ToOmniSharpEditorConfigOptions(OmniSharpOptions options)
+        {
+            var lineFormattingOptions = new OmniSharpLineFormattingOptions
+            {
+                NewLine = options.FormattingOptions.NewLine,
+                UseTabs = options.FormattingOptions.UseTabs,
+                TabSize = options.FormattingOptions.TabSize,
+                IndentationSize = options.FormattingOptions.IndentationSize,
+            };
+
+            var implementTypeOptions = new OmniSharpImplementTypeOptions
+            {
+                InsertionBehavior = ToOmniSharpInsertionBehavior(options.ImplementTypeOptions.InsertionBehavior),
+                PropertyGenerationBehavior = ToOmniSharpPropertyGenerationBehavior(options.ImplementTypeOptions.PropertyGenerationBehavior),
+            };
+
+            return new OmniSharpEditorConfigOptions
+            {
+                LineFormattingOptions = lineFormattingOptions,
+                ImplementTypeOptions = implementTypeOptions,
+            };
+
+            static OmniSharpImplementTypeInsertionBehavior ToOmniSharpInsertionBehavior(ImplementTypeInsertionBehavior insertionBehavior)
+                => insertionBehavior switch
+                {
+                    ImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind => OmniSharpImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind,
+                    ImplementTypeInsertionBehavior.AtTheEnd => OmniSharpImplementTypeInsertionBehavior.AtTheEnd,
+                    _ => throw new ArgumentException(nameof(insertionBehavior))
+                };
+
+            static OmniSharpImplementTypePropertyGenerationBehavior ToOmniSharpPropertyGenerationBehavior(ImplementTypePropertyGenerationBehavior propertyGenerationBehavior)
+                => propertyGenerationBehavior switch
+                {
+                    ImplementTypePropertyGenerationBehavior.PreferThrowingProperties => OmniSharpImplementTypePropertyGenerationBehavior.PreferThrowingProperties,
+                    ImplementTypePropertyGenerationBehavior.PreferAutoProperties => OmniSharpImplementTypePropertyGenerationBehavior.PreferAutoProperties,
+                    _ => throw new ArgumentException(nameof(propertyGenerationBehavior))
+                };
+        }
     }
 }

src/OmniSharp.Roslyn.CSharp/Services/Refactoring/RunFixAllCodeActionService.cs

@@ -15,7 +15,6 @@
 using OmniSharp.Abstractions.Models.V1.FixAll;
 using OmniSharp.Mef;
 using OmniSharp.Options;
-using OmniSharp.Roslyn.CodeActions;
 using OmniSharp.Roslyn.CSharp.Services.Refactoring.V2;
 using OmniSharp.Roslyn.CSharp.Workers.Diagnostics;
 using OmniSharp.Services;
@@ -140,10 +139,8 @@
 
             _logger.LogTrace("{0} is still present in the document. Getting fixes.", diagnosticId);
 
-            var codeActionOptions = CodeActionOptionsFactory.Create(Options);
-
             CodeAction action = null;
             var context = OmniSharpCodeFixContextFactory.CreateCodeFixContext(
                 document,
                 primaryDiagnostic.Location.SourceSpan,
                 ImmutableArray.Create(primaryDiagnostic),
@@ -154,7 +151,6 @@
                         action = a;
                     }
                 },
-                codeActionOptions,
                 cancellationToken);
 
             await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
@@ -167,7 +163,7 @@
                 _ => throw new InvalidOperationException()
             };
 
             var fixAllContext = OmniSharpCodeFixContextFactory.CreateFixAllContext(
                 document,
                 primaryDiagnostic.Location.SourceSpan,
                 document.Project,
@@ -176,7 +172,6 @@
                 action?.EquivalenceKey,
                 ImmutableArray.Create(diagnosticId),
                 _fixAllDiagnosticProvider,
-                _ => codeActionOptions,
                 cancellationToken);
 
             _logger.LogTrace("Finding FixAll fix for {0}.", diagnosticId);

src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/BaseCodeActionService.cs

@@ -20,7 +20,6 @@
 using OmniSharp.Models;
 using OmniSharp.Models.V2.CodeActions;
 using OmniSharp.Options;
-using OmniSharp.Roslyn.CodeActions;
 using OmniSharp.Roslyn.CSharp.Helpers;
 using OmniSharp.Roslyn.CSharp.Services.Diagnostics;
 using OmniSharp.Roslyn.CSharp.Workers.Diagnostics;
@@ -137,20 +136,17 @@
 
         private async Task AppendFixesAsync(Document document, TextSpan span, IEnumerable<Diagnostic> diagnostics, List<(CodeAction CodeAction, string CodeActionKind)> codeActions)
         {
-            var codeActionOptions = CodeActionOptionsFactory.Create(Options);
-
             foreach (var codeFixProvider in GetSortedCodeFixProviders(document))
             {
                 var fixableDiagnostics = diagnostics.Where(d => HasFix(codeFixProvider, d.Id)).ToImmutableArray();
 
                 if (fixableDiagnostics.Length > 0)
                 {
                     var context = OmniSharpCodeFixContextFactory.CreateCodeFixContext(
                         document,
                         span,
                         fixableDiagnostics,
                         (a, _) => codeActions.Add((a, CodeActionKind.QuickFix)),
-                        codeActionOptions,
                         CancellationToken.None);
 
                     try
@@ -184,14 +180,13 @@
 
         private async Task CollectRefactoringActions(Document document, TextSpan span, List<(CodeAction CodeAction, string CodeActionKind)> codeActions)
         {
-            var codeActionOptions = CodeActionOptionsFactory.Create(Options);
             var availableRefactorings = OrderedCodeRefactoringProviders.Value;
 
             foreach (var codeRefactoringProvider in availableRefactorings)
             {
                 try
                 {
                     var context = OmniSharpCodeFixContextFactory.CreateCodeRefactoringContext(
                         document,
                         span,
                         (a, _) =>
@@ -211,7 +206,6 @@
                             }
                             codeActions.Add((a, kind));
                         },
-                        codeActionOptions,
                         CancellationToken.None);
 
                     await codeRefactoringProvider.ComputeRefactoringsAsync(context);