Updating test project to .NET 10

distantcam · distantcam · commit cdfe1df52628 · 2025-11-15T10:09:49.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,6 @@ jobs:
           dotnet test
           --configuration Release
           -p:GeneratorVersion=${{ matrix.roslyn }}
-          --logger "console;verbosity=normal"
 
       - name: Upload Test Results
         if: failure()
@@ -70,11 +69,11 @@ jobs:
 
       - name: 🛠️ Build code
         run: >
-            dotnet build
-            --configuration Release
-            -p:Version=${{ github.ref_name }}
-            -p:GitSha=${{ github.sha }}
-            --no-restore
+          dotnet build
+          --configuration Release
+          -p:Version=${{ github.ref_name }}
+          -p:GitSha=${{ github.sha }}
+          --no-restore
 
       - name: 📝 Generate Release Notes
         run: gh release create ${{ github.ref_name }} --draft --generate-notes nugets/*.nupkg
diff --git a/AutoCtor.slnx b/AutoCtor.slnx
@@ -1,12 +1,12 @@
 <Solution>
   <Folder Name="/Solution Items/">
+    <File Path="global.json" />
     <File Path="mdsnippets.json" />
     <File Path="readme.nuget.md" />
     <File Path="readme.source.md" />
     <File Path="src/Common.props" />
     <File Path="src/Directory.Build.props" />
     <File Path="src/Directory.Packages.props" />
-    <File Path="src/global.json" />
     <File Path="src/nugetfiles/AutoCtor.badcompat.targets" />
     <File Path="src/nugetfiles/AutoCtor.props" />
     <File Path="src/nugetfiles/AutoCtor.targets" />
@@ -19,6 +19,5 @@
   <Project Path="src/AutoCtor.Roslyn3.11/AutoCtor.Roslyn3.11.csproj" />
   <Project Path="src/AutoCtor.Roslyn4.0/AutoCtor.Roslyn4.0.csproj" />
   <Project Path="src/AutoCtor.Roslyn4.4/AutoCtor.Roslyn4.4.csproj" />
-  <Project Path="src/AutoCtor.Shared/AutoCtor.Shared.shproj" />
   <Project Path="src/AutoCtor.Tests/AutoCtor.Tests.csproj" />
 </Solution>
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}
diff --git a/src/AutoCtor.Shared/AutoCtor.Shared.projitems b/src/AutoCtor.Shared/AutoCtor.Shared.projitems
diff --git a/src/AutoCtor.Shared/AutoCtor.Shared.shproj b/src/AutoCtor.Shared/AutoCtor.Shared.shproj
diff --git a/src/AutoCtor.Tests/AutoCtor.Tests.csproj b/src/AutoCtor.Tests/AutoCtor.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>CS0169;CS0414</NoWarn>
   </PropertyGroup>
@@ -47,7 +47,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="TUnit" />
     <PackageReference Include="Verify.DiffPlex" />
     <PackageReference Include="Verify.SourceGenerators" />
diff --git a/src/AutoCtor.Tests/Utilities/CompilationBuilder.cs b/src/AutoCtor.Tests/Utilities/CompilationBuilder.cs
@@ -39,10 +39,11 @@ private CompilationBuilder(CompilationBuilder other)
     public async Task<CSharpCompilation> Build(string assemblyName, CancellationToken cancellationToken = default)
     {
         var nugetReferences = await _nugetReferences.ToAsyncEnumerable()
-            .SelectManyAwait(async r =>
-                (await r.ResolveAsync(null, cancellationToken).ConfigureAwait(false))
-                .ToAsyncEnumerable())
-            .ToListAsync(cancellationToken).ConfigureAwait(false);
+            .SelectMany<ReferenceAssemblies, MetadataReference>(static async (r, ct) =>
+                await r.ResolveAsync(null, ct)
+                .ConfigureAwait(false))
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
 
         return CSharpCompilation.Create(assemblyName)
             .AddReferences(nugetReferences)
diff --git a/src/Common.props b/src/Common.props
@@ -22,6 +22,9 @@
     <AssemblyMetadata Include="PackageProjectUrl" Value="$(PackageProjectUrl)" />
   </ItemGroup>
 
-  <Import Project="AutoCtor.Shared\AutoCtor.Shared.projitems" Label="Shared" />
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AutoCtor.Shared\*\*.cs" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)AutoCtor.Shared\*.md" />
+  </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <NoWarn>NU5128</NoWarn>
     <UseArtifactsOutput>true</UseArtifactsOutput>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -13,10 +13,9 @@
     <PackageVersion Include="Microsoft.NETCore.App.Ref" Version="9.0.10" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
-    <PackageVersion Include="TUnit" Version="1.1.0" />
+    <PackageVersion Include="TUnit" Version="1.1.10" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
-    <PackageVersion Include="Verify.TUnit" Version="31.6.1" />
+    <PackageVersion Include="Verify.TUnit" Version="31.7.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestFeature"
   }
-}
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "test": {
 +    "runner": "Microsoft.Testing.Platform"
 +  }
 +}