Conditionally targets NET 9 (#2561)

* Initial commit to target NET 9

* Fix ReleaseBuild.yml indentation

* Fix pack step

* Test fix Github action

* Address feedback

---------

Co-authored-by: Franco Fung <[email protected]>

Author: FuPingFranco

.github/workflows/dotnetcore.yml

@@ -14,6 +14,7 @@ on:
       - dev
 
 env:
+  TargetNet9: True
   TargetNet8: True
 
 jobs:
@@ -25,11 +26,21 @@ jobs:
     - name: Checkout repository
       uses: actions/[email protected]
 
+    - name: Setup .NET 6.0.x
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 6.0.x
+
     - name: Setup .NET 8.0.x
       uses: actions/[email protected]
       with:
         dotnet-version: 8.0.x
 
+    - name: Setup .NET 9.0.x
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 9.0.100-preview.2.24157.14
+
     - name: Run the tests
       run: dotnet test Wilson.sln
 

benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj

@@ -5,6 +5,7 @@
     <PackageId>Microsoft.IdentityModel.Benchmarks</PackageId>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFrameworks); net9.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>

build/commonTest.props

@@ -20,7 +20,7 @@
     <LangVersion>12</LangVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
     <DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
   </PropertyGroup>
 

build/releaseBuild.yml

@@ -55,6 +55,13 @@ jobs:
       version: 8.x
       installationPath: $(Agent.ToolsDirectory)/dotnet
 
+  - task: UseDotNet@2
+    displayName: 'Use .Net Core SDK 9.x'
+    inputs:
+      version: 9.0.100-preview.2.24157.14
+      includePreviewVersions: true
+    condition: eq(variables['TargetNet9'], 'True')
+
   - task: DotNetCoreCLI@2
     displayName: 'dotnet --list-sdks'
     inputs:

build/targets.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <SrcTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
     <SrcTargets Condition="'$(LocalBuild)' == 'True'">net461;netstandard2.0;net8.0</SrcTargets>
+    <SrcTargets Condition="'$(TargetNet9)' == 'True'">$(SrcTargets);net9.0</SrcTargets>
     <SrcStandardTargets>netstandard2.0</SrcStandardTargets>
   </PropertyGroup>
 </Project>

build/targetsTest.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TestTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netcoreapp2.1;net6.0;net8.0</TestTargets>
     <TestTargets Condition="'$(LocalBuild)' == 'True'">net461;netcoreapp2.1;net8.0</TestTargets>
+    <TestTargets Condition="'$(TargetNet9)' == 'True'">$(TestTargets);net9.0</TestTargets>
     <TestOnlyCoreTargets>netcoreapp2.1</TestOnlyCoreTargets>
   </PropertyGroup>
 </Project>

src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj

@@ -8,6 +8,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>Microsoft.IdentityModel.KeyVaultExtensions</PackageId>
     <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNet9)' == 'True'">$(TargetFrameworks);net9.0</TargetFrameworks>
     <PackageTags>.NET;Windows;Authentication;Identity;Azure;Key;Vault;Extensions</PackageTags>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs

@@ -39,6 +39,8 @@ public static class IdentityModelTelemetryUtil
             "ID_NET6_0";
 #elif NET8_0
             "ID_NET8_0";
+#elif NET9_0
+            "ID_NET9_0";
 #endif
 
         /// <summary>

test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks Condition="'$(TargetNet9)' == 'True'">$(TargetFramework); net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>

test/Microsoft.IdentityModel.AotCompatibility.Tests/Microsoft.IdentityModel.AotCompatibility.Tests.csproj

@@ -5,6 +5,7 @@
   <PropertyGroup>
     <!-- This test only needs to run on .NET -->
     <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFramework); net9.0</TargetFrameworks>
     <langversion>12</langversion>
     <Version>1.0.0-preview</Version>
   </PropertyGroup>