Skip to content

Commit 5614b3f

Browse files
authored
Update IdentityModel to 8.0.0-preview1 (#328)
* Update identityModel submodule * Apply new patch * Fix * Fix patch again
1 parent 1971ba5 commit 5614b3f

File tree

3 files changed

+64
-36
lines changed

3 files changed

+64
-36
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111
<PropertyGroup>
1212
<AbstractionsXunitReleaseVersion>2.0.3</AbstractionsXunitReleaseVersion>
13-
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.4.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
13+
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>8.0.0-preview1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
1414
<CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
1515
<HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
1616
<MSBuildLocatorReleaseVersion>1.6.10</MSBuildLocatorReleaseVersion>

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

Lines changed: 62 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,51 @@
1-
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2-
From: Eric Erhardt <eric.erhardt@microsoft.com>
3-
Date: Tue, 17 Oct 2023 12:59:45 -0500
1+
From dabe0a7a30cf4476569c5928f2fd3a6d0ca1876f Mon Sep 17 00:00:00 2001
2+
From: wtgodbe <wigodbe@microsoft.com>
3+
Date: Wed, 19 Jun 2024 14:48:44 -0700
44
Subject: [PATCH] fix for source build
55

66
---
7-
build/common.props | 6 +-----
7+
build/common.props | 6 ------
88
build/dependencies.props | 8 ++++----
9-
build/targets.props | 4 ++--
9+
build/targets.props | 2 +-
1010
buildConfiguration.xml | 2 +-
1111
.../Microsoft.IdentityModel.Abstractions.csproj | 7 -------
1212
.../Microsoft.IdentityModel.JsonWebTokens.csproj | 7 -------
1313
.../Microsoft.IdentityModel.Logging.csproj | 7 -------
14+
.../Microsoft.IdentityModel.LoggingExtensions.csproj | 7 -------
1415
...Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
16+
...osoft.IdentityModel.Protocols.SignedHttpRequest.csproj | 7 -------
1517
.../Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
1618
.../Microsoft.IdentityModel.Protocols.csproj | 7 -------
1719
.../Microsoft.IdentityModel.Tokens.Saml.csproj | 7 -------
1820
.../Microsoft.IdentityModel.Tokens.csproj | 7 -------
1921
.../Microsoft.IdentityModel.Validators.csproj | 7 -------
2022
.../Microsoft.IdentityModel.Xml.csproj | 7 -------
2123
.../System.IdentityModel.Tokens.Jwt.csproj | 7 -------
22-
15 files changed, 8 insertions(+), 89 deletions(-)
24+
17 files changed, 6 insertions(+), 98 deletions(-)
2325

2426
diff --git a/build/common.props b/build/common.props
25-
index 7f22eb03..ec229fc2 100644
27+
index efd7e90e..05f908ef 100644
2628
--- a/build/common.props
2729
+++ b/build/common.props
28-
@@ -46,7 +46,7 @@
29-
</PropertyGroup>
30-
31-
<PropertyGroup>
32-
- <EnablePackageValidation>true</EnablePackageValidation>
33-
+ <EnablePackageValidation>false</EnablePackageValidation>
34-
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
35-
</PropertyGroup>
36-
37-
@@ -58,9 +58,5 @@
38-
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
30+
@@ -59,10 +59,4 @@
3931
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
4032
</PropertyGroup>
41-
-
33+
4234
- <ItemGroup>
35+
- <!-- Protects against sync-over-async: https://github.com/microsoft/vs-threading/blob/main/doc/analyzers/index.md. -->
36+
- <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" PrivateAssets="all" />
4337
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
4438
- </ItemGroup>
45-
39+
-
4640
</Project>
4741
diff --git a/build/dependencies.props b/build/dependencies.props
48-
index 23e1b910..254f709e 100644
42+
index 8203da57..2ac3eee7 100644
4943
--- a/build/dependencies.props
5044
+++ b/build/dependencies.props
51-
@@ -4,14 +4,14 @@
45+
@@ -2,14 +2,14 @@
46+
47+
<PropertyGroup>
5248
<AspNetCoreMinSupportedVersion>2.1.1</AspNetCoreMinSupportedVersion>
53-
<MicrosoftAzureKeyVaultVersion>3.0.5</MicrosoftAzureKeyVaultVersion>
54-
<MicrosoftAzureServicesAppAuthenticationVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationVersion>
5549
- <MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
5650
+ <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
5751
<MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
@@ -68,21 +62,19 @@ index 23e1b910..254f709e 100644
6862

6963
</Project>
7064
diff --git a/build/targets.props b/build/targets.props
71-
index eb2d3523..e9cde8f0 100644
65+
index 6f92780d..1c48acfb 100644
7266
--- a/build/targets.props
7367
+++ b/build/targets.props
74-
@@ -1,7 +1,7 @@
68+
@@ -1,6 +1,6 @@
7569
<Project>
7670
<PropertyGroup>
77-
- <SrcTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
78-
- <SrcTargets Condition="'$(LocalBuild)' == 'True'">net461;netstandard2.0;net8.0</SrcTargets>
71+
- <SrcTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
7972
+ <SrcTargets Condition="'$(LocalBuild)' != 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
80-
+ <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net6.0</SrcTargets>
73+
<SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0</SrcTargets>
74+
<SrcTargets Condition="'$(TargetNet9)' == 'True'">$(SrcTargets);net9.0</SrcTargets>
8175
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
82-
</PropertyGroup>
83-
</Project>
8476
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
85-
index 06e064da..e6bb5701 100644
77+
index 0abda703..7c0862e5 100644
8678
--- a/buildConfiguration.xml
8779
+++ b/buildConfiguration.xml
8880
@@ -1,7 +1,7 @@
@@ -111,7 +103,7 @@ index f7a11afe..4a87af91 100644
111103
-
112104
</Project>
113105
diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
114-
index 52e979fe..5198986f 100644
106+
index ac4f4bc0..d7262c1d 100644
115107
--- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
116108
+++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
117109
@@ -16,13 +16,6 @@
@@ -136,6 +128,24 @@ index 60d18120..050a90d4 100644
136128
<Reference Include="System.Net.Http" />
137129
</ItemGroup>
138130

131+
- <ItemGroup>
132+
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
133+
- <PrivateAssets>all</PrivateAssets>
134+
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
135+
- </PackageReference>
136+
- </ItemGroup>
137+
-
138+
<ItemGroup>
139+
<ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
140+
</ItemGroup>
141+
diff --git a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
142+
index 08c93085..f91d554a 100644
143+
--- a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
144+
+++ b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
145+
@@ -17,13 +17,6 @@
146+
<DebugSymbols>true</DebugSymbols>
147+
</PropertyGroup>
148+
139149
- <ItemGroup>
140150
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
141151
- <PrivateAssets>all</PrivateAssets>
@@ -164,6 +174,24 @@ index f4ecd1f9..483a9770 100644
164174
<ItemGroup>
165175
<ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
166176
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
177+
diff --git a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
178+
index b7e2b4cb..aa494441 100644
179+
--- a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
180+
+++ b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
181+
@@ -15,13 +15,6 @@
182+
<DebugSymbols>true</DebugSymbols>
183+
</PropertyGroup>
184+
185+
- <ItemGroup>
186+
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
187+
- <PrivateAssets>all</PrivateAssets>
188+
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
189+
- </PackageReference>
190+
- </ItemGroup>
191+
-
192+
<ItemGroup>
193+
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
194+
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
167195
diff --git a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
168196
index 0e283fce..d599a4b1 100644
169197
--- a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
@@ -271,7 +299,7 @@ index 5131f40a..a3670b9d 100644
271299
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
272300
</ItemGroup>
273301
diff --git a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
274-
index 0e589c35..25d1ddb0 100644
302+
index bbb9ef2c..448ece2d 100644
275303
--- a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
276304
+++ b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
277305
@@ -15,13 +15,6 @@

0 commit comments

Comments
 (0)