Skip to content

Commit 54ad220

Browse files
authored
Update azure-activedirectory-identitymodel-extensions-for-dotnet to 7.0.3 (#228)
1 parent 7465c94 commit 54ad220

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Eric Erhardt <[email protected]>
3-
Date: Mon, 11 Sep 2023 11:09:12 -0500
3+
Date: Tue, 17 Oct 2023 12:59:45 -0500
44
Subject: [PATCH] fix for source build
55

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

2424
diff --git a/build/common.props b/build/common.props
25-
index 001d7daa..77c12525 100644
25+
index 9f99de11..143d8509 100644
2626
--- a/build/common.props
2727
+++ b/build/common.props
28-
@@ -1,6 +1,5 @@
29-
<Project>
28+
@@ -35,7 +35,7 @@
29+
</PropertyGroup>
30+
31+
<PropertyGroup>
32+
- <EnablePackageValidation>true</EnablePackageValidation>
33+
+ <EnablePackageValidation>false</EnablePackageValidation>
34+
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
35+
</PropertyGroup>
3036

31-
- <Import Project="apiCompat.props" />
32-
<Import Project="dependencies.props" />
33-
<Import Project="targets.props" />
34-
<Import Project="version.props" />
35-
@@ -43,9 +42,5 @@
37+
@@ -47,9 +47,5 @@
3638
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
3739
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
3840
</PropertyGroup>
@@ -80,7 +82,7 @@ index f020b59b..934aae74 100644
8082
</PropertyGroup>
8183
</Project>
8284
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
83-
index 8920a438..1cf387b1 100644
85+
index 83cd80e1..868c5395 100644
8486
--- a/buildConfiguration.xml
8587
+++ b/buildConfiguration.xml
8688
@@ -1,7 +1,7 @@
@@ -89,8 +91,8 @@ index 8920a438..1cf387b1 100644
8991
<nugetVersion>3.5.0-rc-1285</nugetVersion>
9092
- <runtimes>net461,netstandard2.0</runtimes>
9193
+ <runtimes>netstandard2.0</runtimes>
92-
<assemblyVersion>7.0.0</assemblyVersion>
93-
<nugetSuffix></nugetSuffix>
94+
<assemblyVersion>7.0.3</assemblyVersion>
95+
<nugetSuffix>preview</nugetSuffix>
9496
<projects>
9597
diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
9698
index f7a11afe..4a87af91 100644

patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ index abbcfac6..2c6a119e 100755
1818

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

repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1919
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
2020
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
21-
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.0.0</BuildCommandArgs>
21+
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.0.3</BuildCommandArgs>
2222

2323
<PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
2424
</PropertyGroup>

0 commit comments

Comments
 (0)