Target .NET 10 Preview

.github/workflows/aot-check.yml

@@ -11,6 +11,9 @@ on:
       - ready_for_review
     branches: [ "master", "rel/v2" ]
 
+env:
+  TargetNetNext: True
+
 jobs:
   analyze:
     runs-on: windows-latest
@@ -27,7 +30,19 @@ jobs:
       with:
         dotnet-version: 9.0.x
 
-    - name: Runs powershell script
-      id: aot-powershell
+    - name: Setup .NET 10.0.x preview
+      if: env.TargetNetNext == 'True'
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Runs AOT check with .NET 9.0
+      id: aot-powershell-net9
       run: build\test-aot.ps1 'net9.0'
 
+    - name: Runs AOT check with .NET 10.0
+      id: aot-powershell-net10
+      if: env.TargetNetNext == 'True'
+      run: build\test-aot.ps1 'net10.0'
+      continue-on-error: true
+

.github/workflows/codeql-analysis.yml

@@ -13,6 +13,9 @@ on:
     branches:
       - master
 
+env:
+  TargetNetNext: 'True'
+
 jobs:
   analyse:
     name: Analyse
@@ -54,6 +57,12 @@ jobs:
       with:
         dotnet-version: 9.0.x
 
+    - name: Setup .NET 10.0.x preview
+      uses: actions/setup-dotnet@v4
+      if: env.TargetNetNext == 'True'
+      with:
+        dotnet-version: 10.0.x
+
    # Install workload
     - name: Setup wasm-tools
       run: dotnet workload install wasm-tools
@@ -64,5 +73,10 @@ jobs:
     - name: Build with .NET 9
       run: dotnet test Microsoft.Identity.Web.sln -f net9.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
 
+    - name: Build with .NET 10
+      if: env.TargetNetNext == 'True'
+      run: dotnet test Microsoft.Identity.Web.sln -f net10.0 -p:FROM_GITHUB_ACTION=true -p:TargetNetNext=${{env.TargetNetNext}} --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
+      continue-on-error: true
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/dotnetcore.yml

@@ -17,6 +17,9 @@ on:
     branches:
       - master
 
+env:
+  TargetNetNext: 'True'
+
 jobs:
   build:
     runs-on: windows-latest
@@ -31,6 +34,12 @@ jobs:
       with:
         dotnet-version: 9.0.x
 
+    - name: Setup .NET 10.0.x preview
+      if: env.TargetNetNext == 'True'
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+
     - name: 'Setup MSBuild'
       uses: microsoft/setup-msbuild@v2
       with:
@@ -40,14 +49,19 @@ jobs:
       run: dotnet workload install wasm-tools
 
     - name: Build solution
-      run: msbuild Microsoft.Identity.Web.sln -r -t:build -verbosity:m -property:Configuration=Release
+      run: msbuild Microsoft.Identity.Web.sln -r -t:build -verbosity:m -property:Configuration=Release -property:TargetNetNext=${{env.TargetNetNext}}
 
     - name: Test with .NET 8.0.x
       run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net8.0 -v m -p:FROM_GITHUB_ACTION=true --configuration Release --collect "Xplat Code Coverage" --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)&(FullyQualifiedName!~AgentApplicationsTests)"
 
     - name: Test with .NET 9.0.x
       run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net9.0 -v m -p:FROM_GITHUB_ACTION=true --configuration Release --collect "Xplat Code Coverage" --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)&(FullyQualifiedName!~AgentApplicationsTests)"
 
+    - name: Test with .NET 10.0.x
+      if: env.TargetNetNext == 'True'
+      run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net10.0 -v m -p:FROM_GITHUB_ACTION=true -p:TargetNetNext=${{env.TargetNetNext}} --configuration Release --collect "Xplat Code Coverage" --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)"
+      continue-on-error: true
+
     - name: Test with .NET 6.0.x
       run: dotnet test Microsoft.Identity.Web.sln -f net6.0 -v m -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)&(FullyQualifiedName!~AgentApplicationsTests)"
 

Directory.Build.props

@@ -1,8 +1,11 @@
 <Project>
   <PropertyGroup>
     <!--This should be passed from the VSTS build-->
-    <!-- This needs to be greater than or equal to the validation baseline version -->
-    <MicrosoftIdentityWebVersion Condition="'$(MicrosoftIdentityWebVersion)' == ''">3.13.2</MicrosoftIdentityWebVersion>
+    <!-- This needs to be greater than or equal to the validation baseline version. The conditional logic around TargetNetNext is there
+    to avoid NU5104 for packing a release version library with prerelease deps. By adding preview to it, that warning is avoided.
+    -->
+  <MicrosoftIdentityWebVersion Condition="'$(MicrosoftIdentityWebVersion)' == '' and '$(TargetNetNext)' != 'True'">3.13.2</MicrosoftIdentityWebVersion>
+  <MicrosoftIdentityWebVersion Condition="'$(MicrosoftIdentityWebVersion)' == '' and '$(TargetNetNext)' == 'True'">3.14.0-preview.net10.1</MicrosoftIdentityWebVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
     <Version>$(MicrosoftIdentityWebVersion)</Version>
 
@@ -23,11 +26,16 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
+  <!-- Uncomment this property group to build with NET 10.0 locally or set TargetNetNext to True in a CLI arg-->
+  <!-- <PropertyGroup>
+    <TargetNetNext>True</TargetNetNext>
+  </PropertyGroup> -->
+
   <PropertyGroup>
     <!-- For files to appear in the Visual Studio Solution explorer given we have conditional inclusion in some projects (IdWeb for instance)
          we need to have the higher framework, even if this produces a warning in the IDE -->
     <TargetFrameworks>net6.0; net7.0; net8.0; net9.0; net462; net472; netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); net10.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -36,7 +44,15 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <LangVersion>13</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(TargetNetNext)' == 'True'">
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <!-- Compiling w/ Net 10.0 SDK gives this warning in every net core version "PackageReference System.Formats.Asn1 will not be pruned.
+    Consider removing this package from your dependencies, as it is likely unnecessary." However, the ref is necessary due to Microsoft Security Advisory CVE-2024-38095. -->
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);NU1510</WarningsNotAsErrors>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
@@ -113,6 +129,23 @@
     <MicrosoftExtensionsDependencyInjectionVersion>$(NetNineRuntimeVersion)</MicrosoftExtensionsDependencyInjectionVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <NetTenRuntimeVersion>10.0.0-preview.*</NetTenRuntimeVersion>
+    <AspNetCoreTenRuntimeVersion>10.0.0-preview.*</AspNetCoreTenRuntimeVersion>
+    <MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(AspNetCoreTenRuntimeVersion)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
+    <MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>$(AspNetCoreTenRuntimeVersion)</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsHostingVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsHostingVersion>
+    <MicrosoftAspNetCoreDataProtectionVersion>$(AspNetCoreTenRuntimeVersion)</MicrosoftAspNetCoreDataProtectionVersion>
+    <SystemSecurityCryptographyPkcsVersion>$(NetTenRuntimeVersion)</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>$(NetTenRuntimeVersion)</SystemSecurityCryptographyXmlVersion>
+    <MicrosoftExtensionsLoggingVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsConfigurationBinderVersion>
+    <SystemFormatsAsn1Version>$(NetTenRuntimeVersion)</SystemFormatsAsn1Version>
+    <SystemTextJsonVersion>$(NetTenRuntimeVersion)</SystemTextJsonVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsDependencyInjectionVersion>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <MicrosoftAspNetCoreAuthenticationJwtBearerVersion>8.0.0</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
     <MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>8.0.0</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
@@ -192,6 +225,8 @@
     <MicrosoftExtensionsLoggingVersion>2.1.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
     <MicrosoftExtensionsConfigurationBinderVersion>2.2.4</MicrosoftExtensionsConfigurationBinderVersion>
+    <!-- Microsoft Security Advisory CVE-2024-38095 -->
+    <SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
   </PropertyGroup>
 
   <ItemGroup>

README.md

@@ -75,6 +75,38 @@ This library controls how users sign-in and access services. We recommend you al
 
 If you find a security issue with our libraries or services, please report it to [[email protected]](mailto:[email protected]) with as much detail as possible. Your submission may be eligible for a bounty through the [Microsoft Bounty](http://aka.ms/bugbounty) program. Please do not post security issues to GitHub Issues or any other public site. We will contact you shortly upon receiving the information. We encourage you to get notifications of when security incidents occur by visiting [this page](https://technet.microsoft.com/en-us/security/dd252948) and subscribing to Security Advisory Alerts.
 
+## Building with .NET 10 Preview
+
+Microsoft Identity Web supports building and testing with .NET 10 preview versions using the `TargetNetNext` conditional compilation flag. This enables early testing and compatibility validation with the latest .NET preview releases.
+
+### Prerequisites
+
+- Install .NET 10 preview SDK from [https://dotnet.microsoft.com/download/dotnet/10.0](https://dotnet.microsoft.com/download/dotnet/10.0)
+
+### Building with .NET 10 Preview
+
+To build the solution with .NET 10 preview support:
+
+```bash
+# Build with .NET 10 preview targets included
+dotnet build Microsoft.Identity.Web.sln -p:TargetNetNext=True
+
+# Or using MSBuild
+msbuild Microsoft.Identity.Web.sln -p:TargetNetNext=True
+```
+You can also set the TargetNetNext environment variable on your machine with the value `True`.
+
+### Testing with .NET 10 Preview
+
+To run tests targeting .NET 10 preview:
+
+```bash
+# Run tests with .NET 10 preview (conditional)
+dotnet test Microsoft.Identity.Web.sln -f net10.0 -p:TargetNetNext=True
+```
+
+**Note:** .NET 10 preview support is conditional and requires setting `TargetNetNext=True` during build/test operations. This ensures compatibility with the latest preview versions while maintaining stability for production builds.
+
 ## Trademarks
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies.

benchmark/Benchmarks.csproj

@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="$(SystemTextRegularExpressionsVersion)" />
   </ItemGroup>
 
   <ItemGroup>

benchmark/Directory.Build.props

@@ -21,6 +21,8 @@
     <MicrosoftIdentityLabApiVersion>1.0.0</MicrosoftIdentityLabApiVersion>
     <BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
     <BenchmarkDotNetDiagnosticsWindowsVersion>0.13.12</BenchmarkDotNetDiagnosticsWindowsVersion>
+    <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
+    <SystemTextRegularExpressionsVersion>4.3.1</SystemTextRegularExpressionsVersion>
 	</PropertyGroup>
 
   <ItemGroup>

build/template-install-dependencies.yaml

@@ -28,6 +28,13 @@ steps:
   inputs:
     useGlobalJson: true
 
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 10.0.x preview'
+  inputs:
+    version: 10.0.x
+    useGlobalJson: false
+    includePreviewVersions: true
+
 # Run Nuget Tool Installer
 
 - task: NuGetToolInstaller@1

build/test-aot.ps1

@@ -2,7 +2,14 @@ param([string]$targetNetFramework)
 
 $projectName='Microsoft.Identity.Web.AotCompatibility.TestApp'
 $rootDirectory = Split-Path $PSScriptRoot -Parent
-$publishOutput = dotnet publish $rootDirectory/tests/$projectName/$projectName.csproj --framework $targetNetFramework -nodeReuse:false /p:UseSharedCompilation=false
+
+# Add TargetNetNext parameter if targeting .NET 10
+$additionalParams = ""
+if ($targetNetFramework -eq "net10.0") {
+    $additionalParams = "/p:TargetNetNext=True"
+}
+
+$publishOutput = dotnet publish $rootDirectory/tests/$projectName/$projectName.csproj --framework $targetNetFramework -nodeReuse:false /p:UseSharedCompilation=false $additionalParams
 
 $actualWarningCount = 0
 

global.json

@@ -4,6 +4,7 @@
     },
     "sdk": {
         "version": "9.0.108",
-        "rollForward": "latestFeature"
+        "allowPrerelease": true,
+        "rollForward": "latestMajor"
     }
 }

src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net10.0/InternalAPI.Shipped.txt

@@ -0,0 +1,31 @@
+#nullable enable
+Microsoft.Identity.Web.Diagnostics.IdHelper
+Microsoft.Identity.Web.Diagnostics.OsHelper
+Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
+Microsoft.Identity.Web.IdHelper
+Microsoft.Identity.Web.Throws
+static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
+static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
+static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
+static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
+static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
+static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
+static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
+static Microsoft.Identity.Web.Throws.ArgumentException(string! paramName, string? message) -> void
+static Microsoft.Identity.Web.Throws.ArgumentException(string! paramName, string? message, System.Exception? innerException) -> void
+static Microsoft.Identity.Web.Throws.ArgumentNullException(string! paramName) -> void
+static Microsoft.Identity.Web.Throws.ArgumentNullException(string! paramName, string? message) -> void
+static Microsoft.Identity.Web.Throws.ArgumentOutOfRangeException(string! paramName) -> void
+static Microsoft.Identity.Web.Throws.ArgumentOutOfRangeException(string! paramName, object? actualValue, string? message) -> void
+static Microsoft.Identity.Web.Throws.ArgumentOutOfRangeException(string! paramName, string? message) -> void
+static Microsoft.Identity.Web.Throws.IfBufferTooSmall(int bufferSize, int requiredSize, string! paramName = "") -> void
+static Microsoft.Identity.Web.Throws.IfMemberNull<TParameter, TMember>(TParameter argument, TMember member, string! paramName = "", string! memberName = "") -> TMember
+static Microsoft.Identity.Web.Throws.IfNull<T>(T argument, string! paramName = "") -> T
+static Microsoft.Identity.Web.Throws.IfNullOrEmpty(string? argument, string! paramName = "") -> string!
+static Microsoft.Identity.Web.Throws.IfNullOrEmpty<T>(System.Collections.Generic.ICollection<T>? argument, string! paramName = "") -> System.Collections.Generic.ICollection<T>!
+static Microsoft.Identity.Web.Throws.IfNullOrEmpty<T>(System.Collections.Generic.IReadOnlyCollection<T>? argument, string! paramName = "") -> System.Collections.Generic.IReadOnlyCollection<T>!
+static Microsoft.Identity.Web.Throws.IfNullOrMemberNull<TParameter, TMember>(TParameter argument, TMember member, string! paramName = "", string! memberName = "") -> TMember
+static Microsoft.Identity.Web.Throws.IfNullOrWhitespace(string? argument, string! paramName = "") -> string!
+static Microsoft.Identity.Web.Throws.IfOutOfRange<T>(T argument, string! paramName = "") -> T
+static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message) -> void
+static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message, System.Exception? innerException) -> void

src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net10.0/InternalAPI.Unshipped.txt

@@ -0,0 +1 @@
+#nullable enable

src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net10.0/PublicAPI.Shipped.txt

@@ -0,0 +1 @@
+#nullable enable

src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net10.0/PublicAPI.Unshipped.txt

@@ -0,0 +1 @@
+#nullable enable