Update project files and workflows for .NET 10.0 compatibility

.github/workflows/aot-check.yml

@@ -18,16 +18,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 1
 
     - name: Setup .NET SDK from global.json
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         global-json-file: ./global.json
 
     - name: Runs powershell script
       id: aot-powershell
-      run: build\test-aot.ps1 'net8.0'
+      run: build\test-aot.ps1 'net10.0'
 

.github/workflows/codeql-analysis.yml

@@ -22,12 +22,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 2
 
     - name: Setup .NET SDK from global.json
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         global-json-file: ./global.json        
 

.github/workflows/dotnetcore.yml

@@ -18,7 +18,7 @@ on:
       - dev
 
 env:
-  TargetNetNext: True
+  TargetNetNext: False
 
 jobs:
   build:
@@ -44,11 +44,6 @@ jobs:
       with:
         global-json-file: ./global.json
 
-    - name: Setup latest .NET 10 RC SDK
-      uses: actions/setup-dotnet@v5
-      with:
-        dotnet-version: 10.0.100-rc.1.25451.107
-
     - name: Strong name bypass
       run: |
           regedit /s .\build\strongNameBypass.reg

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

@@ -4,8 +4,8 @@
     <AssemblyName>Microsoft.IdentityModel.Benchmarks</AssemblyName>
     <PackageId>Microsoft.IdentityModel.Benchmarks</PackageId>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
@@ -24,10 +24,6 @@
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.5" />
   </ItemGroup>-->
 
-  <PropertyGroup>
-    <SuppressNETCoreSdkPreviewMessage Condition="'$(TargetNetNext)' == 'True'">true</SuppressNETCoreSdkPreviewMessage>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>

build/dependencies.props

@@ -16,14 +16,13 @@
 
   <PropertyGroup Condition="'$(TargetNetNext)' == 'True'">
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <!-- NU5104 prevents us from packing release packages with prerelease dependencies. But we want to do that so customers can get a preview of running with .NET 10. -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);NU1510;NU5104</WarningsNotAsErrors>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-rc.1.25451.107</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">

build/dependenciesTest.props

@@ -24,10 +24,6 @@
     <MicrosoftRestClientRuntimeVersion>2.3.24</MicrosoftRestClientRuntimeVersion>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <SuppressNETCoreSdkPreviewMessage Condition="'$(TargetNetNext)' == 'True'">true</SuppressNETCoreSdkPreviewMessage>
-  </PropertyGroup>
-
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <XunitRunnerVisualStudioVersion>3.0.0-pre.49</XunitRunnerVisualStudioVersion>
   </PropertyGroup>

build/targets.props

@@ -1,12 +1,12 @@
 <Project>
-  <!-- TargetNetNext must be set to True to build with NET 10.0 locally, you can uncomment this PropertyGroup or set it in a CLI arg -->
+  <!-- TargetNetNext must be set to True to build with next verion .NET locally, you can uncomment this PropertyGroup or set it in a CLI arg -->
   <!-- <PropertyGroup>
     <TargetNetNext>True</TargetNetNext> 
   </PropertyGroup> -->
 
   <PropertyGroup>
-    <SrcTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netstandard2.0;net6.0;net8.0;net9.0</SrcTargets>
-    <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0;net9.0</SrcTargets>
-    <SrcTargets Condition="'$(TargetNetNext)'== 'True'">$(SrcTargets);net10.0</SrcTargets>
+    <SrcTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netstandard2.0;net6.0;net8.0;net9.0;net10.0</SrcTargets>
+    <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0;net9.0;net10.0</SrcTargets>
+    <SrcTargets Condition="'$(TargetNetNext)'== 'True'">$(SrcTargets)</SrcTargets>
   </PropertyGroup>
 </Project>

build/targetsTest.props

@@ -1,12 +1,12 @@
 <Project>
-  <!-- TargetNetNext must be set to True to build with NET 10.0 locally you can uncomment this PropertyGroup or set it in a CLI arg -->
+  <!-- TargetNetNext must be set to True to build with next version of NET locally you can uncomment this PropertyGroup or set it in a CLI arg -->
   <!-- <PropertyGroup>
     <TargetNetNext>True</TargetNetNext> 
   </PropertyGroup> -->
 
   <PropertyGroup>
-    <TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;net6.0;net8.0;net9.0</TestTargets>
-    <TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0;net9.0</TestTargets>
-    <TestTargets Condition="'$(TargetNetNext)'== 'True'">$(TestTargets);net10.0</TestTargets>
+    <TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;net6.0;net8.0;net9.0;net10.0</TestTargets>
+    <TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0;net9.0;net10.0</TestTargets>
+    <TestTargets Condition="'$(TargetNetNext)'== 'True'">$(TestTargets)</TestTargets>
 </PropertyGroup>
 </Project>

build/template-Build-run-tests-sign.yml

@@ -2,7 +2,7 @@
 parameters:
 - name: TargetNetNext
   type: string
-  default: "True"
+  default: "False"
 
 steps:
 - script: echo $(BuildConfiguration)
@@ -37,14 +37,6 @@ steps:
     version: 8.x
     installationPath: $(Agent.ToolsDirectory)/dotnet
 
-- task: UseDotNet@2
-  displayName: 'Use .Net Core SDK 10.x'
-  inputs:
-    useGlobalJson: false
-    includePreviewVersions: true
-    version: 10.x
-    installationPath: $(Agent.ToolsDirectory)/dotnet
-
 - task: DotNetCoreCLI@2
   displayName: 'dotnet --list-sdks'
   inputs:

global.json

@@ -1,8 +1,8 @@
 {
     "sdk": {
-        "version": "9.0.111",
-        "allowPrerelease": true,
-        "rollForward": "latestMajor"
+        "version": "10.0.100",
+        "allowPrerelease": false,
+        "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
         "Microsoft.Build.NoTargets": "3.7.56"

runTests.ps1

@@ -30,9 +30,19 @@ function WriteSectionFooter($sectionName)
 
 ################################################# Functions ############################################################
 
-$env:TargetNetNext = "True"
-
 WriteSectionHeader("runTests.ps1");
+
+if (Test-Path $env:TargetNetNext)
+{
+    Write-Host "using TargetNetNext from env:"  $env:TargetNetNext
+}
+else 
+{
+    Write-Host "using TargetNetNext as false"
+    $env:TargetNetNext = "False"
+}
+
+
 Write-Host "buildType:       " $buildType;
 Write-Host "dotnetDir:       " $dotnetDir
 Write-Host "root:            " $root;
@@ -48,7 +58,6 @@ $startTime = Get-Date
 Write-Host "Start Time:     " $startTime
 Write-Host "PSScriptRoot:   " $PSScriptRoot;
 Write-Host "dotnetexe:      " $dotnetexe;
-Write-Host "TargetNetNext:  " $env:TargetNetNext;
 
 $ErrorActionPreference = "Stop"
 

src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj

@@ -8,8 +8,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>Microsoft.IdentityModel.LoggingExtensions</PackageId>
     <PackageTags>.NET;Windows;Authentication;Identity;Extensions;Logging</PackageTags>
-    <TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks)</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>