Update .NET SDK 9.0 (#768)

meziantou · Nov 13, 2024 · f807685 · f807685
1 parent 4975e3b
commit f807685
Show file tree

Hide file tree

Showing 245 changed files with 318 additions and 160 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -39,10 +39,15 @@ indent_size = 2
 insert_final_newline = true
 
 [*.cs]
+dotnet_diagnostic.IDE0058.severity = none
+dotnet_diagnostic.IDE0303.severity = none
+dotnet_diagnostic.CA1508.severity = none
+dotnet_diagnostic.CA2000.severity = none
 dotnet_diagnostic.RS1041.severity = none
 dotnet_diagnostic.RS2008.severity = none
-dotnet_diagnostic.CA1508.severity = none
 
 [src/ListDotNetTypes/*.cs]
 dotnet_diagnostic.CA2007.severity = none
-dotnet_diagnostic.MA0004.severity = none
+dotnet_diagnostic.MA0004.severity = none
+
+
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.135">
+    <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.143">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -43,4 +43,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup>
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-7jgj-8wvc-jh57" />
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-cmhx-cq75-c4mj" />
+  </ItemGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -78,10 +78,10 @@
 
     <Otherwise>
       <ItemGroup>
-        <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24225.1" />
-        <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
-        <PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
-        <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
+        <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+        <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+        <PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
+        <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
       </ItemGroup>
       <PropertyGroup>
         <DefineConstants>$(DefineConstants);ROSLYN4_8;ROSLYN_4_2_OR_GREATER;ROSLYN_4_4_OR_GREATER;ROSLYN_4_5_OR_GREATER;ROSLYN_4_6_OR_GREATER;ROSLYN_4_8_OR_GREATER;ROSLYN_4_10_OR_GREATER</DefineConstants>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.303",
-    "rollForward": "latestMajor"
+    "version": "9.0.100",
+    "rollForward": "latestPatch"
   }
 }
diff --git a/src/DocumentationGenerator/DocumentationGenerator.csproj b/src/DocumentationGenerator/DocumentationGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/src/ListDotNetTypes/ListDotNetTypes.csproj b/src/ListDotNetTypes/ListDotNetTypes.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="6.10.1" />
+    <PackageReference Include="NuGet.Protocol" Version="6.12.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ListDotNetTypes/Program.cs b/src/ListDotNetTypes/Program.cs
@@ -27,7 +27,9 @@
         Console.WriteLine(packageName + "@" + latestVersion);
 
         using var packageStream = new MemoryStream();
-        await resource.CopyNupkgToStreamAsync(packageName, latestVersion, packageStream, cache, NullLogger.Instance, CancellationToken.None);
+        if (!await resource.CopyNupkgToStreamAsync(packageName, latestVersion, packageStream, cache, NullLogger.Instance, CancellationToken.None))
+            throw new InvalidOperationException("Cannot copy NuGet package");
+
         packageStream.Seek(0, SeekOrigin.Begin);
 
         using var zipArchive = new ZipArchive(packageStream, ZipArchiveMode.Read);

diff --git a/src/Meziantou.Analyzer.Annotations/RequireNamedArgumentAttribute.cs b/src/Meziantou.Analyzer.Annotations/RequireNamedArgumentAttribute.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable IDE0060
 #pragma warning disable CA1019
-#nullable disable
 
 namespace Meziantou.Analyzer.Annotations;
 

diff --git a/src/Meziantou.Analyzer.Annotations/StructuredLogFieldAttribute.cs b/src/Meziantou.Analyzer.Annotations/StructuredLogFieldAttribute.cs
@@ -2,7 +2,6 @@
 #pragma warning disable IDE0060
 #pragma warning disable IDE0290
 #pragma warning disable CA1019
-#nullable disable
 
 namespace Meziantou.Analyzer.Annotations;
 

diff --git a/src/Meziantou.Analyzer.CodeFixers/Internals/DocumentBasedFixAllProvider.cs b/src/Meziantou.Analyzer.CodeFixers/Internals/DocumentBasedFixAllProvider.cs
@@ -1,4 +1,6 @@
-// File initially copied from
+#if ROSLYN_3_8
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+// File initially copied from
 //  https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/4d9b3e3bb785a55f73b3029a843f0c0b73cc9ea7/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Helpers/DocumentBasedFixAllProvider.cs
 // Original copyright statement:
 //  Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
@@ -7,6 +9,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -18,22 +21,22 @@ namespace Meziantou.Analyzer;
 /// </summary>
 internal abstract class DocumentBasedFixAllProvider : FixAllProvider
 {
-    protected abstract string CodeActionTitle { get; }
+    protected abstract string GetFixAllTitle(FixAllContext fixAllContext);
 
     public override Task<CodeAction?> GetFixAsync(FixAllContext fixAllContext)
     {
         return Task.FromResult(fixAllContext.Scope switch
         {
             FixAllScope.Document => CodeAction.Create(
-                                        CodeActionTitle,
+                                        GetFixAllTitle(fixAllContext),
                                         cancellationToken => GetDocumentFixesAsync(fixAllContext.WithCancellationToken(cancellationToken)),
                                         nameof(DocumentBasedFixAllProvider)),
             FixAllScope.Project => CodeAction.Create(
-                                        CodeActionTitle,
+                                        GetFixAllTitle(fixAllContext),
                                         cancellationToken => GetProjectFixesAsync(fixAllContext.WithCancellationToken(cancellationToken), fixAllContext.Project),
                                         nameof(DocumentBasedFixAllProvider)),
             FixAllScope.Solution => CodeAction.Create(
-                                        CodeActionTitle,
+                                        GetFixAllTitle(fixAllContext),
                                         cancellationToken => GetSolutionFixesAsync(fixAllContext.WithCancellationToken(cancellationToken)),
                                         nameof(DocumentBasedFixAllProvider)),
             _ => null,
@@ -47,11 +50,11 @@ internal abstract class DocumentBasedFixAllProvider : FixAllProvider
     /// <param name="document">The document to fix.</param>
     /// <param name="diagnostics">The diagnostics to fix in the document.</param>
     /// <returns>
-    /// <para>The new <see cref="SyntaxNode"/> representing the root of the fixed document.</para>
+    /// <para>The new <see cref="Document"/> representing the root of the fixed document.</para>
     /// <para>-or-</para>
     /// <para><see langword="null"/>, if no changes were made to the document.</para>
     /// </returns>
-    protected abstract Task<SyntaxNode?> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics);
+    protected abstract Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics);
 
     private async Task<Document> GetDocumentFixesAsync(FixAllContext fixAllContext)
     {
@@ -62,30 +65,25 @@ private async Task<Document> GetDocumentFixesAsync(FixAllContext fixAllContext)
             return document;
         }
 
-        var newRoot = await FixAllInDocumentAsync(fixAllContext, document, diagnostics).ConfigureAwait(false);
-        if (newRoot is null)
-        {
-            return document;
-        }
-
-        return document.WithSyntaxRoot(newRoot);
+        var newDocument = await FixAllAsync(fixAllContext, document, diagnostics).ConfigureAwait(false);
+        return newDocument ?? document;
     }
 
     private async Task<Solution> GetSolutionFixesAsync(FixAllContext fixAllContext, ImmutableArray<Document> documents)
     {
         var documentDiagnosticsToFix = await FixAllContextHelper.GetDocumentDiagnosticsToFixAsync(fixAllContext).ConfigureAwait(false);
 
         var solution = fixAllContext.Solution;
-        var newDocuments = new List<Task<SyntaxNode?>>(documents.Length);
+        var newDocuments = new List<Task<Document?>>(documents.Length);
         foreach (var document in documents)
         {
             if (!documentDiagnosticsToFix.TryGetValue(document, out var diagnostics))
             {
-                newDocuments.Add(document.GetSyntaxRootAsync(fixAllContext.CancellationToken));
+                newDocuments.Add(Task.FromResult<Document?>(document));
                 continue;
             }
 
-            newDocuments.Add(FixAllInDocumentAsync(fixAllContext, document, diagnostics));
+            newDocuments.Add(FixAllAsync(fixAllContext, document, diagnostics));
         }
 
         for (var i = 0; i < documents.Length; i++)
@@ -94,7 +92,7 @@ private async Task<Solution> GetSolutionFixesAsync(FixAllContext fixAllContext,
             if (newDocumentRoot is null)
                 continue;
 
-            solution = solution.WithDocumentSyntaxRoot(documents[i].Id, newDocumentRoot);
+            //solution = solution.WithDocumentSyntaxRoot(documents[i].Id, newDocumentRoot);
         }
 
         return solution;
@@ -111,3 +109,4 @@ private Task<Solution> GetSolutionFixesAsync(FixAllContext fixAllContext)
         return GetSolutionFixesAsync(fixAllContext, documents);
     }
 }
+#endif
diff --git a/src/Meziantou.Analyzer.CodeFixers/Internals/FixAllContextHelper.cs b/src/Meziantou.Analyzer.CodeFixers/Internals/FixAllContextHelper.cs
@@ -11,7 +11,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
 
-namespace Meziantou.Analyzer;
+namespace Meziantou.Analyzer.Internals;
 
 internal static class FixAllContextHelper
 {

diff --git a/src/Meziantou.Analyzer.CodeFixers/Meziantou.Analyzer.CodeFixers.csproj b/src/Meziantou.Analyzer.CodeFixers/Meziantou.Analyzer.CodeFixers.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;netstandard2.0</TargetFrameworks>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Version>1.0.1</Version>
     <Nullable>enable</Nullable>

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/AvoidUsingRedundantElseFixAllProvider.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/AvoidUsingRedundantElseFixAllProvider.cs
@@ -9,16 +9,14 @@ internal sealed class AvoidUsingRedundantElseFixAllProvider : DocumentBasedFixAl
 {
     public static AvoidUsingRedundantElseFixAllProvider Instance { get; } = new AvoidUsingRedundantElseFixAllProvider();
 
-    protected override string CodeActionTitle => "Remove redundant else";
+    protected override string GetFixAllTitle(FixAllContext fixAllContext) => "Remove redundant else";
 
-    /// <inheritdoc/>
-    protected override async Task<SyntaxNode?> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+    protected override async Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
     {
         if (diagnostics.IsEmpty)
             return null;
 
         var newDocument = await AvoidUsingRedundantElseFixer.RemoveRedundantElseClausesInDocument(document, diagnostics, fixAllContext.CancellationToken).ConfigureAwait(false);
-
-        return await newDocument.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+        return newDocument;
     }
 }
diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/ClassMustBeSealedFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/ClassMustBeSealedFixer.cs
@@ -2,6 +2,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -46,5 +47,4 @@ private static async Task<Document> AddSealedModifier(Document document, SyntaxN
         editor.ReplaceNode(classNode, classNode.WithModifiers(modifiers).WithAdditionalAnnotations(Formatter.Annotation));
         return editor.GetChangedDocument();
     }
-
 }
diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseBlockingCallInAsyncContextFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseBlockingCallInAsyncContextFixer.cs
@@ -3,6 +3,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -40,8 +41,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     equivalenceKey: "Thread_Sleep");
 
                 context.RegisterCodeFix(codeAction, context.Diagnostics);
+                break;
             }
-            break;
 
             case DoNotUseBlockingCallInAsyncContextData.Task_Wait:
             {
@@ -51,8 +52,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     equivalenceKey: "Task_Wait");
 
                 context.RegisterCodeFix(codeAction, context.Diagnostics);
+                break;
             }
-            break;
 
             case DoNotUseBlockingCallInAsyncContextData.Task_Result:
             {
@@ -62,8 +63,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     equivalenceKey: "Task_Result");
 
                 context.RegisterCodeFix(codeAction, context.Diagnostics);
+                break;
             }
-            break;
 
             case DoNotUseBlockingCallInAsyncContextData.Overload:
             {
@@ -76,8 +77,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     equivalenceKey: "Overload");
 
                 context.RegisterCodeFix(codeAction, context.Diagnostics);
+                break;
             }
-            break;
 
             case DoNotUseBlockingCallInAsyncContextData.Using:
             case DoNotUseBlockingCallInAsyncContextData.UsingDeclarator:
@@ -88,8 +89,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     equivalenceKey: "Overload");
 
                 context.RegisterCodeFix(codeAction, context.Diagnostics);
+                break;
             }
-            break;
         }
     }
 

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseEqualityComparerDefaultOfStringFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseEqualityComparerDefaultOfStringFixer.cs
@@ -3,6 +3,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseStringGetHashCodeFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseStringGetHashCodeFixer.cs
@@ -3,6 +3,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/EqualityShouldBeCorrectlyImplementedFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/EqualityShouldBeCorrectlyImplementedFixer.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/MakeClassStaticFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/MakeClassStaticFixer.cs
@@ -2,6 +2,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/MakeMemberReadOnlyFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/MakeMemberReadOnlyFixer.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -102,16 +103,15 @@ internal sealed class MakeMemberReadOnlyFixAllProvider : DocumentBasedFixAllProv
     {
         public static MakeMemberReadOnlyFixAllProvider Instance { get; } = new MakeMemberReadOnlyFixAllProvider();
 
-        protected override string CodeActionTitle => "Add readonly";
+        protected override string GetFixAllTitle(FixAllContext fixAllContext) => "Add readonly";
 
-        /// <inheritdoc/>
-        protected override async Task<SyntaxNode?> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+        protected override async Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
         {
             if (diagnostics.IsEmpty)
                 return null;
 
             var newDocument = await MakeReadOnly(document, diagnostics, fixAllContext.CancellationToken).ConfigureAwait(false);
-            return await newDocument.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+            return newDocument;
         }
 
         internal static async Task<Document> MakeReadOnly(Document document, ImmutableArray<Diagnostic> diagnostics, CancellationToken cancellationToken)