Move to .NET 10 SDK, add test coverage for net10 TFM (#1562)

jevansaks · web-flow · commit 3cf50cea4734 · 2025-11-23T20:24:06.000-08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -47,7 +47,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion Condition="'$(MSBuildProjectExtension)'=='.csproj'">13</LangVersion>
+    <LangVersion Condition="'$(MSBuildProjectExtension)'=='.csproj'">14</LangVersion>
     <LangVersion Condition="'$(MSBuildProjectExtension)'=='.vbproj'">16.9</LangVersion>
   </PropertyGroup>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,7 +10,7 @@
     <WDKMetadataVersion>0.13.25-experimental</WDKMetadataVersion>
     <!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
     <ApiDocsVersion>0.1.42-alpha</ApiDocsVersion>
-    <CodeAnalysisVersion>4.14.0</CodeAnalysisVersion>
+    <CodeAnalysisVersion>5.0.0</CodeAnalysisVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- We have to use the MessagePack version used by win32metadata (https://github.com/microsoft/CsWin32/issues/371) -->
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.306",
+    "version": "10.0.100",
     "rollForward": "patch",
     "allowPrerelease": false
   },
diff --git a/src/CsWin32Generator/CsWin32Generator.csproj b/src/CsWin32Generator/CsWin32Generator.csproj
@@ -5,6 +5,8 @@
     <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>
+
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Windows.CsWin32/Generator.GeneratedCode.cs b/src/Microsoft.Windows.CsWin32/Generator.GeneratedCode.cs
@@ -82,9 +82,9 @@ internal GeneratedCode(GeneratedCode parent)
 
         internal IEnumerable<MethodDeclarationSyntax> InlineArrayIndexerExtensions => this.inlineArrayIndexerExtensionsMembers;
 
-        internal IEnumerable<FieldDeclarationSyntax> TopLevelFields => from field in this.fieldsToSyntax.Values
-                                                                       where field.FieldType is null || !this.types.ContainsKey((field.FieldType.Value, false))
-                                                                       select field.FieldDeclaration;
+        internal IEnumerable<FieldDeclarationSyntax> TopLevelFields => from @field in this.fieldsToSyntax.Values
+                                                                       where @field.FieldType is null || !this.types.ContainsKey((@field.FieldType.Value, false))
+                                                                       select @field.FieldDeclaration;
 
         internal IEnumerable<IGrouping<string, MemberDeclarationSyntax>> MembersByModule
         {
diff --git a/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.csproj b/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.csproj
@@ -48,11 +48,14 @@
     <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" GeneratePathProperty="true" PrivateAssets="none" />
     <PackageReference Include="Microsoft.Windows.SDK.Win32Docs" GeneratePathProperty="true" PrivateAssets="none" />
     <PackageReference Include="Microsoft.Windows.WDK.Win32Metadata" GeneratePathProperty="true" PrivateAssets="none" />
-    <PackageReference Include="System.Memory" PrivateAssets="none" />
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="System.Text.Encodings.Web" />
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+    <PackageReference Include="System.Memory" PrivateAssets="none" />    
+  </ItemGroup>
+
   <Import Project="$(MSBuildProjectName).targets" />
 </Project>
diff --git a/test/CsWin32Generator.Tests/CsWin32GeneratorTests.cs b/test/CsWin32Generator.Tests/CsWin32GeneratorTests.cs
@@ -302,7 +302,14 @@ private async Task VerifySignatureWorker(string api, string member, string signa
 
     [Theory]
     [MemberData(nameof(TestApiData))]
-    public async Task TestGenerateApi(string api, string purpose, TestOptions options = TestOptions.None, string? nativeMethodsJson = null)
+    public async Task TestGenerateApiNet10(string api, string purpose, TestOptions options = TestOptions.None, string? nativeMethodsJson = null)
+    {
+        await this.TestGenerateApiWorker(api, purpose, options, "net10.0", nativeMethodsJson);
+    }
+
+    [Theory]
+    [MemberData(nameof(TestApiData))]
+    public async Task TestGenerateApiNet9(string api, string purpose, TestOptions options = TestOptions.None, string? nativeMethodsJson = null)
     {
         await this.TestGenerateApiWorker(api, purpose, options, "net9.0", nativeMethodsJson);
     }
@@ -316,7 +323,13 @@ public async Task TestGenerateApiNet8(string api, string purpose, TestOptions op
 
     private async Task TestGenerateApiWorker(string api, string purpose, TestOptions options, string tfm, string? nativeMethodsJson)
     {
-        LanguageVersion langVersion = (tfm == "net8.0") ? LanguageVersion.CSharp12 : LanguageVersion.CSharp13;
+        LanguageVersion langVersion = tfm switch
+        {
+            "net8.0" => LanguageVersion.CSharp12,
+            "net9.0" => LanguageVersion.CSharp13,
+            "net10.0" => LanguageVersion.CSharp14,
+            _ => throw new InvalidOperationException(),
+        };
 
         this.tfm = tfm;
         this.compilation = this.starterCompilations[tfm];
@@ -553,7 +566,7 @@ public async Task VerifyOverloadPriorityAttributeInNet8(LanguageVersion langVers
     public async Task CrossWinMD_IInspectable(
         [CombinatorialValues([false, true])] bool allowMarshaling,
         [CombinatorialValues([null, "TestPInvoke"])] string pinvokeClassName,
-        [CombinatorialValues(["net8.0", "net9.0"])] string tfm)
+        [CombinatorialValues(["net8.0", "net9.0", "net10.0"])] string tfm)
     {
         this.compilation = this.starterCompilations[tfm];
         this.win32winmdPaths = [.. this.win32winmdPaths!, CustomIInspectableMetadataPath];
diff --git a/test/CsWin32Generator.Tests/CsWin32GeneratorTestsBase.cs b/test/CsWin32Generator.Tests/CsWin32GeneratorTestsBase.cs
@@ -194,11 +194,7 @@ protected async Task CompileGeneratedFilesWithSourceGenerators(string outputPath
             syntaxTrees.Add(syntaxTree);
         }
 
-        bool canDisableRuntimeMarshalling = this.tfm is null ||
-            this.tfm.StartsWith("net6.0", StringComparison.OrdinalIgnoreCase) ||
-            this.tfm.StartsWith("net7.0", StringComparison.OrdinalIgnoreCase) ||
-            this.tfm.StartsWith("net8.0", StringComparison.OrdinalIgnoreCase) ||
-            this.tfm.StartsWith("net9.0", StringComparison.OrdinalIgnoreCase);
+        bool canDisableRuntimeMarshalling = this.tfm is not "net472";
 
         if (canDisableRuntimeMarshalling)
         {
@@ -268,14 +264,17 @@ protected async Task CompileGeneratedFilesWithSourceGenerators(string outputPath
         var analyzerDiagnostics = await compilationWithAnalyzers.GetAllDiagnosticsAsync();
 
         var filteredAnalyzerDiagnostics = analyzerDiagnostics.Where(d =>
-            d.Descriptor.Id switch {
+            d.Descriptor.Id switch
+            {
                 "CA1016" or
                 "SA1517" or
                 "SA1633" or
                 "CS1701" or
                 "CA1418" or // Ignore bad platforms coming from win32metadata like "windowsserver2008"
                 "CS0465" // IMFSinkWriterEx has a "Finalize" method
-                => false, _ => true, });
+                => false,
+                _ => true,
+            });
 
         allDiagnostics.AddRange(filteredAnalyzerDiagnostics);
 
diff --git a/test/CsWin32User.props b/test/CsWin32User.props
@@ -15,7 +15,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" GeneratePathProperty="true" PrivateAssets="none" />
     <!-- <PackageReference Include="Microsoft.Dia.Win32Metadata" PrivateAssets="none" /> -->
-    <PackageReference Include="System.Memory" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+    <PackageReference Include="System.Memory" />
+  </ItemGroup>
+  
 </Project>
diff --git a/test/GenerationSandbox.BuildTask.Tests/GenerationSandbox.BuildTask.Tests.csproj b/test/GenerationSandbox.BuildTask.Tests/GenerationSandbox.BuildTask.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0-windows10.0.22621.0</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows10.0.22621.0;net10.0-windows10.0.22621.0</TargetFrameworks>
   </PropertyGroup>
 
   <Import Project="..\GenerationSandbox.props" />
@@ -12,7 +12,7 @@
 
   <!-- For browsing, add the .cs files as None items -->
   <ItemGroup>
-    <None Include="$(IntermediateOutputPath)Generated\CsWin32\*.cs" LinkBase="Generated" />
-    <None Include="$(IntermediateOutputPath)Generated\CsWin32\*.txt" LinkBase="Generated" />
+    <None Include="$(IntermediateOutputPath)Generated\CsWin32\*.cs" LinkBase="Generated\$(TargetFramework)" />
+    <None Include="$(IntermediateOutputPath)Generated\CsWin32\*.txt" LinkBase="Generated\$(TargetFramework)" />
   </ItemGroup>
 </Project>
diff --git a/test/GenerationSandbox.props b/test/GenerationSandbox.props
@@ -8,7 +8,7 @@
   <Import Project="CsWin32User.props" />
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net9.0-windows7.0;net8.0-windows7.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net10.0-windows7.0;net9.0-windows7.0;net8.0-windows7.0;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace />
     <PlatformTarget>x64</PlatformTarget>
@@ -19,10 +19,13 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
     <PackageReference Include="Microsoft.Win32.Registry" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
diff --git a/test/Microsoft.Windows.CsWin32.Tests/FullGenerationTests.cs b/test/Microsoft.Windows.CsWin32.Tests/FullGenerationTests.cs
@@ -53,6 +53,7 @@ public void Constants()
     }
 
     [Theory, PairwiseData]
+    [Trait("TestCategory", "FailsInCloudTest")] // these take ~4GB of memory to run.
     public void ExternMethods(
         MarshalingOptions marshaling,
         bool useIntPtrForComOutPtr,
diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTestBase.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTestBase.cs
@@ -50,6 +50,7 @@ public enum MarshalingOptions
             new object[] { "netstandard2.0" },
             new object[] { "net8.0" },
             new object[] { "net9.0" },
+            new object[] { "net10.0" },
         };
 
     public static IEnumerable<object[]> TFMDataNoNetFx35MemberData => TFMDataNoNetFx35.Select(tfm => new object[] { tfm }).ToArray();
@@ -61,6 +62,7 @@ public enum MarshalingOptions
             "netstandard2.0",
             "net8.0",
             "net9.0",
+            "net10.0",
         };
 
     public static Platform[] SpecificCpuArchitectures =>
@@ -91,6 +93,7 @@ public virtual async ValueTask InitializeAsync()
         this.starterCompilations.Add("net8.0-x86", await this.CreateCompilationAsync(MyReferenceAssemblies.Net.Net80, Platform.X86));
         this.starterCompilations.Add("net8.0-x64", await this.CreateCompilationAsync(MyReferenceAssemblies.Net.Net80, Platform.X64));
         this.starterCompilations.Add("net9.0", await this.CreateCompilationAsync(MyReferenceAssemblies.Net.Net90));
+        this.starterCompilations.Add("net10.0", await this.CreateCompilationAsync(MyReferenceAssemblies.Net.Net100));
 
         foreach (string tfm in this.starterCompilations.Keys)
         {
@@ -117,6 +120,11 @@ public virtual async ValueTask InitializeAsync()
                 AddSymbols("NET9_0_OR_GREATER");
             }
 
+            if (tfm.StartsWith("net10"))
+            {
+                AddSymbols("NET10_0_OR_GREATER");
+            }
+
             // Guarantee we have at least an empty list of symbols for each TFM.
             AddSymbols();
 
@@ -178,6 +186,7 @@ protected static bool IsOrContainsExternMethod(MethodDeclarationSyntax method)
     {
         "net8.0" => LanguageVersion.CSharp12,
         "net9.0" => LanguageVersion.CSharp13,
+        "net10.0" => LanguageVersion.CSharp14,
         _ => null,
     };
 
diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -67,7 +67,7 @@ public void SimplestMethod(string tfm)
         this.AssertNoDiagnostics();
 
         var generatedMethod = this.FindGeneratedMethod(methodName).Single();
-        if (tfm is "net8.0" or "net9.0")
+        if (tfm is "net8.0" or "net9.0" or "net10.0")
         {
             Assert.Contains(generatedMethod.AttributeLists, al => IsAttributePresent(al, "SupportedOSPlatform"));
         }
diff --git a/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs b/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs
@@ -55,13 +55,23 @@ internal static class NetFramework
 
     internal static class Net
     {
+        private static readonly Lazy<ReferenceAssemblies> LazyNet100 = new(() =>
+            new(
+                targetFramework: "net10.0",
+                referenceAssemblyPackage: new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"),
+                referenceAssemblyPath: Path.Combine("ref", "net10.0")));
+
         internal static readonly ReferenceAssemblies Net80 = ReferenceAssemblies.Net.Net80
             .WithNuGetConfigFilePath(NuGetConfigPath)
             .AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]);
 
         internal static readonly ReferenceAssemblies Net90 = ReferenceAssemblies.Net.Net90
             .WithNuGetConfigFilePath(NuGetConfigPath)
             .AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]);
+
+        internal static ReferenceAssemblies Net100 => LazyNet100.Value
+              .WithNuGetConfigFilePath(NuGetConfigPath)
+              .AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]);
     }
 
     internal static class ExtraPackages

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.306",`
	`3`	`+ "version": "10.0.100",`
`4`	`4`	`"rollForward": "patch",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`},`