Skip to content

Update azure-activedirectory-identitymodel-extensions-for-dotnet to 7.0.3 #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Update azure-activedirectory-identitymodel-extensions-for-dotnet to 7.0.3 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e04309e
Update azure-activedirectory-identitymodel-extensions-for-dotnet to 7…
eerhardt Oct 17, 2023
9073467
Fix updateAssemblyInfo patch
eerhardt Oct 17, 2023
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
30 changes: 16 additions & 14 deletions ...azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <[email protected]>
Date: Mon, 11 Sep 2023 11:09:12 -0500
Date: Tue, 17 Oct 2023 12:59:45 -0500
Subject: [PATCH] fix for source build

---
build/common.props | 5 -----
build/common.props | 6 +-----
build/dependencies.props | 8 ++++----
build/targets.props | 4 ++--
buildConfiguration.xml | 2 +-
Expand All @@ -19,20 +19,22 @@ Subject: [PATCH] fix for source build
.../Microsoft.IdentityModel.Validators.csproj | 7 -------
.../Microsoft.IdentityModel.Xml.csproj | 7 -------
.../System.IdentityModel.Tokens.Jwt.csproj | 7 -------
15 files changed, 7 insertions(+), 89 deletions(-)
15 files changed, 8 insertions(+), 89 deletions(-)

diff --git a/build/common.props b/build/common.props
index 001d7daa..77c12525 100644
index 9f99de11..143d8509 100644
--- a/build/common.props
+++ b/build/common.props
@@ -1,6 +1,5 @@
<Project>
@@ -35,7 +35,7 @@
</PropertyGroup>

<PropertyGroup>
- <EnablePackageValidation>true</EnablePackageValidation>
+ <EnablePackageValidation>false</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
</PropertyGroup>

- <Import Project="apiCompat.props" />
<Import Project="dependencies.props" />
<Import Project="targets.props" />
<Import Project="version.props" />
@@ -43,9 +42,5 @@
@@ -47,9 +47,5 @@
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
</PropertyGroup>
Expand Down Expand Up @@ -80,7 +82,7 @@ index f020b59b..934aae74 100644
</PropertyGroup>
</Project>
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
index 8920a438..1cf387b1 100644
index 83cd80e1..868c5395 100644
--- a/buildConfiguration.xml
+++ b/buildConfiguration.xml
@@ -1,7 +1,7 @@
Expand All @@ -89,8 +91,8 @@ index 8920a438..1cf387b1 100644
<nugetVersion>3.5.0-rc-1285</nugetVersion>
- <runtimes>net461,netstandard2.0</runtimes>
+ <runtimes>netstandard2.0</runtimes>
<assemblyVersion>7.0.0</assemblyVersion>
<nugetSuffix></nugetSuffix>
<assemblyVersion>7.0.3</assemblyVersion>
<nugetSuffix>preview</nugetSuffix>
<projects>
diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
index f7a11afe..4a87af91 100644
Expand Down
4 changes: 2 additions & 2 deletions ...tory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ index abbcfac6..2c6a119e 100755

-commitSha=$(git rev-parse HEAD)
-
assemblyVersion=$(sed -n 's/.*<assemblyVersion>\([^<]*\)<.*/\1/p' $PWD/buildConfiguration.xml)
assemblyFileVersion="$assemblyVersion.${dateTimeStamp::-6}" # Trim minutes/seconds
assemblyVersion=$(sed -n 's/.*<assemblyVersion>\([^<]*\)<.*/\1/p' ${scriptroot}/buildConfiguration.xml)
assemblyFileVersion="$assemblyVersion.${dateTimeStamp::$((${#dateTimeStamp} - 6))}" # Trim minutes/seconds
-assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp.$commitSha"
+assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp"

Expand Down
2 changes: 1 addition & 1 deletion repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.0.0</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.0.3</BuildCommandArgs>

<PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/azure-activedirectory-identitymodel-extensions-for-dotnet
Open in desktop
Submodule azure-activedirectory-identitymodel-extensions-for-dotnet updated 66 files
+49 −0 .github/ISSUE_TEMPLATE/design_proposal.md
+1 −1 .github/workflows/dotnetcore.yml
+2 −0 .gitignore
+17 −1 CHANGELOG.md
+9 −0 Wilson.sln
+42 −0 benchmark/Microsoft.IdentityModel.Benchmarks/CreateJWETests.cs
+38 −0 benchmark/Microsoft.IdentityModel.Benchmarks/CreateSignedHttpRequestTests.cs
+6 −5 benchmark/Microsoft.IdentityModel.Benchmarks/CreateTokenTests.cs
+10 −1 benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj
+55 −0 benchmark/Microsoft.IdentityModel.Benchmarks/ValidateJWEAsyncTests.cs
+47 −0 benchmark/Microsoft.IdentityModel.Benchmarks/ValidateSignedHttpRequestAsyncTests.cs
+17 −16 benchmark/Microsoft.IdentityModel.Benchmarks/ValidateTokenAsyncTests.cs
+36 −3 benchmark/Microsoft.IdentityModel.Benchmarks/identitymodel.benchmarks.yml
+4 −29 build.ps1
+0 −49 build/apiCompat.props
+0 −224 build/apiCompat.ps1
+5 −1 build/common.props
+0 −4 build/commonTest.props
+0 −1 build/dependenciesTest.props
+1 −16 build/releaseBuild.yml
+2 −2 buildConfiguration.xml
+0 −70 generateContractAssemblies.ps1
+14 −3 src/Microsoft.IdentityModel.JsonWebTokens/Json/JsonClaimSet.cs
+7 −2 src/Microsoft.IdentityModel.JsonWebTokens/Json/JsonWebToken.PayloadClaimSet.cs
+12 −3 src/Microsoft.IdentityModel.JsonWebTokens/JsonWebToken.cs
+5 −0 src/Microsoft.IdentityModel.Logging/IdentityModelEventSource.cs
+47 −0 src/Microsoft.IdentityModel.Logging/LogHelper.cs
+58 −11 src/Microsoft.IdentityModel.Logging/SecurityArtifact.cs
+11 −1 src/Microsoft.IdentityModel.Protocols.OpenIdConnect/OpenIdConnectMessage.cs
+5 −1 src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/SignedHttpRequestHandler.cs
+1 −0 src/Microsoft.IdentityModel.TestExtensions/Microsoft.IdentityModel.TestExtensions.csproj
+3 −1 src/Microsoft.IdentityModel.Tokens.Saml/Saml/SamlSecurityTokenHandler.cs
+3 −1 src/Microsoft.IdentityModel.Tokens.Saml/Saml2/Saml2SecurityTokenHandler.cs
+15 −9 src/Microsoft.IdentityModel.Tokens/CryptoProviderFactory.cs
+1 −1 src/Microsoft.IdentityModel.Tokens/TokenValidationParameters.cs
+9 −2 src/Microsoft.IdentityModel.Tokens/Validators.cs
+4 −1 src/Microsoft.IdentityModel.Validators/AadIssuerValidator/AadIssuerValidator.cs
+17 −0 src/Microsoft.IdentityModel.Xml/DelegatingXmlDictionaryReader.cs
+202 −90 src/Microsoft.IdentityModel.Xml/DsigSerializer.cs
+10 −8 src/Microsoft.IdentityModel.Xml/Reference.cs
+15 −0 src/System.IdentityModel.Tokens.Jwt/JwtPayload.cs
+1 −0 test/Microsoft.IdentityModel.AotCompatibility.Tests/Microsoft.IdentityModel.AotCompatibility.Tests.csproj
+23 −18 test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs
+231 −5 test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenTests.cs
+36 −9 test/Microsoft.IdentityModel.JsonWebTokens.Tests/JwtTokenUtilitiesTests.cs
+456 −0 test/Microsoft.IdentityModel.Logging.Tests/LogHelperTests.cs
+72 −7 test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/ConfigurationManagerTests.cs
+3 −0 test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConfigData.cs
+0 −2 test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationRetrieverTests.cs
+93 −22 test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs
+2 −0 test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/Properties/AssemblyInfo.cs
+25 −0 test/Microsoft.IdentityModel.TestUtils/Default.cs
+6 −0 test/Microsoft.IdentityModel.TestUtils/ExpectedException.cs
+12 −0 test/Microsoft.IdentityModel.TestUtils/XmlUtilities.cs
+18 −20 test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs
+11 −1 test/Microsoft.IdentityModel.Tokens.Tests/Json/JsonUtilities.cs
+14 −9 test/Microsoft.IdentityModel.Tokens.Tests/ReferenceTests.cs
+23 −25 test/Microsoft.IdentityModel.Tokens.Tests/SignatureProviderTests.cs
+22 −0 test/Microsoft.IdentityModel.Validators.Tests/MicrosoftIdentityIssuerValidatorTest.cs
+3 −3 test/Microsoft.IdentityModel.Validators.Tests/ValidatorConstants.cs
+69 −0 test/Microsoft.IdentityModel.Xml.Tests/DelegatingXmlDictionaryReaderTests.cs
+21 −0 test/Microsoft.IdentityModel.Xml.Tests/ReferenceTests.cs
+4 −4 test/System.IdentityModel.Tokens.Jwt.Tests/JwtPayloadTest.cs
+25 −0 test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenTests.cs
+1 −3 updateAssemblyInfo.ps1
+6 −6 updateAssemblyInfo.sh