diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d0a12f53..82df447c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
+ cda764613f89280de6d5c5383ebded9ac01ebd00
-
+
https://github.com/dotnet/arcade
- 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
+ cda764613f89280de6d5c5383ebded9ac01ebd00
-
+
https://github.com/dotnet/arcade
- 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
+ cda764613f89280de6d5c5383ebded9ac01ebd00
-
+
https://github.com/dotnet/arcade
- 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
+ cda764613f89280de6d5c5383ebded9ac01ebd00
-
+
https://github.com/dotnet/arcade
- 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
+ cda764613f89280de6d5c5383ebded9ac01ebd00
https://github.com/dotnet/arcade-services
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index a733a888..3e5c1c74 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -2,6 +2,8 @@ Param(
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
)
+. $PSScriptRoot\pipeline-logging-functions.ps1
+
Write-Host "Creating dir $ManifestDirPath"
# create directory for sbom manifest to be placed
if (!(Test-Path -path $ManifestDirPath))
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index f6c77453..d5c76dc8 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -2,6 +2,18 @@
source="${BASH_SOURCE[0]}"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+ source="$(readlink "$source")"
+
+ # if $source was a relative symlink, we need to resolve it relative to the path where the
+ # symlink file was located
+ [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+. $scriptroot/pipeline-logging-functions.sh
+
manifest_dir=$1
if [ ! -d "$manifest_dir" ] ; then
diff --git a/global.json b/global.json
index 1158fe7f..c364fb39 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9"
}
}