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 2d871e8b3b..d62ccc8749 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: Tue, 17 Oct 2023 12:59:45 -0500 +From 51e27d293855e73956fd6ced787308c6994305ca Mon Sep 17 00:00:00 2001 +From: Stephen Halter +Date: Wed, 19 Jun 2024 16:34:01 -0700 Subject: [PATCH] fix for source build --- - build/common.props | 6 +----- + build/common.props | 1 - build/dependencies.props | 8 ++++---- build/targets.props | 4 ++-- buildConfiguration.xml | 2 +- @@ -19,39 +19,28 @@ 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, 8 insertions(+), 89 deletions(-) + 15 files changed, 7 insertions(+), 85 deletions(-) diff --git a/build/common.props b/build/common.props -index 7f22eb03..ec229fc2 100644 +index efd7e90e..05f908ef 100644 --- a/build/common.props +++ b/build/common.props -@@ -46,7 +46,7 @@ - - - -- true -+ false - 7.0.0 - - -@@ -58,9 +58,5 @@ - $(NoWarn);SYSLIB0050 - $(NoWarn);SYSLIB0051 - -- -- +@@ -62,7 +62,6 @@ + + + - -- + diff --git a/build/dependencies.props b/build/dependencies.props -index 23e1b910..254f709e 100644 +index 8203da57..2ac3eee7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props -@@ -4,14 +4,14 @@ +@@ -2,14 +2,14 @@ + + 2.1.1 - 3.0.5 - 1.0.3 - 4.5.0 + 4.7.0 1.0.0 @@ -68,21 +57,21 @@ index 23e1b910..254f709e 100644 diff --git a/build/targets.props b/build/targets.props -index eb2d3523..e9cde8f0 100644 +index 6f92780d..7b7225aa 100644 --- a/build/targets.props +++ b/build/targets.props @@ -1,7 +1,7 @@ -- net461;net462;net472;netstandard2.0;net6.0;net8.0 -- net461;netstandard2.0;net8.0 +- net462;net472;netstandard2.0;net6.0;net8.0 +- netstandard2.0;net8.0 + netstandard2.0;net6.0;net8.0 + netstandard2.0;net6.0 + $(SrcTargets);net9.0 netstandard2.0 - diff --git a/buildConfiguration.xml b/buildConfiguration.xml -index 06e064da..e6bb5701 100644 +index 0abda703..7c0862e5 100644 --- a/buildConfiguration.xml +++ b/buildConfiguration.xml @@ -1,7 +1,7 @@ @@ -111,7 +100,7 @@ index f7a11afe..4a87af91 100644 - diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj -index 52e979fe..5198986f 100644 +index ac4f4bc0..d7262c1d 100644 --- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj +++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj @@ -16,13 +16,6 @@ @@ -271,7 +260,7 @@ index 5131f40a..a3670b9d 100644 diff --git a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj -index 0e589c35..25d1ddb0 100644 +index bbb9ef2c..448ece2d 100644 --- a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj +++ b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj @@ -15,13 +15,6 @@ @@ -288,3 +277,6 @@ index 0e589c35..25d1ddb0 100644 +-- +2.34.1 + diff --git a/src/azure-activedirectory-identitymodel-extensions-for-dotnet b/src/azure-activedirectory-identitymodel-extensions-for-dotnet index c1c24e29d5..caf123fb47 160000 --- a/src/azure-activedirectory-identitymodel-extensions-for-dotnet +++ b/src/azure-activedirectory-identitymodel-extensions-for-dotnet @@ -1 +1 @@ -Subproject commit c1c24e29d5eeac2a2cd53fe0b5656924bdb69e3d +Subproject commit caf123fb476d29f61ef79ee58d6583e0a155bbd6