Upgrade dependencies and drop .NET 6 testing

virzak · virzak · commit 2d627fa58703 · 2024-11-17T18:29:17.000-05:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.8",
+      "version": "5.4.1",
       "commands": [
         "reportgenerator"
       ]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
             9.0.x
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,20 +3,20 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Fody" Version="6.6.4" />
     <PackageVersion Include="IsExternalInit" Version="1.0.3" />
-    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24318.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="N.SourceGenerators.UnionTypes" Version="0.28.0" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.139" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.146" />
     <PackageVersion Include="PolySharp" Version="1.14.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Experimental" Version="6.0.2" />
-    <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
-    <PackageVersion Include="Verify.XUnit" Version="26.0.0" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
+    <PackageVersion Include="Verify.XUnit" Version="28.3.1" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs b/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs
@@ -705,11 +705,11 @@ List<SyntaxTrivia> RemoveFirstEndIf(SyntaxTriviaList list)
             {
                 // The parent is not a block, for example: if (true) return ReturnAsync();
                 // We need to create a block with the expression and the return statement.
-                return Block(List(new StatementSyntax[]
-                    {
+                return Block(List(
+                    [
                         result.WithLeadingTrivia(Space).WithTrailingTrivia(Space),
                         ReturnStatement().WithTrailingTrivia(Space),
-                    }))
+                    ]))
                     .WithLeadingTrivia(node.GetLeadingTrivia())
                     .WithTrailingTrivia(node.GetTrailingTrivia());
             }
@@ -733,11 +733,11 @@ List<SyntaxTrivia> RemoveFirstEndIf(SyntaxTriviaList list)
             }
 
             // Create a block without the braces (eg. Return(); return;)
-            return Block(List(new StatementSyntax[]
-                {
+            return Block(List(
+                [
                     result.WithTrailingTrivia(Space),
                     ReturnStatement().WithTrailingTrivia(node.GetTrailingTrivia()),
-                }))
+                ]))
                 .WithOpenBraceToken(MissingToken(SyntaxKind.OpenBraceToken))
                 .WithCloseBraceToken(MissingToken(SyntaxKind.CloseBraceToken));
         }
diff --git a/tests/GenerationSandbox.Tests/AsyncExtensions.GenericMath.cs b/tests/GenerationSandbox.Tests/AsyncExtensions.GenericMath.cs
@@ -19,20 +19,9 @@ public static partial class AsyncExtensions
     /// <returns>Max indices.</returns>
     [Zomp.SyncMethodGenerator.CreateSyncVersion]
     public static async IAsyncEnumerable<int> IndexOfMaxSoFarAsync<T>(this IAsyncEnumerable<T> items, IProgress<int>? progress = null, [EnumeratorCancellation] CancellationToken ct = default)
-#if NET8_0_OR_GREATER
         where T : IComparisonOperators<T, T, bool>
-#else
-        where T : IComparisonOperators<T, T>
-#endif
     {
-#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(items);
-#else
-        if (source is null)
-        {
-            throw new ArgumentNullException(nameof(items));
-        }
-#endif
 
         var i = 0;
 
diff --git a/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj b/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
@@ -8,13 +8,9 @@
     <NoWarn>$(NoWarn);RS1035</NoWarn>
     <NoWarn>$(NoWarn);SA1200;SA1201;SA1202;SA1204;SA1400;SA1402;SA1403;SA1404;SA1601</NoWarn>
     <ImplicitUsings>false</ImplicitUsings>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net472'">
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
-    <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
-  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Linq.Async" />
@@ -26,16 +22,13 @@
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="coverlet.collector" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Runtime.Experimental" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <Compile Remove="AsyncExtensions.GenericMath.cs" />
     <None Include="AsyncExtensions.GenericMath.cs" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="System.Runtime.CompilerServices" />
-    <Using Include="System.Numerics" Condition="$(TargetFramework) != 'net6.0'" />
+    <Using Include="System.Numerics" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Zomp.SyncMethodGenerator\Zomp.SyncMethodGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
diff --git a/tests/GenerationSandbox.Tests/SyncTests.cs b/tests/GenerationSandbox.Tests/SyncTests.cs
@@ -1,4 +1,4 @@
-﻿#if NET6_0_OR_GREATER
+﻿#if NET8_0_OR_GREATER
 using System.Linq;
 #endif
 using Xunit;
@@ -18,11 +18,9 @@ public void TestGeneratedAverageRoutine()
 
     [Fact]
     public void TestStaticAsyncWithIProgress()
-    {
-        AsyncWithIProgress.CallWithIProgress();
-    }
+        => AsyncWithIProgress.CallWithIProgress();
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
     [Fact]
     public void TestIndexOfMaxSoFar()
     {
diff --git a/tests/Generator.Tests/ConditionalExtensionTests.cs b/tests/Generator.Tests/ConditionalExtensionTests.cs
@@ -41,7 +41,7 @@ public Task CheckArrayNullability() => """
 var z = array?.Single();
 """.Verify(sourceType: SourceType.MethodBody);
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
     [Fact]
     public Task ConditionalToExtension() => """
 [CreateSyncVersion]
diff --git a/tests/Generator.Tests/Generator.Tests.csproj b/tests/Generator.Tests/Generator.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>preview</LangVersion>
@@ -12,9 +12,6 @@
     <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Runtime.Experimental" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <Compile Remove="GenericMathTests.cs" />
     <None Include="GenericMathTests.cs" />
@@ -41,6 +38,6 @@
     <Using Include="Microsoft.CodeAnalysis" />
     <Using Include="Microsoft.CodeAnalysis.CSharp" />
     <Using Include="System.Collections.Immutable" />
-    <Using Include="System.Numerics" Condition="$(TargetFramework) != 'net6.0'" />
+    <Using Include="System.Numerics" />
   </ItemGroup>
 </Project>
diff --git a/tests/Generator.Tests/Snapshots/GenericMathTests.GeneratesWithIProgressCorrectly.DotNet6_0#Test.EnumerableExtensions.IndexOfMaxSoFarAsync.g.verified.cs b/tests/Generator.Tests/Snapshots/GenericMathTests.GeneratesWithIProgressCorrectly.DotNet6_0#Test.EnumerableExtensions.IndexOfMaxSoFarAsync.g.verified.cs
diff --git a/tests/Generator.Tests/Snapshots/SyncOnlyTests.DoNotMixSymbols.verified.txt b/tests/Generator.Tests/Snapshots/SyncOnlyTests.DoNotMixSymbols.verified.txt
@@ -1,14 +1,17 @@
 ﻿{
   Diagnostics: [
     {
-      Id: ZSMGEN002,
-      Title: SYNC_ONLY and other symbols must not be in the same condition,
-      Severity: Error,
-      WarningLevel: 0,
       Location: : (6,0)-(6,38),
-      MessageFormat: Couldn't process condition '{0}'. SYNC_ONLY and other symbols must not be in the same condition.,
       Message: Couldn't process condition '#if SYMBOL1 && !(SYNC_ONLY || SYMBOL2)'. SYNC_ONLY and other symbols must not be in the same condition.,
-      Category: Preprocessor
+      Severity: Error,
+      Descriptor: {
+        Id: ZSMGEN002,
+        Title: SYNC_ONLY and other symbols must not be in the same condition,
+        MessageFormat: Couldn't process condition '{0}'. SYNC_ONLY and other symbols must not be in the same condition.,
+        Category: Preprocessor,
+        DefaultSeverity: Error,
+        IsEnabledByDefault: true
+      }
     }
   ]
 }
diff --git a/tests/Generator.Tests/Snapshots/SyncOnlyTests.NotSyncOnlyInsideSyncOnly.verified.txt b/tests/Generator.Tests/Snapshots/SyncOnlyTests.NotSyncOnlyInsideSyncOnly.verified.txt
@@ -1,14 +1,17 @@
 ﻿{
   Diagnostics: [
     {
-      Id: ZSMGEN001,
-      Title: SYNC_ONLY and !SYNC_ONLY cannot be nested inside each other,
-      Severity: Error,
-      WarningLevel: 0,
       Location: : (8,0)-(8,14),
-      MessageFormat: Couldn't process directive '{0}'. SYNC_ONLY and !SYNC_ONLY cannot be nested inside each other.,
       Message: Couldn't process directive '#if !SYNC_ONLY'. SYNC_ONLY and !SYNC_ONLY cannot be nested inside each other.,
-      Category: Preprocessor
+      Severity: Error,
+      Descriptor: {
+        Id: ZSMGEN001,
+        Title: SYNC_ONLY and !SYNC_ONLY cannot be nested inside each other,
+        MessageFormat: Couldn't process directive '{0}'. SYNC_ONLY and !SYNC_ONLY cannot be nested inside each other.,
+        Category: Preprocessor,
+        DefaultSeverity: Error,
+        IsEnabledByDefault: true
+      }
     }
   ]
 }
diff --git a/tests/Generator.Tests/Snapshots/SyncOnlyTests.ProhibitElif.verified.txt b/tests/Generator.Tests/Snapshots/SyncOnlyTests.ProhibitElif.verified.txt
@@ -1,14 +1,17 @@
 ﻿{
   Diagnostics: [
     {
-      Id: ZSMGEN003,
-      Title: SYNC_ONLY cannot be used with #elif,
-      Severity: Error,
-      WarningLevel: 0,
       Location: : (8,0)-(8,12),
-      MessageFormat: Couldn't process directive '{0}'. SYNC_ONLY cannot be used with #elif.,
       Message: Couldn't process directive '#elif Symbol'. SYNC_ONLY cannot be used with #elif.,
-      Category: Preprocessor
+      Severity: Error,
+      Descriptor: {
+        Id: ZSMGEN003,
+        Title: SYNC_ONLY cannot be used with #elif,
+        MessageFormat: Couldn't process directive '{0}'. SYNC_ONLY cannot be used with #elif.,
+        Category: Preprocessor,
+        DefaultSeverity: Error,
+        IsEnabledByDefault: true
+      }
     }
   ]
 }
diff --git a/tests/Generator.Tests/Snapshots/UnitTests.WithPreprocessor#WithPreprocessorAsync.g.verified.cs b/tests/Generator.Tests/Snapshots/UnitTests.WithPreprocessor#WithPreprocessorAsync.g.verified.cs
@@ -3,6 +3,6 @@
 namespace Test;
 public partial class Class
 {
-    #if NET6_0_OR_GREATER
+    #if NET8_0_OR_GREATER
     private void WithPreprocessor() { }
 }
diff --git a/tests/Generator.Tests/TestHelper.cs b/tests/Generator.Tests/TestHelper.cs
@@ -42,12 +42,6 @@ private static readonly string[] PreprocessorSymbols
 #endif
 #if NET8_0_OR_GREATER
         "NET8_0_OR_GREATER",
-#endif
-#if NET6_0
-        "NET6_0",
-#endif
-#if NET6_0_OR_GREATER
-        "NET6_0_OR_GREATER",
 #endif
     ];
 #endif
@@ -105,7 +99,7 @@ partial class Class
             typeof(System.Buffers.MemoryPool<>).Assembly.Location,
             typeof(Queue<>).Assembly.Location,
             typeof(LinkedListNode<>).Assembly.Location,
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
             typeof(AsyncEnumerable).Assembly.Location,
 #endif
             linqAssembly,

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"dotnet-reportgenerator-globaltool": {`
`12`		`- "version": "5.3.8",`
	`12`	`+ "version": "5.4.1",`
`13`	`13`	`"commands": [`
`14`	`14`	`"reportgenerator"`
`15`	`15`	`]`