diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index bf426effe0..f53ebd14a1 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -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 diff --git a/benchmark/Microsoft.IdentityModel.Benchmarks/JsonWebKeyComparison.cs b/benchmark/Microsoft.IdentityModel.Benchmarks/JsonWebKeyComparison.cs index 0bf9766feb..cbd3d10eda 100644 --- a/benchmark/Microsoft.IdentityModel.Benchmarks/JsonWebKeyComparison.cs +++ b/benchmark/Microsoft.IdentityModel.Benchmarks/JsonWebKeyComparison.cs @@ -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; diff --git a/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj b/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj index f30681b251..aeb36836e7 100644 --- a/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj +++ b/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj @@ -5,7 +5,7 @@ Microsoft.IdentityModel.Benchmarks Exe net6.0;net8.0;net9.0 - $(TargetFrameworks); + $(TargetFrameworks);net10.0 True True $(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk @@ -23,6 +23,14 @@ --> + + + true + + + + false + diff --git a/build.ps1 b/build.ps1 index fe95591ae7..cd8eed051e 100644 --- a/build.ps1 +++ b/build.ps1 @@ -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" diff --git a/build/commonTest.props b/build/commonTest.props index 91df851ece..d8c5478f44 100644 --- a/build/commonTest.props +++ b/build/commonTest.props @@ -11,7 +11,7 @@ git https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet true - 0618 + $(WarningsNotAsErrors);0618 true $(TestTargets) $(DotNetCoreAppRuntimeVersion) @@ -20,16 +20,20 @@ true - - $(DefineConstants);NET_CORE - - $(NoWarn);SYSLIB0050 $(NoWarn);SYSLIB0051 $(NoWarn);CS1591 + + + $(NoWarn);NU1510 + $(WarningsNotAsErrors);NU1510 + + @@ -52,8 +56,7 @@ - + true - diff --git a/build/dependencies.props b/build/dependencies.props index 8fcd37243e..9e1cd68069 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,8 +14,19 @@ 8.0.5 + + true + false + + $(WarningsNotAsErrors);NU1510;NU5104 + $(NoWarn);NU5104 + + + + 10.0.0-preview.* + - + 9.0.0 + 8.10.0 + + + 10.0.0-preview.* + diff --git a/build/targets.props b/build/targets.props index 7706821787..cfb404af62 100644 --- a/build/targets.props +++ b/build/targets.props @@ -1,7 +1,12 @@ + + + net462;net472;netstandard2.0;net6.0;net8.0;net9.0 netstandard2.0;net8.0;net9.0 - $(SrcTargets); + $(SrcTargets);net10.0 diff --git a/build/targetsTest.props b/build/targetsTest.props index 3ce14d058e..129c6f909b 100644 --- a/build/targetsTest.props +++ b/build/targetsTest.props @@ -1,7 +1,12 @@ + + + net462;net472;net6.0;net8.0;net9.0 net8.0;net9.0 - $(TestTargets); + $(TestTargets);net10.0 diff --git a/build/template-Build-run-tests-sign.yml b/build/template-Build-run-tests-sign.yml index c0dac9cf82..bb4a74d008 100644 --- a/build/template-Build-run-tests-sign.yml +++ b/build/template-Build-run-tests-sign.yml @@ -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: diff --git a/global.json b/global.json index 9aa2f28517..9a53baeed8 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,8 @@ { "sdk": { "version": "9.0.108", - "rollForward": "latestFeature" + "allowPrerelease": true, + "rollForward": "latestMajor" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.56" diff --git a/runTests.ps1 b/runTests.ps1 index a196bd9f3e..add5da168f 100644 --- a/runTests.ps1 +++ b/runTests.ps1 @@ -30,6 +30,8 @@ function WriteSectionFooter($sectionName) ################################################# Functions ############################################################ +$env:TargetNetNext = "True" + WriteSectionHeader("runTests.ps1"); Write-Host "buildType: " $buildType; Write-Host "dotnetDir: " $dotnetDir @@ -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" diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Shipped.txt b/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Shipped.txt new file mode 100644 index 0000000000..f0927cb063 --- /dev/null +++ b/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Shipped.txt @@ -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 data, System.Span 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 claims) -> void diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Unshipped.txt b/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Unshipped.txt new file mode 100644 index 0000000000..812667a1ff --- /dev/null +++ b/src/Microsoft.IdentityModel.JsonWebTokens/PublicAPI/net10.0/InternalAPI.Unshipped.txt @@ -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 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 +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 +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.ValidationError) diff --git a/src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs b/src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs index 74a8a0e7ac..9da9f00a3b 100644 --- a/src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs +++ b/src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs @@ -39,6 +39,8 @@ public static class IdentityModelTelemetryUtil "ID_NET8_0"; #elif NET9_0 "ID_NET9_0"; +#elif NET10_0 + "ID_NET10_0"; #endif /// diff --git a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj index d63a15cc3b..18b86da304 100644 --- a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj +++ b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj @@ -9,6 +9,7 @@ Microsoft.IdentityModel.LoggingExtensions .NET;Windows;Authentication;Identity;Extensions;Logging netstandard2.0;net9.0 + $(TargetFrameworks);net10.0 enable diff --git a/src/Microsoft.IdentityModel.Protocols/PublicAPI/net10.0/PublicAPI.Shipped.txt b/src/Microsoft.IdentityModel.Protocols/PublicAPI/net10.0/PublicAPI.Shipped.txt new file mode 100644 index 0000000000..2018392e40 --- /dev/null +++ b/src/Microsoft.IdentityModel.Protocols/PublicAPI/net10.0/PublicAPI.Shipped.txt @@ -0,0 +1,2 @@ +Microsoft.IdentityModel.Protocols.HttpDocumentRetriever.HttpVersionPolicy.get -> System.Net.Http.HttpVersionPolicy? +Microsoft.IdentityModel.Protocols.HttpDocumentRetriever.HttpVersionPolicy.set -> void diff --git a/src/Microsoft.IdentityModel.Protocols/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/Microsoft.IdentityModel.Protocols/PublicAPI/net10.0/PublicAPI.Unshipped.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Microsoft.IdentityModel.TestExtensions/TestTokenCreator.cs b/src/Microsoft.IdentityModel.TestExtensions/TestTokenCreator.cs index 4243592038..b78e293589 100644 --- a/src/Microsoft.IdentityModel.TestExtensions/TestTokenCreator.cs +++ b/src/Microsoft.IdentityModel.TestExtensions/TestTokenCreator.cs @@ -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"; diff --git a/src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs b/src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs index 7419b3dd95..eca5382a99 100644 --- a/src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs +++ b/src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs @@ -9,7 +9,7 @@ using System.Text; using Microsoft.IdentityModel.Logging; -#if NETCOREAPP +#if NET using System.Runtime.CompilerServices; #endif @@ -193,7 +193,7 @@ public static byte[] DecodeBytes(string str) return Decode(str.AsSpan()); } -#if NETCOREAPP +#if NET [SkipLocalsInit] #endif @@ -238,7 +238,7 @@ internal static byte[] Decode(ReadOnlySpan strSpan) } #endif -#if NETCOREAPP +#if NET [SkipLocalsInit] #endif diff --git a/src/Microsoft.IdentityModel.Tokens/Experimental/Validation/Results/Details/ValidationResult.cs b/src/Microsoft.IdentityModel.Tokens/Experimental/Validation/Results/Details/ValidationResult.cs index 826f29cacf..b08f08a52e 100644 --- a/src/Microsoft.IdentityModel.Tokens/Experimental/Validation/Results/Details/ValidationResult.cs +++ b/src/Microsoft.IdentityModel.Tokens/Experimental/Validation/Results/Details/ValidationResult.cs @@ -3,7 +3,7 @@ using System; -#if NETCOREAPP +#if NET using System.Diagnostics.CodeAnalysis; #endif @@ -62,7 +62,7 @@ public ValidationResult(TError error) /// true if the validation succeeded and contains a valid value; /// false if the validation failed and contains the error. /// -#if NETCOREAPP +#if NET [MemberNotNullWhen(true, nameof(Result))] [MemberNotNullWhen(false, nameof(Error))] #endif diff --git a/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/InternalAPI.Shipped.txt b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/InternalAPI.Shipped.txt new file mode 100644 index 0000000000..90b59c075e --- /dev/null +++ b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/InternalAPI.Shipped.txt @@ -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 +static Microsoft.IdentityModel.Tokens.Base64UrlEncoder.Decode(System.ReadOnlySpan strSpan, System.Span output) -> int diff --git a/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/InternalAPI.Unshipped.txt b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/InternalAPI.Unshipped.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Shipped.txt b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Shipped.txt new file mode 100644 index 0000000000..a1afb5ec41 --- /dev/null +++ b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Shipped.txt @@ -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 input, System.Span 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 input, System.Span 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 data, System.Span destination, out int bytesWritten) -> bool diff --git a/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Unshipped.txt new file mode 100644 index 0000000000..ddb7553f60 --- /dev/null +++ b/src/Microsoft.IdentityModel.Tokens/PublicAPI/net10.0/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +~Microsoft.IdentityModel.Tokens.CaseSensitiveClaimsIdentity.SecurityToken.set -> void \ No newline at end of file diff --git a/src/Microsoft.IdentityModel.Tokens/Utility.cs b/src/Microsoft.IdentityModel.Tokens/Utility.cs index 1e1b3983d3..f79993d1ee 100644 --- a/src/Microsoft.IdentityModel.Tokens/Utility.cs +++ b/src/Microsoft.IdentityModel.Tokens/Utility.cs @@ -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; @@ -233,7 +233,7 @@ internal static bool AreEqual(ReadOnlySpan a, ReadOnlySpan b, int le b = b.Slice(0, length); } -#if NETCOREAPP +#if NET return System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(a, b); #else int result = 0; diff --git a/test.ps1 b/test.ps1 index 2e7cfd68a0..735d502ac6 100644 --- a/test.ps1 +++ b/test.ps1 @@ -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" diff --git a/test/Microsoft.IdentityModel.Abstractions.Tests/Microsoft.IdentityModel.Abstractions.Tests.csproj b/test/Microsoft.IdentityModel.Abstractions.Tests/Microsoft.IdentityModel.Abstractions.Tests.csproj index f68ed5ca94..d7c748d6af 100644 --- a/test/Microsoft.IdentityModel.Abstractions.Tests/Microsoft.IdentityModel.Abstractions.Tests.csproj +++ b/test/Microsoft.IdentityModel.Abstractions.Tests/Microsoft.IdentityModel.Abstractions.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -17,8 +17,8 @@ - + diff --git a/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs b/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs index 00a1e4ef5d..6e9cf941e1 100644 --- a/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs +++ b/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs @@ -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; diff --git a/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj b/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj index 2ffe0e3b28..5e5342b3e7 100644 --- a/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj +++ b/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj @@ -1,4 +1,4 @@ - + net8.0;net9.0 @@ -22,7 +22,7 @@ - + diff --git a/test/Microsoft.IdentityModel.JsonWebTokens.Tests/Microsoft.IdentityModel.JsonWebTokens.Tests.csproj b/test/Microsoft.IdentityModel.JsonWebTokens.Tests/Microsoft.IdentityModel.JsonWebTokens.Tests.csproj index bee9383f8c..51f874934a 100644 --- a/test/Microsoft.IdentityModel.JsonWebTokens.Tests/Microsoft.IdentityModel.JsonWebTokens.Tests.csproj +++ b/test/Microsoft.IdentityModel.JsonWebTokens.Tests/Microsoft.IdentityModel.JsonWebTokens.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -23,7 +23,6 @@ - diff --git a/test/Microsoft.IdentityModel.Logging.Tests/Microsoft.IdentityModel.Logging.Tests.csproj b/test/Microsoft.IdentityModel.Logging.Tests/Microsoft.IdentityModel.Logging.Tests.csproj index 6ed8578f22..ffaabb3018 100644 --- a/test/Microsoft.IdentityModel.Logging.Tests/Microsoft.IdentityModel.Logging.Tests.csproj +++ b/test/Microsoft.IdentityModel.Logging.Tests/Microsoft.IdentityModel.Logging.Tests.csproj @@ -25,7 +25,8 @@ - + + diff --git a/test/Microsoft.IdentityModel.Logging.Tests/TestLogger.cs b/test/Microsoft.IdentityModel.Logging.Tests/TestLogger.cs index d001ef48bc..e5dd28ce0e 100644 --- a/test/Microsoft.IdentityModel.Logging.Tests/TestLogger.cs +++ b/test/Microsoft.IdentityModel.Logging.Tests/TestLogger.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; using System.Collections.Generic; using System.Linq; using Microsoft.IdentityModel.Abstractions; diff --git a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests.csproj b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests.csproj index 74c2cf9312..c9b0a0c1a7 100644 --- a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests.csproj +++ b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ PreserveNewest - + @@ -26,8 +26,8 @@ - - + + diff --git a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs index e8ffe4c2d6..1ba73c0b2f 100644 --- a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs +++ b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs @@ -288,9 +288,9 @@ public void OidcCreateAuthenticationRequestUrl(string testId, OpenIdConnectMessa #elif NET9_0 if (!message.SkuTelemetryValue.Equals("ID_NET9_0")) context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET9_0"); -#elif NET_CORE - if (!message.SkuTelemetryValue.Equals("ID_NETSTANDARD2_0")) - context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NETSTANDARD2_0"); +#elif NET10_0 + if (!message.SkuTelemetryValue.Equals("ID_NET10_0")) + context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET10_0"); #endif IdentityComparer.AreEqual(message.CreateAuthenticationRequestUrl(), expectedMessage, context); TestUtilities.AssertFailIfErrors(context); @@ -560,9 +560,9 @@ public void OidcCreateLogoutRequestUrl(string testId, OpenIdConnectMessage messa #elif NET9_0 if (!message.SkuTelemetryValue.Equals("ID_NET9_0")) context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET9_0"); -#elif NET_CORE - if (!message.SkuTelemetryValue.Equals("ID_NETSTANDARD2_0")) - context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NETSTANDARD2_0"); +#elif NET10_0 + if (!message.SkuTelemetryValue.Equals("ID_NET10_0")) + context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET10_0"); #endif IdentityComparer.AreEqual(message.CreateLogoutRequestUrl(), expectedMessage, context); TestUtilities.AssertFailIfErrors(context); diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests.csproj b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests.csproj index 7044634c0c..3513d643f0 100644 --- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests.csproj +++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -21,10 +21,9 @@ - - + - + diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs index bf61144f11..8eb46a58ee 100644 --- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs +++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs @@ -910,7 +910,7 @@ public static TheoryData CreateCnfClaimTheory SigningCredentials = new SigningCredentials(KeyingMaterial.X509SecurityKey1, SecurityAlgorithms.RsaSha256, SecurityAlgorithms.Sha256), ExpectedClaimValue = $@"{{""cnf"":{{""{ConfirmationClaimTypes.Jwk}"":{{""{JsonWebKeyParameterNames.Kid}"":""{Base64UrlEncoder.Encode(rsaJwkFromX509Key.ComputeJwkThumbprint())}"",""{JsonWebKeyParameterNames.E}"":""{rsaJwkFromX509Key.E}"",""{JsonWebKeyParameterNames.Kty}"":""{JsonWebAlgorithmsKeyTypes.RSA}"",""{JsonWebKeyParameterNames.N}"":""{rsaJwkFromX509Key.N}""}}}}}}" }, -#if NET472 || NET_CORE +#if NET472 || NET new CreateSignedHttpRequestTheoryData("ValidEcdsaKey") { ExpectedClaim = ConfirmationClaimTypes.Cnf, diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs index 356b11ea8d..93ac46b9bb 100644 --- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs +++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs @@ -137,7 +137,7 @@ public static TheoryData RoundtripTheoryDa tvpWrongIssuerSigningKey.IssuerSigningKey = KeyingMaterial.RsaSecurityKey2; var ecdsaSigningCredentials = new SigningCredentials(KeyingMaterial.Ecdsa256Key, SecurityAlgorithms.EcdsaSha256); -#if NET_CORE +#if NET var adHocRsa = RSA.Create(); adHocRsa.KeySize = 2048; #else @@ -206,7 +206,7 @@ public static TheoryData RoundtripTheoryDa SigningCredentials = SignedHttpRequestTestUtils.DefaultSigningCredentials, TestId = "ValidRsaThumbprint", }, -#if NET_CORE +#if NET new RoundtripSignedHttpRequestTheoryData { SignedHttpRequestCreationParameters = creationParameters, diff --git a/test/Microsoft.IdentityModel.Protocols.Tests/Microsoft.IdentityModel.Protocols.Tests.csproj b/test/Microsoft.IdentityModel.Protocols.Tests/Microsoft.IdentityModel.Protocols.Tests.csproj index 3024327019..752d117840 100644 --- a/test/Microsoft.IdentityModel.Protocols.Tests/Microsoft.IdentityModel.Protocols.Tests.csproj +++ b/test/Microsoft.IdentityModel.Protocols.Tests/Microsoft.IdentityModel.Protocols.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ $(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk true - + @@ -30,7 +30,8 @@ - + + diff --git a/test/Microsoft.IdentityModel.Protocols.WsFederation.Tests/Microsoft.IdentityModel.Protocols.WsFederation.Tests.csproj b/test/Microsoft.IdentityModel.Protocols.WsFederation.Tests/Microsoft.IdentityModel.Protocols.WsFederation.Tests.csproj index ffe3807178..1ba63a397a 100644 --- a/test/Microsoft.IdentityModel.Protocols.WsFederation.Tests/Microsoft.IdentityModel.Protocols.WsFederation.Tests.csproj +++ b/test/Microsoft.IdentityModel.Protocols.WsFederation.Tests/Microsoft.IdentityModel.Protocols.WsFederation.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -24,7 +24,8 @@ - + + diff --git a/test/Microsoft.IdentityModel.TestUtils/KeyingMaterial.cs b/test/Microsoft.IdentityModel.TestUtils/KeyingMaterial.cs index e46623cc38..3ed6a6f204 100644 --- a/test/Microsoft.IdentityModel.TestUtils/KeyingMaterial.cs +++ b/test/Microsoft.IdentityModel.TestUtils/KeyingMaterial.cs @@ -318,7 +318,7 @@ public static RsaSecurityKey RsaSecurityKey2 public static string P521_Y = "AZ8DlNxsA6eCj_JL9Rz8uU4eacd-XX--ek8-VCOgv3YNRPeN_2PJauJL7q9Pg1MSe8zEaLIRhM4SGWJ4SI1rMhlW"; public static string P521_Invalid = "AAAAAAA----Z8DlNxsA6eCj_JL9Rz8uU4eacd-XX--ek8-VCOgv3YNRPeN_2PJauJL7q9Pg1MSe8zEaLIRhM4SGWJ4SI1rMhlW"; -#if NET472 || NET_CORE +#if NET472 || NET public static ECParameters Ecdsa256Parameters; public static ECParameters Ecdsa256Parameters_Public; public static ECParameters Ecdsa384Parameters; @@ -484,7 +484,7 @@ static KeyingMaterial() Ecdsa256Key_Public = new ECDsaSecurityKey(new ECDsaCng(ecdsa256Public)) { KeyId = "ECDsa256Key_Public" }; Ecdsa384Key_Public = new ECDsaSecurityKey(new ECDsaCng(ecdsa384Public)) { KeyId = "ECDsa384Key_Public" }; Ecdsa521Key_Public = new ECDsaSecurityKey(new ECDsaCng(ecdsa512Public)) { KeyId = "ECDsa521Key_Public" }; -#elif NET472 || NET_CORE +#elif NET472 || NET var Ecdsa256 = ECDsa.Create(ECCurve.NamedCurves.nistP256); var Ecdsa384 = ECDsa.Create(ECCurve.NamedCurves.nistP384); var Ecdsa521 = ECDsa.Create(ECCurve.NamedCurves.nistP521); @@ -575,7 +575,7 @@ public static RsaSecurityKey RsaSecurityKeyWithCngProvider_2048_Public } #endif -#if NET472 || NET_CORE +#if NET472 || NET public static RsaSecurityKey RsaSecurityKey_2048_FromRsa { get @@ -614,12 +614,7 @@ public static SecurityKey DefaultRsaSecurityKey1 { get { - AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE - publicKey = RSACertificateExtensions.GetRSAPublicKey(DefaultCert_2048); -#else - publicKey = DefaultCert_2048.PublicKey.Key; -#endif + AsymmetricAlgorithm publicKey = RSACertificateExtensions.GetRSAPublicKey(DefaultCert_2048); RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); return new RsaSecurityKey(parameters); @@ -632,12 +627,7 @@ public static SecurityKey DefaultRsaSecurityKey2 { var certData = "MIIDBTCCAe2gAwIBAgIQY4RNIR0dX6dBZggnkhCRoDANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTE3MDIxMzAwMDAwMFoXDTE5MDIxNDAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBEizU1OJms31S/ry7iav/IICYVtQ2MRPhHhYknHImtU03sgVk1Xxub4GD7R15i9UWIGbzYSGKaUtGU9lP55wrfLpDjQjEgaXi4fE6mcZBwa9qc22is23B6R67KMcVyxyDWei+IP3sKmCcMX7Ibsg+ubZUpvKGxXZ27YgqFTPqCT2znD7K81YKfy+SVg3uW6epW114yZzClTQlarptYuE2mujxjZtx7ZUlwc9AhVi8CeiLwGO1wzTmpd/uctpner6oc335rvdJikNmc1cFKCK+2irew1bgUJHuN+LJA0y5iVXKvojiKZ2Ii7QKXn19Ssg1FoJ3x2NWA06wc0CnruLsCAwEAAaMhMB8wHQYDVR0OBBYEFDAr/HCMaGqmcDJa5oualVdWAEBEMA0GCSqGSIb3DQEBCwUAA4IBAQAiUke5mA86R/X4visjceUlv5jVzCn/SIq6Gm9/wCqtSxYvifRXxwNpQTOyvHhrY/IJLRUp2g9/fDELYd65t9Dp+N8SznhfB6/Cl7P7FRo99rIlj/q7JXa8UB/vLJPDlr+NREvAkMwUs1sDhL3kSuNBoxrbLC5Jo4es+juQLXd9HcRraE4U3UZVhUS2xqjFOfaGsCbJEqqkjihssruofaxdKT1CPzPMANfREFJznNzkpJt4H0aMDgVzq69NxZ7t1JiIuc43xRjeiixQMRGMi1mAB75fTyfFJ/rWQ5J/9kh0HMZVtHsqICBF1tHMTMIK5rwoweY0cuCIpN7A/zMOQtoD"; var cert = CertificateHelper.LoadX509Certificate(certData); - AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE - publicKey = RSACertificateExtensions.GetRSAPublicKey(cert); -#else - publicKey = cert.PublicKey.Key; -#endif + AsymmetricAlgorithm publicKey = RSACertificateExtensions.GetRSAPublicKey(cert); RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); return new RsaSecurityKey(parameters); @@ -652,11 +642,7 @@ public static SecurityKey DefaultJsonWebKeyWithCertificate1 jsonWebKey.X5c.Add("MIIDJTCCAg2gAwIBAgIQGzlg2gNmfKRKBa6dqqZXxzANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdLZXlTdG9yZVRlc3RDZXJ0aWZpY2F0ZTAeFw0xMTExMDkxODE5MDZaFw0zOTEyMzEyMzU5NTlaMCIxIDAeBgNVBAMTF0tleVN0b3JlVGVzdENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAns1cm8RU1hKZILPI6pB5Zoxn9mW2tSS0atV+o9FCn9NyeOktEOj1kEXOeIz0KfnqxgPMF1GpshuZBAhgjkyy2kNGE6Zx50CCJgq6XUatvVVJpMp8/FV18ynPf+/TRlF8V2HO3IVJ0XqRJ9fGA2f5xpOweWsdLYitdHbaDCl6IBNSXo52iNuqWAcB1k7jBlsnlXpuvslhLIzj60dnghAVA4ltS3NlFyw1Tz3pGlZQDt7x83IBHe7DA9bV3aJs1trkm1NzI1HoRS4vOqU3n4fn+DlfAE2vYKNkSi/PjuAX+1YQCq6e5uN/hOeSEqji8SsWC2nk/bMTKPwD67rn3jNC9wIDAQABo1cwVTBTBgNVHQEETDBKgBA3gSuALjvEuAVmF/x8knXvoSQwIjEgMB4GA1UEAxMXS2V5U3RvcmVUZXN0Q2VydGlmaWNhdGWCEBs5YNoDZnykSgWunaqmV8cwDQYJKoZIhvcNAQEEBQADggEBAFZvDA7PBh/vvFZb/QCBelTyD2Yqij16v3tk30A3Akli6UIILdbbOcA5BiPktT1kJxcsgSXNHUODlfG2Fy9HTqwunr8G7FYniOUXPVrRL+HwhKOzRFDMUS3+On+ZDzum7rbpm3SYlnJDyNb8wynPw/bXQw72jGjt63uh6OnkYE8fJ8iPfVWOenZkP/IXPIXK/bBwLMDJ1y77ZauPYbp7oiQ/991pn0c7F4ugT9LYmbAdJKhiainOaoBTvIHN8/lMZ8gHUuxvOJhPrbgo3NTqvT1/3kfD0AISP4R3pH0QL/0m7cO34nK4rFFLZs1sFUguYUJhfkyq1N8MiyyAqRmrvBQ="); jsonWebKey.Kty = JsonWebAlgorithmsKeyTypes.RSA; AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE publicKey = RSACertificateExtensions.GetRSAPublicKey(DefaultCert_2048); -#else - publicKey = DefaultCert_2048.PublicKey.Key; -#endif RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); jsonWebKey.E = Base64UrlEncoder.Encode(parameters.Exponent); @@ -675,11 +661,7 @@ public static SecurityKey DefaultJsonWebKeyWithCertificate2 jsonWebKey.Kty = JsonWebAlgorithmsKeyTypes.RSA; var cert = CertificateHelper.LoadX509Certificate(certData); AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE publicKey = RSACertificateExtensions.GetRSAPublicKey(cert); -#else - publicKey = cert.PublicKey.Key; -#endif RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); jsonWebKey.E = Base64UrlEncoder.Encode(parameters.Exponent); @@ -693,11 +675,7 @@ public static SecurityKey DefaultJsonWebKeyWithParameters1 get { AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE publicKey = RSACertificateExtensions.GetRSAPublicKey(DefaultCert_2048); -#else - publicKey = DefaultCert_2048.PublicKey.Key; -#endif RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); var jsonWebKey = new JsonWebKey(); @@ -715,11 +693,7 @@ public static SecurityKey DefaultJsonWebKeyWithParameters2 var certData = "MIIDBTCCAe2gAwIBAgIQY4RNIR0dX6dBZggnkhCRoDANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTE3MDIxMzAwMDAwMFoXDTE5MDIxNDAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBEizU1OJms31S/ry7iav/IICYVtQ2MRPhHhYknHImtU03sgVk1Xxub4GD7R15i9UWIGbzYSGKaUtGU9lP55wrfLpDjQjEgaXi4fE6mcZBwa9qc22is23B6R67KMcVyxyDWei+IP3sKmCcMX7Ibsg+ubZUpvKGxXZ27YgqFTPqCT2znD7K81YKfy+SVg3uW6epW114yZzClTQlarptYuE2mujxjZtx7ZUlwc9AhVi8CeiLwGO1wzTmpd/uctpner6oc335rvdJikNmc1cFKCK+2irew1bgUJHuN+LJA0y5iVXKvojiKZ2Ii7QKXn19Ssg1FoJ3x2NWA06wc0CnruLsCAwEAAaMhMB8wHQYDVR0OBBYEFDAr/HCMaGqmcDJa5oualVdWAEBEMA0GCSqGSIb3DQEBCwUAA4IBAQAiUke5mA86R/X4visjceUlv5jVzCn/SIq6Gm9/wCqtSxYvifRXxwNpQTOyvHhrY/IJLRUp2g9/fDELYd65t9Dp+N8SznhfB6/Cl7P7FRo99rIlj/q7JXa8UB/vLJPDlr+NREvAkMwUs1sDhL3kSuNBoxrbLC5Jo4es+juQLXd9HcRraE4U3UZVhUS2xqjFOfaGsCbJEqqkjihssruofaxdKT1CPzPMANfREFJznNzkpJt4H0aMDgVzq69NxZ7t1JiIuc43xRjeiixQMRGMi1mAB75fTyfFJ/rWQ5J/9kh0HMZVtHsqICBF1tHMTMIK5rwoweY0cuCIpN7A/zMOQtoD"; var cert = CertificateHelper.LoadX509Certificate(certData); AsymmetricAlgorithm publicKey; -#if NET462 || NET472 || NET_CORE publicKey = RSACertificateExtensions.GetRSAPublicKey(cert); -#else - publicKey = cert.PublicKey.Key; -#endif RSA rsa = publicKey as RSA; RSAParameters parameters = rsa.ExportParameters(false); var jsonWebKey = new JsonWebKey(); @@ -730,7 +704,7 @@ public static SecurityKey DefaultJsonWebKeyWithParameters2 } } -#if NET472_OR_GREATER || NETCOREAPP +#if NET472_OR_GREATER || NET /// /// Can be used to generate a self-signed certificate for testing purposes. /// Since we support .NET 4.6.2, we can't call directly as CertificateRequest is not available. diff --git a/test/Microsoft.IdentityModel.TestUtils/Microsoft.IdentityModel.TestUtils.csproj b/test/Microsoft.IdentityModel.TestUtils/Microsoft.IdentityModel.TestUtils.csproj index ebcc1d0e00..3ba3fb9670 100644 --- a/test/Microsoft.IdentityModel.TestUtils/Microsoft.IdentityModel.TestUtils.csproj +++ b/test/Microsoft.IdentityModel.TestUtils/Microsoft.IdentityModel.TestUtils.csproj @@ -13,12 +13,6 @@ false - - - - - - @@ -30,6 +24,12 @@ + + + + + + diff --git a/test/Microsoft.IdentityModel.TestUtils/MockConfigurationManager.cs b/test/Microsoft.IdentityModel.TestUtils/MockConfigurationManager.cs index eea4435da1..ee1d902420 100644 --- a/test/Microsoft.IdentityModel.TestUtils/MockConfigurationManager.cs +++ b/test/Microsoft.IdentityModel.TestUtils/MockConfigurationManager.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; using System.Threading; using System.Threading.Tasks; using Microsoft.IdentityModel.Logging; diff --git a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Microsoft.IdentityModel.Tokens.Saml.Tests.csproj b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Microsoft.IdentityModel.Tokens.Saml.Tests.csproj index 801324567f..25d0390be9 100644 --- a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Microsoft.IdentityModel.Tokens.Saml.Tests.csproj +++ b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Microsoft.IdentityModel.Tokens.Saml.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -17,6 +17,11 @@ + + + + + diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/AsymmetricSignatureTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/AsymmetricSignatureTests.cs index 1d1331b22d..083c36a9e4 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/AsymmetricSignatureTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/AsymmetricSignatureTests.cs @@ -21,9 +21,7 @@ public void UnsupportedRSATypes() var context = new CompareContext("UnsupportedRSATypes"); TestUtilities.WriteHeader($"{this}.UnsupportedRSATypes"); -#if NET462 || NET472 || NET_CORE var expectedException = ExpectedException.NoExceptionExpected; -#endif try { new AsymmetricAdapter(new RsaSecurityKey(new DerivedRsa(2048)), SecurityAlgorithms.RsaSha256, false); @@ -34,9 +32,7 @@ public void UnsupportedRSATypes() expectedException.ProcessException(ex, context); } -#if NET462 || NET472 || NET_CORE expectedException = ExpectedException.NoExceptionExpected; -#endif try { @@ -107,7 +103,6 @@ public static TheoryData SignVerifyTheoryData }, theoryData); -#if NET462 || NET472 || NET_CORE theoryData.Add(new SignatureProviderTheoryData() { SigningAlgorithm = SecurityAlgorithms.RsaSsaPssSha512, @@ -153,7 +148,7 @@ public static TheoryData SignVerifyTheoryData VerifyKey = new RsaSecurityKey(certTuple.Item2.PublicKey.Key as RSA), #if NET462 || NET472 ExpectedException = ExpectedException.NotSupportedException("IDX10634:"), -#elif NET_CORE +#elif NET ExpectedException = ExpectedException.NoExceptionExpected, #endif }, @@ -167,7 +162,7 @@ public static TheoryData SignVerifyTheoryData VerifyKey = new RsaSecurityKey(certTuple.Item2.GetRSAPublicKey()), #if NET462 || NET472 ExpectedException = ExpectedException.NotSupportedException("IDX10634:"), -#elif NET_CORE +#elif NET ExpectedException = ExpectedException.NoExceptionExpected, #endif }, @@ -181,7 +176,7 @@ public static TheoryData SignVerifyTheoryData VerifyKey = new RsaSecurityKey(certTuple.Item2.PublicKey.Key as RSA), #if NET462 || NET472 ExpectedException = ExpectedException.NotSupportedException("IDX10634:"), -#elif NET_CORE +#elif NET ExpectedException = ExpectedException.NoExceptionExpected, #endif }, @@ -222,7 +217,6 @@ public static TheoryData SignVerifyTheoryData VerifyKey = x509KeyTuple.Item2 }, theoryData); -#endif foreach (var ecdsaKeyTuple in AsymmetricSignatureTestData.ECDsaSecurityKeys) AsymmetricSignatureTestData.AddECDsaAlgorithmVariations(new SignatureProviderTheoryData diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs index afc42a9267..d211e06720 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs @@ -86,7 +86,7 @@ public void AesGcmEncryptionOnWindows() } } -#if NET_CORE +#if NET [Fact] public void AesGcm_Dispose() { diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/BaseConfigurationComparerTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/BaseConfigurationComparerTests.cs index 73aaab5c03..d4fa0e9200 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/BaseConfigurationComparerTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/BaseConfigurationComparerTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using Microsoft.IdentityModel.TestUtils; diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderCacheTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderCacheTests.cs index 41b2269352..496daa74cd 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderCacheTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderCacheTests.cs @@ -267,8 +267,8 @@ public static TheoryData TryAddTheoryData SignatureProvider = new SymmetricSignatureProvider(KeyingMaterial.DefaultSymmetricSecurityKey_384, ALG.HmacSha384, true), TestId = nameof(KeyingMaterial.DefaultSymmetricSecurityKey_256) }, -#if NET472 || NET_CORE - // ecdsa signature provider should be added to the cache on NET472 and NET_CORE. +#if NET472 || NET + // ecdsa signature provider should be added to the cache on NET472 and NET. new CryptoProviderCacheTheoryData { Added = true, @@ -601,7 +601,7 @@ public class CryptoProviderCacheTheoryData : TheoryDataBase, IDisposable public string Algorithm { get; set; } -#if NETCOREAPP +#if NET public CryptoProviderCache CryptoProviderCache { get; set; } #elif NET462 || NET472 public CryptoProviderCache CryptoProviderCache { get; set; } diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/ECDsaSecurityKeyTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/ECDsaSecurityKeyTests.cs index fbde8a76db..c80bd26e51 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/ECDsaSecurityKeyTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/ECDsaSecurityKeyTests.cs @@ -18,10 +18,10 @@ public void Constructor() // testing constructor that takes ECDsa instance ECDsaSecurityKeyConstructorWithEcdsa(null, ExpectedException.ArgumentNullException("ecdsa")); -#if !NET_CORE +#if !NET ECDsaSecurityKeyConstructorWithEcdsa(new ECDsaCng(), ExpectedException.NoExceptionExpected); var ecdsaSecurityKey = new ECDsaSecurityKey(new ECDsaCng()); -#elif NET_CORE +#else ECDsaSecurityKeyConstructorWithEcdsa(ECDsa.Create(), ExpectedException.NoExceptionExpected); var ecdsaSecurityKey = new ECDsaSecurityKey(ECDsa.Create()); #endif @@ -50,7 +50,7 @@ public void Defaults() [Fact] public void CanComputeJwkThumbprint() { -#if NET472 || NET_CORE +#if NET472 || NET Assert.True(KeyingMaterial.Ecdsa256Key.CanComputeJwkThumbprint(), "Couldn't compute JWK thumbprint on an ECDsaSecurityKey on net472 or .net core."); #else Assert.False(KeyingMaterial.Ecdsa256Key.CanComputeJwkThumbprint(), "ECDsaSecurityKey shouldn't be able to compute JWK thumbprint on Desktop (net461 target)."); diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeyConverterTest.cs b/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeyConverterTest.cs index 0826925abc..83a6b5cc05 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeyConverterTest.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeyConverterTest.cs @@ -80,7 +80,7 @@ public static TheoryData ConvertSecurityKeyToJson get { var theoryData = ConversionKeyTheoryData; -#if !NET472 && !NET_CORE +#if !NET472 && !NET theoryData.Add(new JsonWebKeyConverterTheoryData { SecurityKey = KeyingMaterial.Ecdsa256Key, @@ -154,7 +154,7 @@ public static TheoryData ConversionKeyTheoryData JsonWebKey = KeyingMaterial.JsonWebKeyX509_2048_Public, TestId = nameof(KeyingMaterial.DefaultX509Key_2048_Public) }); -#if NET472 || NET_CORE +#if NET472 || NET theoryData.Add(new JsonWebKeyConverterTheoryData { SecurityKey = KeyingMaterial.Ecdsa256Key_Public, diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/Microsoft.IdentityModel.Tokens.Tests.csproj b/test/Microsoft.IdentityModel.Tokens.Tests/Microsoft.IdentityModel.Tokens.Tests.csproj index b79e171d64..dae6a09afb 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/Microsoft.IdentityModel.Tokens.Tests.csproj +++ b/test/Microsoft.IdentityModel.Tokens.Tests/Microsoft.IdentityModel.Tokens.Tests.csproj @@ -21,8 +21,8 @@ - + diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/SecurityKeyTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/SecurityKeyTests.cs index d1e2a65f31..5a33d5b89a 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/SecurityKeyTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/SecurityKeyTests.cs @@ -91,7 +91,7 @@ public static TheoryData CompareJwkThumbprintsTes SecurityKey = KeyingMaterial.DefaultX509Key_2048_Public, TestId = nameof(KeyingMaterial.DefaultX509Key_2048_Public) }); -#if NET472 || NET_CORE +#if NET472 || NET theoryData.Add(new JsonWebKeyConverterTheoryData { SecurityKey = KeyingMaterial.Ecdsa256Key_Public, @@ -173,8 +173,8 @@ public static TheoryData CreateInternalIdsTestCases ExpectedInternalId = Base64UrlEncoder.Encode(KeyingMaterial.JsonWebKeyRsa_2048_Public.ComputeJwkThumbprint()), TestId = nameof(KeyingMaterial.JsonWebKeyRsa_2048_Public) }, -#if NET472 || NET_CORE - // EcdsaSecurityKey should have InternalId set to its jwk thumbprint on NET472 and NET_CORE. +#if NET472 || NET + // EcdsaSecurityKey should have InternalId set to its jwk thumbprint on NET472 and NET. new SecurityKeyTheoryData { SecurityKey = KeyingMaterial.Ecdsa256Key_Public, diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/StaticCryptoProviderTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/StaticCryptoProviderTests.cs index a15d1aedd3..2c27a733b1 100644 --- a/test/Microsoft.IdentityModel.Tokens.Tests/StaticCryptoProviderTests.cs +++ b/test/Microsoft.IdentityModel.Tokens.Tests/StaticCryptoProviderTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System; diff --git a/test/Microsoft.IdentityModel.Validators.Tests/Microsoft.IdentityModel.Validators.Tests.csproj b/test/Microsoft.IdentityModel.Validators.Tests/Microsoft.IdentityModel.Validators.Tests.csproj index 98749f37ed..5f6fa5cf39 100644 --- a/test/Microsoft.IdentityModel.Validators.Tests/Microsoft.IdentityModel.Validators.Tests.csproj +++ b/test/Microsoft.IdentityModel.Validators.Tests/Microsoft.IdentityModel.Validators.Tests.csproj @@ -29,9 +29,8 @@ - - + diff --git a/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureWriterTests.cs b/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureWriterTests.cs index 91e91020a5..b2f52ea459 100644 --- a/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureWriterTests.cs +++ b/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureWriterTests.cs @@ -112,7 +112,7 @@ public static TheoryData CreateSignatureWithoutSpe theoryData.Add(CreateSignatureTestCase(KeyingMaterial.RsaSecurityKey_2048, SecurityAlgorithms.RsaSha512, null, SecurityAlgorithms.RsaSha512 + "_DigestNULL")); theoryData.Add(CreateSignatureTestCase(KeyingMaterial.RsaSecurityKey_2048, SecurityAlgorithms.RsaSha512Signature, null, SecurityAlgorithms.RsaSha512Signature + "_DigestNULL")); -#if NET_CORE +#if NET theoryData.Add(CreateSignatureTestCase(KeyingMaterial.RsaSecurityKey_2048, SecurityAlgorithms.RsaSsaPssSha256, null, SecurityAlgorithms.RsaSsaPssSha256 + "_DigestNULL")); theoryData.Add(CreateSignatureTestCase(KeyingMaterial.RsaSecurityKey_2048, SecurityAlgorithms.RsaSsaPssSha256Signature, null, SecurityAlgorithms.RsaSsaPssSha256Signature + "_DigestNULL")); theoryData.Add(CreateSignatureTestCase(KeyingMaterial.RsaSecurityKey_2048, SecurityAlgorithms.RsaSsaPssSha384, null, SecurityAlgorithms.RsaSsaPssSha384 + "_DigestNULL")); diff --git a/test/Microsoft.IdentityModel.Xml.Tests/Microsoft.IdentityModel.Xml.Tests.csproj b/test/Microsoft.IdentityModel.Xml.Tests/Microsoft.IdentityModel.Xml.Tests.csproj index 26ca007957..3be731e3c0 100644 --- a/test/Microsoft.IdentityModel.Xml.Tests/Microsoft.IdentityModel.Xml.Tests.csproj +++ b/test/Microsoft.IdentityModel.Xml.Tests/Microsoft.IdentityModel.Xml.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -19,8 +19,8 @@ - + diff --git a/test/System.IdentityModel.Tokens.Jwt.Tests/CreateAndValidateTokens.cs b/test/System.IdentityModel.Tokens.Jwt.Tests/CreateAndValidateTokens.cs index a5d44aee38..7bd8440833 100644 --- a/test/System.IdentityModel.Tokens.Jwt.Tests/CreateAndValidateTokens.cs +++ b/test/System.IdentityModel.Tokens.Jwt.Tests/CreateAndValidateTokens.cs @@ -611,8 +611,6 @@ public static TheoryData RoundTripTokensTheoryData() ValidationParameters = Default.SymmetricEncryptSignTokenValidationParameters }); -#if NET462 || NET_CORE - // RsaPss is not supported on .NET < 4.6 var rsaPssSigningCredentials = new SigningCredentials(Default.AsymmetricSigningKey, SecurityAlgorithms.RsaSsaPssSha256); theoryData.Add(new JwtTheoryData { @@ -631,7 +629,6 @@ public static TheoryData RoundTripTokensTheoryData() ValidateIssuer = false, } }); -#endif return theoryData; } diff --git a/test/System.IdentityModel.Tokens.Jwt.Tests/System.IdentityModel.Tokens.Jwt.Tests.csproj b/test/System.IdentityModel.Tokens.Jwt.Tests/System.IdentityModel.Tokens.Jwt.Tests.csproj index 55c2caee3c..c82434ad63 100644 --- a/test/System.IdentityModel.Tokens.Jwt.Tests/System.IdentityModel.Tokens.Jwt.Tests.csproj +++ b/test/System.IdentityModel.Tokens.Jwt.Tests/System.IdentityModel.Tokens.Jwt.Tests.csproj @@ -22,9 +22,8 @@ - - +