Add support for .NET 8.0 (#253)

Author: jeffkl

.github/workflows/CI.yml

@@ -18,6 +18,7 @@ env:
   ContinuousIntegrationBuild: 'true'
   DotNet6Version: '6.x'
   DotNet7Version: '7.x'
+  DotNet8Version: '8.x'
 
 jobs:
   BuildAndTest:
@@ -42,12 +43,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core .NET ${{ env.DotNet6Version }}, and .NET ${{ env.DotNet7Version }}
+    - name: Install .NET ${{ env.DotNet6Version }}, .NET ${{ env.DotNet7Version }}, and .NET ${{ env.DotNet8Version }}
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
           ${{ env.DotNet6Version }}
           ${{ env.DotNet7Version }}
+          ${{ env.DotNet8Version }}
 
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/build.binlog"
@@ -63,6 +65,9 @@ jobs:
     - name: Run Unit Tests (.NET 7)
       run: dotnet test --logger trx --no-restore --no-build --framework net7.0 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net7.0.binlog"
 
+    - name: Run Unit Tests (.NET 8)
+      run: dotnet test --logger trx --no-restore --no-build --framework net8.0 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net8.0.binlog"
+
     - name: Upload Test Results
       uses: actions/upload-artifact@v2
       if: success() || failure()

.github/workflows/Official.yml

@@ -17,6 +17,7 @@ env:
   OfficialBuild: 'true'
   DotNet6Version: '6.x'
   DotNet7Version: '7.x'
+  DotNet8Version: '8.x'
 
 jobs:
   build:
@@ -29,12 +30,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core .NET ${{ env.DotNet6Version }}, and .NET ${{ env.DotNet7Version }}
+    - name: Install .NET ${{ env.DotNet6Version }},.NET ${{ env.DotNet7Version }}, and .NET ${{ env.DotNet8Version }}
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
           ${{ env.DotNet6Version }}
           ${{ env.DotNet7Version }}
+          ${{ env.DotNet8Version }}
 
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}\build.binlog"

Directory.Packages.props

@@ -2,20 +2,19 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <MicrosoftBuildPackageVersion>17.7.2</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.8.3</MicrosoftBuildPackageVersion>
     <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">17.3.2</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">16.9.0</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">17.7.2</MicrosoftBuildPackageVersion>
     <NuGetPackageVersion>6.7.0</NuGetPackageVersion>
-    <NuGetPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">5.7.1</NuGetPackageVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="AssemblyShader" Version="1.0.3-preview" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.7.2175" />
-    <PackageVersion Include="NuGet.Frameworks" Version="$(NuGetPackageVersion)" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
     <PackageVersion Include="xunit" Version="2.6.0" />

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.0",
+    "version": "8.0.100",
     "rollForward": "latestMinor"
   }
 }

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

@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <Import Project="..\Microsoft.Build.Utilities.ProjectCreation\build\MSBuild.ProjectCreation.props" Condition="'$(TargetFramework)' == 'net472'" />
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="AssemblyShader" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" ShadeDependencies="NuGet.Frameworks" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />

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

@@ -18,12 +18,12 @@ protected TestBase()
         public string DotNetSdkVersion
         {
             get =>
-#if NETCOREAPP3_1
-            "3.1.100";
-#elif NET6_0
+#if NET6_0
             "6.0.100";
-#elif NET7_0 || NETFRAMEWORK
+#elif NET7_0
             "7.0.100";
+#elif  NET8_0 || NETFRAMEWORK
+            "8.0.100";
 #else
             Unknown target framework!
 #endif
@@ -32,12 +32,12 @@ Unknown target framework!
         public string TargetFramework
         {
             get =>
-#if NETCOREAPP3_1
-            "netcoreapp3.1";
-#elif NET6_0
+#if NET6_0
             "net6.0";
 #elif NET7_0
             "net7.0";
+#elif NET8_0
+            "net8.0";
 #elif NETFRAMEWORK
             "net472";
 #else

src/Microsoft.Build.Utilities.ProjectCreation/MSBuildAssemblyResolver.net5.0.cs

@@ -6,6 +6,8 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
+using System.Runtime.Loader;
 using System.Text.RegularExpressions;
 
 namespace Microsoft.Build.Utilities.ProjectCreation
@@ -36,6 +38,12 @@ public static partial class MSBuildAssemblyResolver
                 return (null, null);
             });
 
+        /// <inheritdoc cref="AssemblyLoadContext.Resolving" />
+        public static Assembly? AssemblyResolve(AssemblyLoadContext assemblyLoadContext, AssemblyName requestedAssemblyName)
+        {
+            return AssemblyResolve(requestedAssemblyName, assemblyLoadContext.LoadFromAssemblyPath);
+        }
+
         private static string? GetDotNetBasePath()
         {
             using Process process = new Process
@@ -71,6 +79,10 @@ public static partial class MSBuildAssemblyResolver
 
             process.WaitForExit();
 
+            DirectoryInfo? basePath = GetFirstMatchingSdk(process.StandardOutput.ReadToEnd());
+
+            return basePath?.FullName;
+
             // Gets the highest version SDK that is the same major version as the runtime
             // You cannot always evaluate MSBuild projects using a different version of MSBuild than your runtime.  This is because
             // if you're running as .NET 5.0, the .NET 6.0 MSBuild has dependencies that your app doesn't supply.
@@ -99,10 +111,6 @@ public static partial class MSBuildAssemblyResolver
 
                 return directoryInfo;
             }
-
-            DirectoryInfo? basePath = GetFirstMatchingSdk(process.StandardOutput.ReadToEnd());
-
-            return basePath?.FullName;
         }
     }
 }

src/Microsoft.Build.Utilities.ProjectCreation/MSBuildAssemblyResolver.netcore.cs

@@ -4,8 +4,7 @@
 
 using System;
 using System.IO;
-#if NET5_0_OR_GREATER
-using System.Reflection;
+#if NET6_0_OR_GREATER
 using System.Runtime.Loader;
 #endif
 
@@ -22,7 +21,7 @@ static MSBuildTestBase()
             Environment.SetEnvironmentVariable("MSBuildExtensionsPath", MSBuildAssemblyResolver.DotNetSdksPath);
             Environment.SetEnvironmentVariable("MSBuildSDKsPath", string.IsNullOrWhiteSpace(MSBuildAssemblyResolver.DotNetSdksPath) ? null : Path.Combine(MSBuildAssemblyResolver.DotNetSdksPath, "Sdks"));
 
-#if NET5_0_OR_GREATER
+#if NET6_0_OR_GREATER
             AssemblyLoadContext.Default.Resolving += MSBuildAssemblyResolver.AssemblyResolve;
 #else
             AppDomain.CurrentDomain.AssemblyResolve += MSBuildAssemblyResolver.AssemblyResolve;