Skip to content

Remove dependency on xmllint in IdentityModel script #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Remove dependency on xmllint in IdentityModel script #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions ...rectory-identitymodel-extensions-for-dotnet/0002-Add-updateAssemblyInfo-bash-script.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <[email protected]>
Date: Fri, 28 Jul 2023 16:04:03 -0500
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 | 48 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
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,48 @@
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -euo pipefail
+
Expand All @@ -25,9 +25,7 @@ index 00000000..39173e2c
+# 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}
+
+buildConfiguration=$(cat $PWD/buildConfiguration.xml)
+
+assemblyVersion=$(echo $buildConfiguration | xmllint --xpath 'string(/root/assemblyVersion)' -)
+assemblyVersion=$(grep -oP '(?<=<assemblyVersion>)[^<]+' $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)
Expand All @@ -37,7 +35,7 @@ index 00000000..39173e2c
+echo "assemblyFileVersion: $assemblyFileVersion"
+echo "assemblyInformationalVersion: $assemblyInformationalVersion"
+
+nugetSuffix=$(xmllint --xpath "string(/root/nugetSuffix)" buildConfiguration.xml)
+nugetSuffix=$(grep -oP '(?<=<nugetSuffix>)[^<]+' $PWD/buildConfiguration.xml)
+versionSuffix=""
+
+echo "nugetSuffix: $nugetSuffix"
Expand All @@ -49,7 +47,7 @@ index 00000000..39173e2c
+echo "$version" > $versionPath
+
+# Get the names of all src projects from the buildConfiguration.xml file
+projects=$(xmllint --xpath "/root/projects/src/project" buildConfiguration.xml | grep -oP 'name="\K[^"]+')
+projects=$(grep -zoP '(?<=<src>)(.|[\s])*?(?=<\/src>)' $PWD/buildConfiguration.xml | grep -aoP 'name="\K[^"]+')
+
+# Inject the new version numbers into the AssemblyInfo.cs files for each project
+for project in $projects; do
Expand Down