From 11addec2694a548bc8ca3a775dd75cf0d6fb165c Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 18 Mar 2024 12:41:21 -0700
Subject: [PATCH 1/6] Update IdentityModel to 7.4.1

---
 eng/Versions.props                                              | 2 +-
 .../0001-fix-for-source-build.patch                             | 2 +-
 src/azure-activedirectory-identitymodel-extensions-for-dotnet   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 @@
   </PropertyGroup>
   <PropertyGroup>
     <AbstractionsXunitReleaseVersion>2.0.3</AbstractionsXunitReleaseVersion>
-    <AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.1.2</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
+    <AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.4.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
     <CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
     <HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
     <MSBuildLocatorReleaseVersion>1.6.10</MSBuildLocatorReleaseVersion>
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..a654742e28 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
@@ -91,7 +91,7 @@ index 83cd80e1..868c5395 100644
    <nugetVersion>3.5.0-rc-1285</nugetVersion>
 -  <runtimes>net461,netstandard2.0</runtimes>
 +  <runtimes>netstandard2.0</runtimes>
-   <assemblyVersion>7.1.2</assemblyVersion>
+   <assemblyVersion>7.4.1</assemblyVersion>
    <nugetSuffix>preview</nugetSuffix>
    <projects>
 diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
diff --git a/src/azure-activedirectory-identitymodel-extensions-for-dotnet b/src/azure-activedirectory-identitymodel-extensions-for-dotnet
index a607fa5e00..c1c24e29d5 160000
--- a/src/azure-activedirectory-identitymodel-extensions-for-dotnet
+++ b/src/azure-activedirectory-identitymodel-extensions-for-dotnet
@@ -1 +1 @@
-Subproject commit a607fa5e0005a6178cf1d2fed4fa0f8179cdb186
+Subproject commit c1c24e29d5eeac2a2cd53fe0b5656924bdb69e3d

From ad81a261f39b07dd40171f18577435c132c91981 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 1 Apr 2024 10:47:12 -0700
Subject: [PATCH 2/6] Delete patches

---
 .../0001-fix-for-source-build.patch           | 290 ------------------
 ...emove-commit-SHA-from-version-string.patch |  27 --
 2 files changed, 317 deletions(-)
 delete mode 100644 patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
 delete mode 100644 patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch

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
deleted file mode 100644
index a654742e28..0000000000
--- a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Erhardt <eric.erhardt@microsoft.com>
-Date: Tue, 17 Oct 2023 12:59:45 -0500
-Subject: [PATCH] fix for source build
-
----
- build/common.props                                        | 6 +-----
- build/dependencies.props                                  | 8 ++++----
- build/targets.props                                       | 4 ++--
- buildConfiguration.xml                                    | 2 +-
- .../Microsoft.IdentityModel.Abstractions.csproj           | 7 -------
- .../Microsoft.IdentityModel.JsonWebTokens.csproj          | 7 -------
- .../Microsoft.IdentityModel.Logging.csproj                | 7 -------
- ...Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
- .../Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
- .../Microsoft.IdentityModel.Protocols.csproj              | 7 -------
- .../Microsoft.IdentityModel.Tokens.Saml.csproj            | 7 -------
- .../Microsoft.IdentityModel.Tokens.csproj                 | 7 -------
- .../Microsoft.IdentityModel.Validators.csproj             | 7 -------
- .../Microsoft.IdentityModel.Xml.csproj                    | 7 -------
- .../System.IdentityModel.Tokens.Jwt.csproj                | 7 -------
- 15 files changed, 8 insertions(+), 89 deletions(-)
-
-diff --git a/build/common.props b/build/common.props
-index 9f99de11..143d8509 100644
---- a/build/common.props
-+++ b/build/common.props
-@@ -35,7 +35,7 @@
-   </PropertyGroup>
- 
-   <PropertyGroup>
--    <EnablePackageValidation>true</EnablePackageValidation>
-+    <EnablePackageValidation>false</EnablePackageValidation>
-     <PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
-   </PropertyGroup>
- 
-@@ -47,9 +47,5 @@
-     <NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
-     <NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
-   </PropertyGroup>
--  
--  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
--    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
--  </ItemGroup>
- 
- </Project>
-diff --git a/build/dependencies.props b/build/dependencies.props
-index 23e1b910..254f709e 100644
---- a/build/dependencies.props
-+++ b/build/dependencies.props
-@@ -4,14 +4,14 @@
-     <AspNetCoreMinSupportedVersion>2.1.1</AspNetCoreMinSupportedVersion>
-     <MicrosoftAzureKeyVaultVersion>3.0.5</MicrosoftAzureKeyVaultVersion>
-     <MicrosoftAzureServicesAppAuthenticationVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationVersion>
--    <MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
-+    <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
-     <MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
-     <NetStandardVersion>2.0.3</NetStandardVersion>
-     <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
-     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
--    <SystemSecurityCryptographyCngVersion>4.5.0</SystemSecurityCryptographyCngVersion>
--    <SystemTextEncodingsWeb>4.7.2</SystemTextEncodingsWeb>
--    <SystemTextJson>4.7.2</SystemTextJson>
-+    <SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
-+    <SystemTextEncodingsWeb>7.0.0</SystemTextEncodingsWeb>
-+    <SystemTextJson>7.0.0</SystemTextJson>
-   </PropertyGroup>
- 
- </Project>
-diff --git a/build/targets.props b/build/targets.props
-index f020b59b..934aae74 100644
---- a/build/targets.props
-+++ b/build/targets.props
-@@ -1,7 +1,7 @@
- <Project>
-   <PropertyGroup>
--    <SrcTargets Condition="'$(TargetNet8)' == 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
--    <SrcTargets Condition="'$(TargetNet8)' != 'True'">net461;net462;net472;netstandard2.0;net6.0</SrcTargets>
-+    <SrcTargets Condition="'$(TargetNet8)' == 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
-+    <SrcTargets Condition="'$(TargetNet8)' != 'True'">netstandard2.0;net6.0</SrcTargets>
-     <SrcStandardTargets>netstandard2.0</SrcStandardTargets>
-   </PropertyGroup>
- </Project>
-diff --git a/buildConfiguration.xml b/buildConfiguration.xml
-index 83cd80e1..868c5395 100644
---- a/buildConfiguration.xml
-+++ b/buildConfiguration.xml
-@@ -1,7 +1,7 @@
- <root>
-   <dotnetArchitecture>x64</dotnetArchitecture>
-   <nugetVersion>3.5.0-rc-1285</nugetVersion>
--  <runtimes>net461,netstandard2.0</runtimes>
-+  <runtimes>netstandard2.0</runtimes>
-   <assemblyVersion>7.4.1</assemblyVersion>
-   <nugetSuffix>preview</nugetSuffix>
-   <projects>
-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
-+++ b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
-@@ -17,11 +17,4 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
- </Project>
-diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
-index 52e979fe..5198986f 100644
---- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
-+++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
-@@ -16,13 +16,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
-   </ItemGroup>
-diff --git a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
-index 60d18120..050a90d4 100644
---- a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
-+++ b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
-@@ -25,13 +25,6 @@
-     <Reference Include="System.Net.Http" />
-   </ItemGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
-   </ItemGroup>
-diff --git a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
-index f4ecd1f9..483a9770 100644
---- a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
-+++ b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
-@@ -15,13 +15,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
-     <ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
-diff --git a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
-index 0e283fce..d599a4b1 100644
---- a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
-+++ b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
-@@ -16,13 +16,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens.Saml\Microsoft.IdentityModel.Tokens.Saml.csproj" />
-diff --git a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
-index 87d7a90f..00357f8c 100644
---- a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
-+++ b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
-@@ -15,13 +15,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Logging\Microsoft.IdentityModel.Logging.csproj" />
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
-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
-+++ b/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj
-@@ -15,13 +15,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
-     <ProjectReference Include="..\Microsoft.IdentityModel.Xml\Microsoft.IdentityModel.Xml.csproj" />
-diff --git a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
-index 3536e2f1..92dd5f41 100644
---- a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
-+++ b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
-@@ -50,11 +50,4 @@
-     <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
-   </ItemGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
- </Project>
-diff --git a/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj b/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
-index 33067d0a..574a5f51 100644
---- a/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
-+++ b/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
-@@ -15,13 +15,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols.OpenIdConnect\Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj" />
-     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
-diff --git a/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj b/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
-index 5131f40a..a3670b9d 100644
---- a/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
-+++ b/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
-@@ -15,13 +15,6 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
-   </ItemGroup>
-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
---- 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 @@
-     <DebugSymbols>true</DebugSymbols>
-   </PropertyGroup>
- 
--  <ItemGroup>
--    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
--      <PrivateAssets>all</PrivateAssets>
--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--    </PackageReference>
--  </ItemGroup>
--
-   <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
-     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.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 <mthalman@microsoft.com>
-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/.*<assemblyVersion>\([^<]*\)<.*/\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"

From 37e9cd019eb1e53a0d7110d58e500c8ba6b05d03 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 1 Apr 2024 11:05:19 -0700
Subject: [PATCH 3/6] Revert "Delete patches"

This reverts commit ad81a261f39b07dd40171f18577435c132c91981.
---
 .../0001-fix-for-source-build.patch           | 290 ++++++++++++++++++
 ...emove-commit-SHA-from-version-string.patch |  27 ++
 2 files changed, 317 insertions(+)
 create mode 100644 patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
 create mode 100644 patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch

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
new file mode 100644
index 0000000000..a654742e28
--- /dev/null
+++ b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
@@ -0,0 +1,290 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Eric Erhardt <eric.erhardt@microsoft.com>
+Date: Tue, 17 Oct 2023 12:59:45 -0500
+Subject: [PATCH] fix for source build
+
+---
+ build/common.props                                        | 6 +-----
+ build/dependencies.props                                  | 8 ++++----
+ build/targets.props                                       | 4 ++--
+ buildConfiguration.xml                                    | 2 +-
+ .../Microsoft.IdentityModel.Abstractions.csproj           | 7 -------
+ .../Microsoft.IdentityModel.JsonWebTokens.csproj          | 7 -------
+ .../Microsoft.IdentityModel.Logging.csproj                | 7 -------
+ ...Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
+ .../Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
+ .../Microsoft.IdentityModel.Protocols.csproj              | 7 -------
+ .../Microsoft.IdentityModel.Tokens.Saml.csproj            | 7 -------
+ .../Microsoft.IdentityModel.Tokens.csproj                 | 7 -------
+ .../Microsoft.IdentityModel.Validators.csproj             | 7 -------
+ .../Microsoft.IdentityModel.Xml.csproj                    | 7 -------
+ .../System.IdentityModel.Tokens.Jwt.csproj                | 7 -------
+ 15 files changed, 8 insertions(+), 89 deletions(-)
+
+diff --git a/build/common.props b/build/common.props
+index 9f99de11..143d8509 100644
+--- a/build/common.props
++++ b/build/common.props
+@@ -35,7 +35,7 @@
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+-    <EnablePackageValidation>true</EnablePackageValidation>
++    <EnablePackageValidation>false</EnablePackageValidation>
+     <PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
+   </PropertyGroup>
+ 
+@@ -47,9 +47,5 @@
+     <NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
+     <NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
+   </PropertyGroup>
+-  
+-  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
+-  </ItemGroup>
+ 
+ </Project>
+diff --git a/build/dependencies.props b/build/dependencies.props
+index 23e1b910..254f709e 100644
+--- a/build/dependencies.props
++++ b/build/dependencies.props
+@@ -4,14 +4,14 @@
+     <AspNetCoreMinSupportedVersion>2.1.1</AspNetCoreMinSupportedVersion>
+     <MicrosoftAzureKeyVaultVersion>3.0.5</MicrosoftAzureKeyVaultVersion>
+     <MicrosoftAzureServicesAppAuthenticationVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationVersion>
+-    <MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
++    <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
+     <MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
+     <NetStandardVersion>2.0.3</NetStandardVersion>
+     <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
+     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
+-    <SystemSecurityCryptographyCngVersion>4.5.0</SystemSecurityCryptographyCngVersion>
+-    <SystemTextEncodingsWeb>4.7.2</SystemTextEncodingsWeb>
+-    <SystemTextJson>4.7.2</SystemTextJson>
++    <SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
++    <SystemTextEncodingsWeb>7.0.0</SystemTextEncodingsWeb>
++    <SystemTextJson>7.0.0</SystemTextJson>
+   </PropertyGroup>
+ 
+ </Project>
+diff --git a/build/targets.props b/build/targets.props
+index f020b59b..934aae74 100644
+--- a/build/targets.props
++++ b/build/targets.props
+@@ -1,7 +1,7 @@
+ <Project>
+   <PropertyGroup>
+-    <SrcTargets Condition="'$(TargetNet8)' == 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
+-    <SrcTargets Condition="'$(TargetNet8)' != 'True'">net461;net462;net472;netstandard2.0;net6.0</SrcTargets>
++    <SrcTargets Condition="'$(TargetNet8)' == 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
++    <SrcTargets Condition="'$(TargetNet8)' != 'True'">netstandard2.0;net6.0</SrcTargets>
+     <SrcStandardTargets>netstandard2.0</SrcStandardTargets>
+   </PropertyGroup>
+ </Project>
+diff --git a/buildConfiguration.xml b/buildConfiguration.xml
+index 83cd80e1..868c5395 100644
+--- a/buildConfiguration.xml
++++ b/buildConfiguration.xml
+@@ -1,7 +1,7 @@
+ <root>
+   <dotnetArchitecture>x64</dotnetArchitecture>
+   <nugetVersion>3.5.0-rc-1285</nugetVersion>
+-  <runtimes>net461,netstandard2.0</runtimes>
++  <runtimes>netstandard2.0</runtimes>
+   <assemblyVersion>7.4.1</assemblyVersion>
+   <nugetSuffix>preview</nugetSuffix>
+   <projects>
+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
++++ b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
+@@ -17,11 +17,4 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+ </Project>
+diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
+index 52e979fe..5198986f 100644
+--- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
++++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
+@@ -16,13 +16,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
+   </ItemGroup>
+diff --git a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
+index 60d18120..050a90d4 100644
+--- a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
++++ b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
+@@ -25,13 +25,6 @@
+     <Reference Include="System.Net.Http" />
+   </ItemGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
+   </ItemGroup>
+diff --git a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
+index f4ecd1f9..483a9770 100644
+--- a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
++++ b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
+@@ -15,13 +15,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
+     <ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
+diff --git a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
+index 0e283fce..d599a4b1 100644
+--- a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
++++ b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
+@@ -16,13 +16,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens.Saml\Microsoft.IdentityModel.Tokens.Saml.csproj" />
+diff --git a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
+index 87d7a90f..00357f8c 100644
+--- a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
++++ b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
+@@ -15,13 +15,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Logging\Microsoft.IdentityModel.Logging.csproj" />
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
+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
++++ b/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj
+@@ -15,13 +15,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
+     <ProjectReference Include="..\Microsoft.IdentityModel.Xml\Microsoft.IdentityModel.Xml.csproj" />
+diff --git a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
+index 3536e2f1..92dd5f41 100644
+--- a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
++++ b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
+@@ -50,11 +50,4 @@
+     <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
+   </ItemGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+ </Project>
+diff --git a/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj b/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
+index 33067d0a..574a5f51 100644
+--- a/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
++++ b/src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
+@@ -15,13 +15,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols.OpenIdConnect\Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj" />
+     <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
+diff --git a/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj b/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
+index 5131f40a..a3670b9d 100644
+--- a/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
++++ b/src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj
+@@ -15,13 +15,6 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
+   </ItemGroup>
+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
+--- 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 @@
+     <DebugSymbols>true</DebugSymbols>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+-    </PackageReference>
+-  </ItemGroup>
+-
+   <ItemGroup>
+     <ProjectReference Include="..\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
+     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.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
new file mode 100644
index 0000000000..1841ecfc94
--- /dev/null
+++ b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+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/.*<assemblyVersion>\([^<]*\)<.*/\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"

From 63516194d2be8ba06bef582cef4f92c10fed67ab Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 1 Apr 2024 11:12:18 -0700
Subject: [PATCH 4/6] Remove AssemblyInfo.sh patch

---
 ...emove-commit-SHA-from-version-string.patch | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Remove-commit-SHA-from-version-string.patch

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 <mthalman@microsoft.com>
-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/.*<assemblyVersion>\([^<]*\)<.*/\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"

From 2b4efb2e20d783174ab63629b4d89b94fc877896 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 1 Apr 2024 11:41:22 -0700
Subject: [PATCH 5/6] Try this

---
 .../0001-fix-for-source-build.patch           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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 a654742e28..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 @@
    </PropertyGroup>
  
    <PropertyGroup>
@@ -34,12 +34,12 @@ index 9f99de11..143d8509 100644
      <PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
    </PropertyGroup>
  
-@@ -47,9 +47,5 @@
+@@ -58,9 +58,5 @@
      <NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
      <NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
    </PropertyGroup>
 -  
--  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+-  <ItemGroup>
 -    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
 -  </ItemGroup>
  
@@ -68,21 +68,21 @@ index 23e1b910..254f709e 100644
  
  </Project>
 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 @@
  <Project>
    <PropertyGroup>
--    <SrcTargets Condition="'$(TargetNet8)' == 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
--    <SrcTargets Condition="'$(TargetNet8)' != 'True'">net461;net462;net472;netstandard2.0;net6.0</SrcTargets>
-+    <SrcTargets Condition="'$(TargetNet8)' == 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
-+    <SrcTargets Condition="'$(TargetNet8)' != 'True'">netstandard2.0;net6.0</SrcTargets>
+-    <SrcTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
+-    <SrcTargets Condition="'$(LocalBuild)' == 'True'">net461;netstandard2.0;net8.0</SrcTargets>
++    <SrcTargets Condition="'$(LocalBuild)' != 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
++    <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net6.0</SrcTargets>
      <SrcStandardTargets>netstandard2.0</SrcStandardTargets>
    </PropertyGroup>
  </Project>
 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
    <nugetVersion>3.5.0-rc-1285</nugetVersion>
 -  <runtimes>net461,netstandard2.0</runtimes>
 +  <runtimes>netstandard2.0</runtimes>
-   <assemblyVersion>7.4.1</assemblyVersion>
-   <nugetSuffix>preview</nugetSuffix>
    <projects>
+     <src>
+       <project name="Microsoft.IdentityModel.Logging" />
 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
      <ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
      <ProjectReference Include="..\Microsoft.IdentityModel.Tokens.Saml\Microsoft.IdentityModel.Tokens.Saml.csproj" />
 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
 -  </ItemGroup>
 -
    <ItemGroup>
-     <ProjectReference Include="..\Microsoft.IdentityModel.Logging\Microsoft.IdentityModel.Logging.csproj" />
      <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
+   </ItemGroup>
 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

From 038373d21435ab343175a2e80665d189c2983640 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 1 Apr 2024 11:45:48 -0700
Subject: [PATCH 6/6] No more UpdateAssemblyInfo

---
 ...e-activedirectory-identitymodel-extensions-for-dotnet.proj | 4 ----
 1 file changed, 4 deletions(-)

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 @@
       <PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
     </PropertyGroup>
 
-    <!-- Update project assembly info (see https://github.com/dotnet/source-build/issues/3565).
-         The script being executed is being injected into the repo via a patch. -->
-    <Exec Command="./updateAssemblyInfo.sh" WorkingDirectory="$(ProjectDirectory)" IgnoreStandardErrorWarningFormat="true" />
-
     <Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(SystemIdentityModelTokensJwtProject) $(BuildCommandArgs)"
           EnvironmentVariables="@(EnvironmentVariables)"
           WorkingDirectory="$(ProjectDirectory)"