From 90fdaa58dd5f4faa51b1c23a9cf25855fda4a516 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <RussKie@users.noreply.github.com>
Date: Fri, 3 Nov 2023 04:13:02 +1100
Subject: [PATCH] Add .NET 9 support (#544)

---
 Directory.Build.props                         |  5 ++--
 azure-pipelines-official.yml                  |  8 +++++
 azure-pipelines.yml                           | 29 +++++++++++++++++++
 .../Microsoft.VisualStudio.SlnGen.Tool.csproj | 10 +++++++
 .../Program.cs                                |  6 ++--
 ...osoft.VisualStudio.SlnGen.UnitTests.csproj |  4 ++-
 .../TestBase.cs                               |  2 ++
 .../Microsoft.VisualStudio.SlnGen.csproj      |  8 +++--
 version.json                                  |  2 +-
 9 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 02a849cd..ad02c44a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts</BaseArtifactsPath>
     <DefaultItemExcludes>*log</DefaultItemExcludes>
@@ -9,7 +9,8 @@
     <NoWarn>$(NoWarn);SA0001;SA1515;SA1005;SA1629;NETSDK1192</NoWarn>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
-    <TargetDotNet8 Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</TargetDotNet8>
     <NoWarn>$(NoWarn);NETSDK1213</NoWarn>
+    <TargetDotNet8 Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</TargetDotNet8>
+    <TargetDotNet9 Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</TargetDotNet9>
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 726b8169..5d32a546 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -8,6 +8,9 @@ variables:
   DotNet6Version: '6.x'
   DotNet7Version: '7.x'
   DotNet8Version: '8.x'
+  DotNet9Version: '9.x'
+  # Not using "--channel 9.0 --quality daily", see https://github.com/microsoft/slngen/issues/456
+  DotNet9InstallArgs: '-version 9.0.100-alpha.1.23528.2'
   MSBuildArgs: '"/Property:Platform=$(BuildPlatform);Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"'
   SignType: 'Test'
 
@@ -50,6 +53,11 @@ stages:
         version: '$(DotNet8Version)'
         includePreviewVersions: true
 
+    - script: |
+        powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) $(DotNet9InstallArgs) -InstallDir D:\a\_work\_tool\dotnet"
+        dotnet --info
+      displayName: 'Install .NET $(DotNet9Version)'
+
     - task: MicroBuildSigningPlugin@1
       displayName: 'Install MicroBuild Signing Plugin'
       inputs:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b742fc22..b0e20aca 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,6 +8,9 @@ variables:
   DotNet6Version: '6.x'
   DotNet7Version: '7.x'
   DotNet8Version: '8.x'
+  DotNet9Version: '9.x'
+  # Not using "--channel 9.0 --quality daily", see https://github.com/microsoft/slngen/issues/456
+  DotNet9InstallArgs: '-version 9.0.100-alpha.1.23528.2'
   MSBuildArgs: '"/Property:Platform=$(BuildPlatform);Configuration=$(BuildConfiguration)"'
   SignType: 'Test'
 
@@ -62,6 +65,24 @@ jobs:
       version: '$(DotNet8Version)'
       includePreviewVersions: true
 
+  - script: |
+      powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) $(DotNet9InstallArgs) -InstallDir C:\hostedtoolcache\windows\dotnet"
+      dotnet --info
+    displayName: 'Install .NET $(DotNet9Version) (Windows)'
+    condition: eq(variables.osName, 'Windows')
+
+  - script: |
+      curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin $(DotNet9InstallArgs) --install-dir /opt/hostedtoolcache/dotnet
+      dotnet --info
+    displayName: 'Install .NET $(DotNet9Version) (Linux)'
+    condition: eq(variables.osName, 'Linux')
+
+  - script: |
+      curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin $(DotNet9InstallArgs) --install-dir /Users/runner/hostedtoolcache/dotnet
+      dotnet --info
+    displayName: 'Install .NET $(DotNet9Version) (MacOS)'
+    condition: eq(variables.osName, 'MacOS')
+
   - task: VSBuild@1
     displayName: 'Build (Visual Studio)'
     inputs:
@@ -107,6 +128,14 @@ jobs:
       testRunTitle: '$(osName) .NET 8.0'
     condition: succeededOrFailed()
 
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Unit Tests (.NET 9)'
+    inputs:
+      command: 'test'
+      arguments: '--no-restore --no-build --framework net9.0 /noautorsp $(MSBuildArgs) "/BinaryLogger:$(ArtifactsDirectoryName)/test-net9.0.binlog"'
+      testRunTitle: '$(osName) .NET 9.0'
+    condition: succeededOrFailed()
+
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifacts'
     inputs:
diff --git a/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj b/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj
index 507e0860..dc586c1e 100644
--- a/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj
+++ b/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj
@@ -7,6 +7,7 @@
     <RollForward>LatestMajor</RollForward>
     <_GetChildProjectCopyToPublishDirectoryItems>false</_GetChildProjectCopyToPublishDirectoryItems>
     <TargetDotNet8 Condition="'$(TargetDotNet8)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0'))">true</TargetDotNet8>
+    <TargetDotNet9 Condition="'$(TargetDotNet9)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0'))">true</TargetDotNet9>
   </PropertyGroup>
   <Import Project="..\Shared\Shared.props" />
   <ItemGroup>
@@ -56,6 +57,15 @@
                       SkipGetTargetFrameworkProperties="true"
                       TargetFramework="net8.0"
                       Condition="'$(TargetDotNet8)' == 'true'" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.SlnGen\Microsoft.VisualStudio.SlnGen.csproj"
+                      SetTargetFramework="TargetFramework=net9.0"
+                      IncludeAssets="None"
+                      OutputItemType="SlnGenBuildOutput"
+                      PrivateAssets="All"
+                      ReferenceOutputAssembly="false"
+                      SkipGetTargetFrameworkProperties="true"
+                      TargetFramework="net9.0"
+                      Condition="'$(TargetDotNet9)' == 'true'" />
   </ItemGroup>
   <Target Name="CopySlnGenToOutputDirectoryAndPackage"
           AfterTargets="PrepareForRun"
diff --git a/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs b/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs
index 8583a814..b1e71241 100644
--- a/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs
+++ b/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs
@@ -94,11 +94,13 @@ public static int Main(string[] args)
                             break;
 
                         case "8":
-                        // TEMP: hack until .NET 8 is shipped and/or .NET 9 SDK is coherent
-                        case "9":
                             framework = "net8.0";
                             break;
 
+                        case "9":
+                            framework = "net9.0";
+                            break;
+
                         default:
                             Utility.WriteError(Error, "SlnGen does not currently support the .NET SDK {0} defined by in global.json.  Please update to the latest version and if you still get this error message, file an issue at https://github.com/microsoft/slngen/issues/new so it can be added.", developmentEnvironment.DotNetSdkVersion);
 
diff --git a/src/Microsoft.VisualStudio.SlnGen.UnitTests/Microsoft.VisualStudio.SlnGen.UnitTests.csproj b/src/Microsoft.VisualStudio.SlnGen.UnitTests/Microsoft.VisualStudio.SlnGen.UnitTests.csproj
index cc06fdf8..6820a4c5 100644
--- a/src/Microsoft.VisualStudio.SlnGen.UnitTests/Microsoft.VisualStudio.SlnGen.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.SlnGen.UnitTests/Microsoft.VisualStudio.SlnGen.UnitTests.csproj
@@ -1,8 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetDotNet8 Condition="'$(TargetDotNet8)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0'))">true</TargetDotNet8>
+    <TargetDotNet9 Condition="'$(TargetDotNet9)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0'))">true</TargetDotNet9>
     <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetDotNet8)' == 'true'">$(TargetFrameworks);net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetDotNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);SA1600</NoWarn>
   </PropertyGroup>
diff --git a/src/Microsoft.VisualStudio.SlnGen.UnitTests/TestBase.cs b/src/Microsoft.VisualStudio.SlnGen.UnitTests/TestBase.cs
index 1bd0867f..ac0c3922 100644
--- a/src/Microsoft.VisualStudio.SlnGen.UnitTests/TestBase.cs
+++ b/src/Microsoft.VisualStudio.SlnGen.UnitTests/TestBase.cs
@@ -17,6 +17,8 @@ public abstract class TestBase : MSBuildTestBase
                 "7.0.0";
 #elif NET8_0
                 "8.0.0";
+#elif NET9_0
+                "9.0.0";
 #else
                 Unknown target framework
 #endif
diff --git a/src/Microsoft.VisualStudio.SlnGen/Microsoft.VisualStudio.SlnGen.csproj b/src/Microsoft.VisualStudio.SlnGen/Microsoft.VisualStudio.SlnGen.csproj
index be585bb5..08bc5120 100644
--- a/src/Microsoft.VisualStudio.SlnGen/Microsoft.VisualStudio.SlnGen.csproj
+++ b/src/Microsoft.VisualStudio.SlnGen/Microsoft.VisualStudio.SlnGen.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetDotNet8 Condition="'$(TargetDotNet8)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0'))">true</TargetDotNet8>
+    <TargetDotNet9 Condition="'$(TargetDotNet9)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0'))">true</TargetDotNet9>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net461;net472;net6.0;net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetDotNet8)' == 'true'">$(TargetFrameworks);net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetDotNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.config</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludeReferenceCopyLocalPathsInBuildOutputInPackage>true</IncludeReferenceCopyLocalPathsInBuildOutputInPackage>
     <IsTool>true</IsTool>
@@ -31,7 +33,7 @@
     <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net46\MSBuild.exe" Private="false" Condition="'$(TargetFramework)' == 'net461'" />
     <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net472\MSBuild.exe" Private="false" Condition="'$(TargetFramework)' == 'net472'" />
     <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll" Private="false" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll" Private="false" Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'" />
+    <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll" Private="false" Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'" />
@@ -40,7 +42,7 @@
   <!--
     By default, this application will use the same runtime as whatever version it was built against.  In reality, this application
     should run against any version of the runtime with the same major version.  This logic gets the major, minor, and build version
-    and sets RuntimeFramework.Version to the major.minor.build-any so at runtime it will work against any version of the runtime with
+    and sets RuntimeFramework.Version to the major.minor.build-alpha so at runtime it will work against any version of the runtime with
     the same major version.
   -->
   <Target Name="SetRuntimeFramework" BeforeTargets="GenerateBuildRuntimeConfigurationFiles">
@@ -49,7 +51,7 @@
       <_PreviousRuntimeFramework>%(RuntimeFramework.Version)</_PreviousRuntimeFramework>
     </PropertyGroup>
     <ItemGroup>
-      <RuntimeFramework Update="@(RuntimeFramework)" Version="$(_MajorMinorBuildRuntimeFramework)-any" />
+      <RuntimeFramework Update="@(RuntimeFramework)" Version="$(_MajorMinorBuildRuntimeFramework)-alpha" />
     </ItemGroup>
   </Target>
   <Target Name="RestoreRuntimeFramework" AfterTargets="GenerateBuildRuntimeConfigurationFiles">
diff --git a/version.json b/version.json
index 70fc4d9c..f8108f47 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "11.0",
+  "version": "11.1",
   "assemblyVersion": "3.0",
   "buildNumberOffset": -1,
   "publicReleaseRefSpec": [