Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7015e7e
sln builds and tests pass locally
JoshLozensky Aug 5, 2025
023fa4f
add the TargetNetNext var to relevant files and cleanup unneeded depe…
JoshLozensky Aug 5, 2025
035662b
address PR feedback and set targetnetnext as env var in ps scripts
JoshLozensky Aug 6, 2025
a1438ab
set env vars in ps scripts and readd net10 if statements
JoshLozensky Aug 7, 2025
577e2aa
Update runTests.ps1
JoshLozensky Aug 8, 2025
c050abb
Merge branch 'dev' into lozensky/TargetNet10Preview
JoshLozensky Aug 11, 2025
5d4335a
comment out TargetNetNext in targets files
JoshLozensky Aug 11, 2025
1572f8d
SuppressTfmSupportBuildErrors for NET 6 since microsoft.test.sdk no l…
JoshLozensky Aug 12, 2025
63e16ef
removing framework eol warning from benchmarks since net6 is eol
JoshLozensky Aug 12, 2025
ff25183
Update benchmarks to ignore net 6 eol
JoshLozensky Aug 12, 2025
a51216a
try readding System libraries to avoid vulnerable versions
JoshLozensky Aug 12, 2025
66c61d0
try adding package refs to avoid vulnerable versions
JoshLozensky Aug 12, 2025
a5d74f7
move package refs to come after project refs
JoshLozensky Aug 12, 2025
8e5e523
change useglobaljson to false so includePreviewVersions can be set
JoshLozensky Aug 12, 2025
0bd2812
move options to inputs
JoshLozensky Aug 12, 2025
eaf5c51
remove unneeded changes
JoshLozensky Aug 13, 2025
2227b89
block NU1510
JoshLozensky Aug 13, 2025
f768175
try rolling back global.json changes
JoshLozensky Aug 13, 2025
eaff530
put global.json changes back
JoshLozensky Aug 13, 2025
de15e83
minor edits
JoshLozensky Aug 19, 2025
54e1598
Update with PR feedback
JoshLozensky Aug 20, 2025
b7e3b07
Merge branch 'dev' into lozensky/TargetNet10Preview
JoshLozensky Aug 20, 2025
8279646
suppress sdk preview warning
JoshLozensky Aug 20, 2025
55c1ae9
remove unneeded supppression
JoshLozensky Aug 20, 2025
bd8eb1a
Suppress NU1510/5104
JoshLozensky Aug 22, 2025
2b8c1fd
remove unneeded suppression
JoshLozensky Aug 26, 2025
85b85ae
standardize usage of preprocessor directives
JoshLozensky Aug 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ jobs:
with:
global-json-file: ./global.json

- name: Setup latest .NET 10 preview SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '10.0.x'

- name: Strong name bypass
run: |
regedit /s .\build\strongNameBypass.reg
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#if NETCOREAPP
#if NET

using System;
using BenchmarkDotNet.Attributes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageId>Microsoft.IdentityModel.Benchmarks</PackageId>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand All @@ -23,6 +23,14 @@
<ItemGroup>
<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>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
Expand Down
1 change: 1 addition & 0 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Write-Host "msbuildexe: " $msbuildexe;
Write-Host "nugetVersion: " $nugetVersion;
Write-Host "releaseVersion: " $releaseVersion;
Write-Host "nugetPreview: " $nugetPreview;
Write-Host "targetNetNext: " $env:TargetNetNext
WriteSectionFooter("End Environment");

$ErrorActionPreference = "Stop"
Expand Down
17 changes: 10 additions & 7 deletions build/commonTest.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet</PackageProjectUrl>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>0618</WarningsNotAsErrors>
<WarningsNotAsErrors>$(WarningsNotAsErrors);0618</WarningsNotAsErrors>
<IsTestProject>true</IsTestProject>
<TargetFrameworks>$(TestTargets)</TargetFrameworks>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">$(DotNetCoreAppRuntimeVersion)</RuntimeFrameworkVersion>
Expand All @@ -20,16 +20,20 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<!-- Compiling w/ Net 10.0 gives this warning "PackageReference [package name] will not be pruned. Consider removing this package from your dependencies,
as it is likely unnecessary." for System.Text.RegularExpressions and System.Net.Http, however those refs are necessary due to CVEs for those
two libraries. -->
<NoWarn>$(NoWarn);NU1510</NoWarn>
<WarningsNotAsErrors>$(WarningsNotAsErrors);NU1510</WarningsNotAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
Expand All @@ -52,8 +56,7 @@
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472'">
<!-- Suprpess the "Microsoft.Extensions.TimeProvider.Testing 9.0.0 doesn't support net462 and has not been tested with it" warning -->
<!-- Suppress the "Microsoft.Extensions.TimeProvider.Testing 9.0.0 doesn't support net462 and has not been tested with it" warning -->
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

</Project>
13 changes: 12 additions & 1 deletion build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,19 @@
<SystemTextJson>8.0.5</SystemTextJson>
</PropertyGroup>

<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-preview.*</MicrosoftExtensionsLoggingAbstractionsVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
<!--
Do not bump to 9.0. complicated reasons due to some runtime incompatibilities if
CoreWCF compiles against an older version but then run with a newer version in a related package.
Expand Down
11 changes: 11 additions & 0 deletions build/dependenciesTest.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,25 @@
<XunitVersion>2.9.2</XunitVersion>
<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>

<!-- MicrosoftExtensionsTimeProviderTesting 8.x has a 6.0.0 target, 9.x does not. -->
<PropertyGroup Condition="'$(TargetFramework)' != 'net6.0'">
<MicrosoftExtensionsTimeProviderTestingVersion>9.0.0</MicrosoftExtensionsTimeProviderTestingVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<MicrosoftExtensionsTimeProviderTestingVersion>8.10.0</MicrosoftExtensionsTimeProviderTestingVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
<SystemTextJson>10.0.0-preview.*</SystemTextJson>
</PropertyGroup>
</Project>
7 changes: 6 additions & 1 deletion build/targets.props
Original file line number Diff line number Diff line change
@@ -1,7 +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 -->
<!-- <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);</SrcTargets>
<SrcTargets Condition="'$(TargetNetNext)'== 'True'">$(SrcTargets);net10.0</SrcTargets>
</PropertyGroup>
</Project>
7 changes: 6 additions & 1 deletion build/targetsTest.props
Original file line number Diff line number Diff line change
@@ -1,7 +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 -->
<!-- <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);</TestTargets>
<TestTargets Condition="'$(TargetNetNext)'== 'True'">$(TestTargets);net10.0</TestTargets>
</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions build/template-Build-run-tests-sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ 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:
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"sdk": {
"version": "9.0.108",
"rollForward": "latestFeature"
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.56"
Expand Down
4 changes: 4 additions & 0 deletions runTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ function WriteSectionFooter($sectionName)

################################################# Functions ############################################################

$env:TargetNetNext = "True"

WriteSectionHeader("runTests.ps1");
Write-Host "buildType: " $buildType;
Write-Host "dotnetDir: " $dotnetDir
Expand All @@ -42,9 +44,11 @@ $runSettingsPath = $PSScriptRoot + "\build\CodeCoverage.runsettings"
[xml]$buildConfiguration = Get-Content $PSScriptRoot\buildConfiguration.xml
$dotnetexe = "$dotnetDir\dotnet.exe";
$startTime = Get-Date

Write-Host "Start Time: " $startTime
Write-Host "PSScriptRoot: " $PSScriptRoot;
Write-Host "dotnetexe: " $dotnetexe;
Write-Host "TargetNetNext: " $env:TargetNetNext;

$ErrorActionPreference = "Stop"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Microsoft.IdentityModel.JsonWebTokens.JsonClaimSet._claimsLock -> System.Threading.Lock
Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.TryReadJwtClaim.get -> Microsoft.IdentityModel.Tokens.TryReadJwtClaim
Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.TryReadJwtClaim.set -> void
static Microsoft.IdentityModel.JsonWebTokens.JwtTokenUtilities.CreateSignature(System.ReadOnlySpan<byte> data, System.Span<byte> destination, Microsoft.IdentityModel.Tokens.SigningCredentials signingCredentials, out int bytesWritten) -> bool
virtual Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.ReadHeaderValue(ref System.Text.Json.Utf8JsonReader reader, System.Collections.Generic.IDictionary<string, object> claims) -> void
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.TryReadJwtClaim.get -> Microsoft.IdentityModel.Tokens.TryReadJwtClaim
Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.TryReadJwtClaim.set -> void
virtual Microsoft.IdentityModel.JsonWebTokens.JsonWebToken.ReadHeaderValue(ref System.Text.Json.Utf8JsonReader reader, System.Collections.Generic.IDictionary<string, object> claims) -> void
static Microsoft.IdentityModel.JsonWebTokens.JwtTokenUtilities.DecryptJwtToken(Microsoft.IdentityModel.JsonWebTokens.JsonWebToken jsonWebToken, Microsoft.IdentityModel.Tokens.Experimental.ValidationParameters validationParameters, Microsoft.IdentityModel.JsonWebTokens.JwtTokenDecryptionParameters decryptionParameters, Microsoft.IdentityModel.Tokens.CallContext callContext) -> Microsoft.IdentityModel.Tokens.Experimental.ValidationResult<string, Microsoft.IdentityModel.Tokens.Experimental.ValidationError>
Microsoft.IdentityModel.JsonWebTokens.JsonWebTokenHandler.DecryptToken(Microsoft.IdentityModel.JsonWebTokens.JsonWebToken jwtToken, Microsoft.IdentityModel.Tokens.Experimental.ValidationParameters validationParameters, Microsoft.IdentityModel.Tokens.BaseConfiguration configuration, Microsoft.IdentityModel.Tokens.CallContext callContext) -> Microsoft.IdentityModel.Tokens.Experimental.ValidationResult<string, Microsoft.IdentityModel.Tokens.Experimental.ValidationError>
Microsoft.IdentityModel.JsonWebTokens.JsonWebTokenHandler.GetContentEncryptionKeys(Microsoft.IdentityModel.JsonWebTokens.JsonWebToken jwtToken, Microsoft.IdentityModel.Tokens.ValidationParameters validationParameters, Microsoft.IdentityModel.Tokens.BaseConfiguration configuration, Microsoft.IdentityModel.Tokens.CallContext callContext) -> (System.Collections.Generic.IList<Microsoft.IdentityModel.Tokens.SecurityKey>, Microsoft.IdentityModel.Tokens.ValidationError)
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public static class IdentityModelTelemetryUtil
"ID_NET8_0";
#elif NET9_0
"ID_NET9_0";
#elif NET10_0
"ID_NET10_0";
#endif

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<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>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Microsoft.IdentityModel.Protocols.HttpDocumentRetriever.HttpVersionPolicy.get -> System.Net.Http.HttpVersionPolicy?
Microsoft.IdentityModel.Protocols.HttpDocumentRetriever.HttpVersionPolicy.set -> void
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public string CreateTokenWithInvalidSignature()
var tokenDescriptor = CreateTokenDescriptorWithInstanceOverrides();
var token = CreateToken(tokenDescriptor);

#if NETCOREAPP
#if NET
return string.Concat(token.AsSpan(0, token.LastIndexOf(value: '.')), ".InvalidSignature");
#else
return token.Substring(0, token.LastIndexOf(value: '.')) + ".InvalidSignature";
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Text;
using Microsoft.IdentityModel.Logging;

#if NETCOREAPP
#if NET
using System.Runtime.CompilerServices;
#endif

Expand Down Expand Up @@ -193,7 +193,7 @@ public static byte[] DecodeBytes(string str)
return Decode(str.AsSpan());
}

#if NETCOREAPP
#if NET
[SkipLocalsInit]
#endif

Expand Down Expand Up @@ -238,7 +238,7 @@ internal static byte[] Decode(ReadOnlySpan<char> strSpan)
}
#endif

#if NETCOREAPP
#if NET
[SkipLocalsInit]
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

#if NETCOREAPP
#if NET
using System.Diagnostics.CodeAnalysis;
#endif

Expand Down Expand Up @@ -62,7 +62,7 @@ public ValidationResult(TError error)
/// <c>true</c> if the validation succeeded and <see cref="Result"/> contains a valid value;
/// <c>false</c> if the validation failed and <see cref="Error"/> contains the error.
/// </value>
#if NETCOREAPP
#if NET
[MemberNotNullWhen(true, nameof(Result))]
[MemberNotNullWhen(false, nameof(Error))]
#endif
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider.GetEncryptionAlgorithm() -> string
Microsoft.IdentityModel.Tokens.IssuerValidationError.IssuerValidationError(Microsoft.IdentityModel.Tokens.MessageDetail messageDetail, System.Type exceptionType, System.Diagnostics.StackFrame stackFrame, string invalidIssuer) -> void
Microsoft.IdentityModel.Tokens.SignUsingSpanDelegate
override Microsoft.IdentityModel.Tokens.IssuerValidationError.GetException() -> System.Exception
static readonly Microsoft.IdentityModel.Tokens.Json.JsonWebKeySerializer.JsonWebKeyParameterNamesUpperCase -> System.Collections.Frozen.FrozenSet<string>
static Microsoft.IdentityModel.Tokens.Base64UrlEncoder.Decode(System.ReadOnlySpan<char> strSpan, System.Span<byte> output) -> int
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider.EcdhKeyExchangeProvider(Microsoft.IdentityModel.Tokens.SecurityKey privateKey, Microsoft.IdentityModel.Tokens.SecurityKey publicKey, string alg, string enc) -> void
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider.GenerateKdf(string apu = null, string apv = null) -> Microsoft.IdentityModel.Tokens.SecurityKey
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider.KeyDataLen.get -> int
Microsoft.IdentityModel.Tokens.EcdhKeyExchangeProvider.KeyDataLen.set -> void
override Microsoft.IdentityModel.Tokens.AsymmetricSignatureProvider.Sign(System.ReadOnlySpan<byte> input, System.Span<byte> signature, out int bytesWritten) -> bool
override Microsoft.IdentityModel.Tokens.SecurityTokenException.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
override Microsoft.IdentityModel.Tokens.SymmetricSignatureProvider.Sign(System.ReadOnlySpan<byte> input, System.Span<byte> signature, out int bytesWritten) -> bool
static Microsoft.IdentityModel.Tokens.JsonWebKeyConverter.ConvertFromECDsaSecurityKey(Microsoft.IdentityModel.Tokens.ECDsaSecurityKey key) -> Microsoft.IdentityModel.Tokens.JsonWebKey
virtual Microsoft.IdentityModel.Tokens.SignatureProvider.Sign(System.ReadOnlySpan<byte> data, System.Span<byte> destination, out int bytesWritten) -> bool
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
~Microsoft.IdentityModel.Tokens.CaseSensitiveClaimsIdentity.SecurityToken.set -> void
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Tokens/Utility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public static bool AreEqual(byte[] a, byte[] b)
a2 = b.AsSpan();
}

#if NETCOREAPP
#if NET
return System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(a1, a2);
#else
int result = 0;
Expand Down Expand Up @@ -233,7 +233,7 @@ internal static bool AreEqual(ReadOnlySpan<byte> a, ReadOnlySpan<byte> b, int le
b = b.Slice(0, length);
}

#if NETCOREAPP
#if NET
return System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(a, b);
#else
int result = 0;
Expand Down
1 change: 1 addition & 0 deletions test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ $startTime = Get-Date
Write-Host "Start Time: " $startTime
Write-Host "PSScriptRoot: " $PSScriptRoot;
Write-Host "dotnetexe: " $dotnetexe;
Write-Host "TargetNetNext: " $env:TargetNetNext;

$ErrorActionPreference = "Stop"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\build\commonTest.props" />

Expand All @@ -17,8 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.RegularExpressions" Version="$(SystemTextRegularExpressions)" />
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttp)" />
<PackageReference Include="System.Text.RegularExpressions" Version="$(SystemTextRegularExpressions)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright(c) Microsoft Corporation.All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
Expand All @@ -22,7 +22,7 @@

<CompatibleReference Update="@(CompatibleReference)" Path="..\..\src\%(Identity)\%(Identity).csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="@(CompatibleReference->'%(Path)')" />

Expand Down
Loading
Loading