diff --git a/eng/Versions.props b/eng/Versions.props index daa0a6d327..86d051f1ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 2.0.3 - 7.1.2 + 7.4.1 20230414.1 2.14.1 1.6.10 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 41bf255a6b..2d871e8b3b 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 @@ -22,10 +22,10 @@ Subject: [PATCH] fix for source build 15 files changed, 8 insertions(+), 89 deletions(-) diff --git a/build/common.props b/build/common.props -index 9f99de11..143d8509 100644 +index 7f22eb03..ec229fc2 100644 --- a/build/common.props +++ b/build/common.props -@@ -35,7 +35,7 @@ +@@ -46,7 +46,7 @@ @@ -34,12 +34,12 @@ index 9f99de11..143d8509 100644 7.0.0 -@@ -47,9 +47,5 @@ +@@ -58,9 +58,5 @@ $(NoWarn);SYSLIB0050 $(NoWarn);SYSLIB0051 - -- +- - - @@ -68,21 +68,21 @@ index 23e1b910..254f709e 100644 diff --git a/build/targets.props b/build/targets.props -index f020b59b..934aae74 100644 +index eb2d3523..e9cde8f0 100644 --- a/build/targets.props +++ b/build/targets.props @@ -1,7 +1,7 @@ -- net461;net462;net472;netstandard2.0;net6.0;net8.0 -- net461;net462;net472;netstandard2.0;net6.0 -+ netstandard2.0;net6.0;net8.0 -+ netstandard2.0;net6.0 +- net461;net462;net472;netstandard2.0;net6.0;net8.0 +- net461;netstandard2.0;net8.0 ++ netstandard2.0;net6.0;net8.0 ++ netstandard2.0;net6.0 netstandard2.0 diff --git a/buildConfiguration.xml b/buildConfiguration.xml -index 83cd80e1..868c5395 100644 +index 06e064da..e6bb5701 100644 --- a/buildConfiguration.xml +++ b/buildConfiguration.xml @@ -1,7 +1,7 @@ @@ -91,9 +91,9 @@ index 83cd80e1..868c5395 100644 3.5.0-rc-1285 - net461,netstandard2.0 + netstandard2.0 - 7.1.2 - 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 --- a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj @@ -183,7 +183,7 @@ index 0e283fce..d599a4b1 100644 diff --git a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj -index 87d7a90f..00357f8c 100644 +index b0cdcc2e..7f0bb67d 100644 --- a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj +++ b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj @@ -15,13 +15,6 @@ @@ -198,8 +198,8 @@ index 87d7a90f..00357f8c 100644 - - - + diff --git a/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj b/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj index 8859880f..0deb3a3a 100644 --- a/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj 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 deleted file mode 100644 index 1841ecfc94..0000000000 --- a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 30 Aug 2023 09:10:55 -0500 -Subject: [PATCH] Remove commit SHA from version string - -Needs https://github.com/dotnet/source-build/issues/3573 ---- - updateAssemblyInfo.sh | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/updateAssemblyInfo.sh b/updateAssemblyInfo.sh -index abbcfac6..2c6a119e 100755 ---- a/updateAssemblyInfo.sh -+++ b/updateAssemblyInfo.sh -@@ -9,11 +9,9 @@ date=$(date '+%y%m%d%H%M%S') - # Formats the date by replacing the 4-digit year with a 2-digit value and then subtract 19 - dateTimeStamp=$(echo $((10#${date:0:2}-19)))${date:2} - --commitSha=$(git rev-parse HEAD) -- - assemblyVersion=$(sed -n 's/.*\([^<]*\)<.*/\1/p' ${scriptroot}/buildConfiguration.xml) - assemblyFileVersion="$assemblyVersion.${dateTimeStamp::$((${#dateTimeStamp} - 6))}" # Trim minutes/seconds --assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp.$commitSha" -+assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp" - - echo "assemblyVersion: $assemblyVersion" - echo "assemblyFileVersion: $assemblyFileVersion" diff --git a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj index f98b781e57..19ffb98a88 100644 --- a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj +++ b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj @@ -23,10 +23,6 @@ $(BuildCommandArgs) --output $(ProjectDirectory)pack - - -