diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d939c210057a85f21cea52f4d17b63056cb7193..fe51d7903254d7d60567f1e2cf2d08ca69d2e29d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,25 +75,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 diff --git a/eng/Versions.props b/eng/Versions.props index f8f5023aa1b8f2813b9a067813621cfbef65d79d..a780b81595fe88ed7ed4c2825dea9cf534bc57b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,8 +48,8 @@ - 7.0.0-beta.22368.5 - 7.0.0-beta.22368.5 + 7.0.0-beta.22369.9 + 7.0.0-beta.22369.9 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885824a9b304787dc1e158301f24025cac..3e5c1c74a1c50d58c230788207131634aea9c3cc 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 f6c77453142a28129a04e059532de3a3d6b7f6eb..d5c76dc827b49692b458657fc56a483c7d27f6dc 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 d981122403de83f66a4e2d08a4f49f877c14a949..8d0a17ee72a951ba6c83a2ee5abeaacac5d8797e 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9" }, "sdk": { "version": "7.0.100-preview.5.22307.18"