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 030adaac59..4c5083bcc3 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,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eric Erhardt -Date: Mon, 21 Aug 2023 10:22:54 -0500 +Date: Tue, 29 Aug 2023 18:17:01 -0500 Subject: [PATCH] fix for source build --- @@ -22,7 +22,7 @@ Subject: [PATCH] fix for source build 15 files changed, 7 insertions(+), 89 deletions(-) diff --git a/build/common.props b/build/common.props -index 001d7daa..77c12525 100644 +index 001d7daa..0f87f8b6 100644 --- a/build/common.props +++ b/build/common.props @@ -1,6 +1,5 @@ @@ -32,15 +32,14 @@ index 001d7daa..77c12525 100644 -@@ -43,9 +42,5 @@ - $(NoWarn);SYSLIB0050 +@@ -44,8 +43,4 @@ $(NoWarn);SYSLIB0051 -- + - - - - +- diff --git a/build/dependencies.props b/build/dependencies.props index 23e1b910..254f709e 100644 @@ -80,7 +79,7 @@ index f020b59b..934aae74 100644 diff --git a/buildConfiguration.xml b/buildConfiguration.xml -index fec54d4a..fd742ca4 100644 +index 80088c70..e2392c02 100644 --- a/buildConfiguration.xml +++ b/buildConfiguration.xml @@ -1,7 +1,7 @@ @@ -90,10 +89,10 @@ index fec54d4a..fd742ca4 100644 - net461,netstandard2.0 + netstandard2.0 7.0.0 - preview3 + preview4 diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj -index b804ef69..0743d558 100644 +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 @@ @@ -127,7 +126,7 @@ index 52e979fe..5198986f 100644 diff --git a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj -index e0a1d69d..1bead8a7 100644 +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 @@ diff --git a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Add-updateAssemblyInfo-bash-script.patch b/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Add-updateAssemblyInfo-bash-script.patch deleted file mode 100644 index a2f239c9ff..0000000000 --- a/patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0002-Add-updateAssemblyInfo-bash-script.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 9 Aug 2023 14:54:03 -0500 -Subject: [PATCH] Add updateAssemblyInfo bash script - -Backport: https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/pull/2211 ---- - updateAssemblyInfo.sh | 46 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 46 insertions(+) - create mode 100755 updateAssemblyInfo.sh - -diff --git a/updateAssemblyInfo.sh b/updateAssemblyInfo.sh -new file mode 100755 -index 00000000..39173e2c ---- /dev/null -+++ b/updateAssemblyInfo.sh -@@ -0,0 +1,46 @@ -+#!/bin/bash -+set -euo pipefail -+ -+# This script is converted from PowerShell at: -+# https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/620be62dda649d4c63e88ec9ae994a12cf54c707/updateAssemblyInfo.ps1 -+ -+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} -+ -+assemblyVersion=$(sed -n 's/.*\([^<]*\)<.*/\1/p' $PWD/buildConfiguration.xml) -+assemblyFileVersion="$assemblyVersion.${dateTimeStamp::-6}" # Trim the time portion of the date/time -+ -+# TODO: The commit SHA needs to be appended to the end of this version (see https://github.com/dotnet/source-build/issues/3573) -+assemblyInformationalVersion="$assemblyVersion.$dateTimeStamp" -+ -+echo "assemblyVersion: $assemblyVersion" -+echo "assemblyFileVersion: $assemblyFileVersion" -+echo "assemblyInformationalVersion: $assemblyInformationalVersion" -+ -+nugetSuffix=$(sed -n 's/.*\([^<]*\)<.*/\1/p' $PWD/buildConfiguration.xml) -+versionSuffix="" -+ -+echo "nugetSuffix: $nugetSuffix" -+ -+versionPath="$PWD/build/version.props" -+version=$(cat $versionPath) -+version=$(echo "$version" | sed "s|.*|$assemblyVersion|") -+version=$(echo "$version" | sed "s|.*|$versionSuffix|") -+echo "$version" > $versionPath -+ -+# Get the names of all src projects from the buildConfiguration.xml file -+projects=$(sed -n '//,/<\/src>/p' $PWD/buildConfiguration.xml | sed -n 's/.*name="\([^"]*\)".*/\1/p') -+ -+# Inject the new version numbers into the AssemblyInfo.cs files for each project -+for project in $projects; do -+ name="$project" -+ assemblyInfoPath="$PWD/src/$name/Properties/AssemblyInfo.cs" -+ echo "assemblyInfoPath: $assemblyInfoPath" -+ -+ assemblyInfo=$(cat $assemblyInfoPath) -+ assemblyInfo=$(echo "$assemblyInfo" | sed "s|AssemblyVersion.*|AssemblyVersion(\"$assemblyVersion\")]|") -+ assemblyInfo=$(echo "$assemblyInfo" | sed "s|AssemblyFileVersion.*|AssemblyFileVersion(\"$assemblyFileVersion\")]|") -+ assemblyInfo=$(echo "$assemblyInfo" | sed "s|AssemblyInformationalVersion.*|AssemblyInformationalVersion(\"$assemblyInformationalVersion\")]|") -+ echo "$assemblyInfo" > $assemblyInfoPath -+done diff --git a/src/azure-activedirectory-identitymodel-extensions-for-dotnet b/src/azure-activedirectory-identitymodel-extensions-for-dotnet index 6602db21ac..d9d4d95fb9 160000 --- a/src/azure-activedirectory-identitymodel-extensions-for-dotnet +++ b/src/azure-activedirectory-identitymodel-extensions-for-dotnet @@ -1 +1 @@ -Subproject commit 6602db21ac1cb76aae7fe38557d2502cbf33e69f +Subproject commit d9d4d95fb90e6f434ce3bcbf5f740aba81ddfca2