Add support for .NET 10 (#340)

Author: MattKotsenas

.github/workflows/CI.yml

@@ -18,6 +18,7 @@ env:
   ContinuousIntegrationBuild: 'true'
   DotNet8Version: '8.x'
   DotNet9Version: '9.x'
+  DotNet10Version: '10.x'
 
 jobs:
   BuildAndTest:
@@ -49,6 +50,12 @@ jobs:
           ${{ env.DotNet8Version }}
           ${{ env.DotNet9Version }}
 
+    - name: Install .NET ${{ env.DotNet10Version }}
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: ${{ env.DotNet10Version }}
+        dotnet-quality: 'preview'
+
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/build.binlog"
 
@@ -62,6 +69,9 @@ jobs:
     - name: Run Unit Tests (.NET 9)
       run: dotnet test --no-restore --no-build --framework net9.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net9.0.binlog"
 
+    - name: Run Unit Tests (.NET 10)
+      run: dotnet test --no-restore --no-build --framework net10.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net10.0.binlog"
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       if: success()

.github/workflows/Official.yml

@@ -15,7 +15,7 @@ env:
   BuildPlatform: 'Any CPU'
   ContinuousIntegrationBuild: 'true'
   OfficialBuild: 'true'
-  DotNet9Version: '9.x'
+  DotNet10Version: '10.x'
 
 jobs:
   build:
@@ -28,11 +28,12 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET ${{ env.DotNet9Version }}
+    - name: Install .NET ${{ env.DotNet10Version }}
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: |
-          ${{ env.DotNet9Version }}
+          ${{ env.DotNet10Version }}
+        dotnet-quality: 'preview'
 
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}\build.binlog"

Directory.Packages.props

@@ -4,7 +4,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <MicrosoftBuildPackageVersion>17.14.8</MicrosoftBuildPackageVersion>
     <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0' ">17.11.4</MicrosoftBuildPackageVersion>
-    <SystemTextJsonVersion>9.0.8</SystemTextJsonVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AssemblyShader" Version="1.1.3" />
@@ -17,7 +16,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
-    <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
   </ItemGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0",
+    "version": "10.0.100-alpha",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }

src/Microsoft.Build.Utilities.ProjectCreation.UnitTests/Microsoft.Build.Utilities.ProjectCreation.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0;net9.0;net10.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <Import Project="..\Microsoft.Build.Utilities.ProjectCreation\build\MSBuild.ProjectCreation.props" Condition="'$(TargetFramework)' == 'net472'" />
@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" ShadeDependencies="NuGet.Frameworks" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="System.CodeDom" VersionOverride="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" ExcludeAssets="All" />
+    <PackageReference Include="System.CodeDom" VersionOverride="10.0.0-rc.1.25451.107" Condition="'$(TargetFramework)' == 'net10.0'" ExcludeAssets="All" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>

src/Microsoft.Build.Utilities.ProjectCreation.UnitTests/TestBase.cs

@@ -21,7 +21,9 @@ public string DotNetSdkVersion
 #if  NET8_0 || NETFRAMEWORK
             "8.0.100";
 #elif  NET9_0 || NETFRAMEWORK
-            "9.0.0";
+            "9.0.100";
+#elif  NET10_0 || NETFRAMEWORK
+            "10.0.100";
 #else
     #error Unknown target framework!
 #endif
@@ -34,6 +36,8 @@ public string TargetFramework
             "net8.0";
 #elif NET9_0
             "net9.0";
+#elif NET10_0
+            "net10.0";
 #elif NETFRAMEWORK
             "net472";
 #else
@@ -87,4 +91,4 @@ private void WriteGlobalJson()
 }}");
         }
     }
-}
+}

src/Microsoft.Build.Utilities.ProjectCreation/Microsoft.Build.Utilities.ProjectCreation.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0;net9.0;net10.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <ArtifactsPath>..\..\artifacts\$(MSBuildProjectName)</ArtifactsPath>
     <CopyArtifactsAfterTargets>Pack</CopyArtifactsAfterTargets>
     <DefaultArtifactsFileMatch>*nupkg</DefaultArtifactsFileMatch>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <!-- Remove NU5104 once System.CodeDom is a stable version for .NET 9 -->
-    <NoWarn>$(NoWarn);RS0026;SA1600;NU5104</NoWarn>
+    <NoWarn>$(NoWarn);RS0026;SA1600</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Package properties">
     <PackageId>MSBuild.ProjectCreation</PackageId>
     <Description>A fluent interface for generating and building MSBuild project files.</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <Authors>jeffkl</Authors>
     <Copyright>Copyright (c) Jeff Kluge. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -33,7 +33,6 @@
     <PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(TargetFramework)' == 'net472'" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="System.IO.Compression" Condition="'$(TargetFramework)' == 'net472'" />
-    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.ValueTuple" VersionOverride="4.5.0" Condition="'$(TargetFramework)' == 'net472'" ExcludeAssets="Compile" />
   </ItemGroup>
   <ItemGroup>
@@ -58,4 +57,4 @@
     <None Include="PublicAPI\**" />
     <AdditionalFiles Include="PublicAPI\$(TargetFramework)\PublicAPI.*.txt"  />
   </ItemGroup>
-</Project>
+</Project>