diff --git a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch index 2874b8d70c..e2cd88e7c7 100644 --- a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch +++ b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch @@ -1,10 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eric Erhardt -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 +- @@ -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 @@ - +@@ -35,7 +35,7 @@ + + + +- true ++ false + 7.0.0 + -- - - - -@@ -43,9 +42,5 @@ +@@ -47,9 +47,5 @@ $(NoWarn);SYSLIB0050 $(NoWarn);SYSLIB0051 @@ -80,7 +82,7 @@ index f020b59b..934aae74 100644 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 @@ @@ -89,8 +91,8 @@ index 8920a438..1cf387b1 100644 3.5.0-rc-1285 - net461,netstandard2.0 + netstandard2.0 - 7.0.0 - + 7.0.3 + preview diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj index f7a11afe..4a87af91 100644 diff --git a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch index 46681b3b02..1841ecfc94 100644 --- a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch +++ b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch @@ -18,8 +18,8 @@ index abbcfac6..2c6a119e 100755 -commitSha=$(git rev-parse HEAD) - - assemblyVersion=$(sed -n 's/.*\([^<]*\)<.*/\1/p' $PWD/buildConfiguration.xml) - assemblyFileVersion="$assemblyVersion.${dateTimeStamp::-6}" # Trim minutes/seconds + assemblyVersion=$(sed -n 's/.*\([^<]*\)<.*/\1/p' ${scriptroot}/buildConfiguration.xml) + assemblyFileVersion="$assemblyVersion.${dateTimeStamp::$((${#dateTimeStamp} - 6))}" # Trim minutes/seconds -assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp.$commitSha" +assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp" diff --git a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj index 72306007d9..229298066e 100644 --- a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj +++ b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj @@ -18,7 +18,7 @@ $(BuildCommandArgs) /p:Configuration=$(Configuration) $(BuildCommandArgs) /v:$(LogVerbosity) $(BuildCommandArgs) $(RedirectRepoOutputToLog) - $(BuildCommandArgs) /p:Version=7.0.0 + $(BuildCommandArgs) /p:Version=7.0.3 $(BuildCommandArgs) --output $(ProjectDirectory)pack diff --git a/src/azure-activedirectory-identitymodel-extensions-for-dotnet b/src/azure-activedirectory-identitymodel-extensions-for-dotnet index bf4cb251a8..bb354ceabe 160000 --- a/src/azure-activedirectory-identitymodel-extensions-for-dotnet +++ b/src/azure-activedirectory-identitymodel-extensions-for-dotnet @@ -1 +1 @@ -Subproject commit bf4cb251a85f1b27bbb208c703f6f3105bdb24ca +Subproject commit bb354ceabed19189245e075abb864f327b6c14ad