diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44bedf30bc..176a81cf2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,17 +19,17 @@ - + https://github.com/dotnet/arcade - f6dc83c016f91377a2f3f3d44f08f326652a0337 + 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 - + https://github.com/dotnet/arcade - f6dc83c016f91377a2f3f3d44f08f326652a0337 + 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 - + https://github.com/dotnet/arcade - f6dc83c016f91377a2f3f3d44f08f326652a0337 + 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 diff --git a/eng/Versions.props b/eng/Versions.props index ce716cf18f..5a2775d814 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> - 1.0.0-beta.20202.9 + 1.0.0-beta.20208.8 3.4.1-beta4-20127-10 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94965a8fd2..acbb0c5b3f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,7 +210,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index 9b4baa0242..5d863a103f 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20202.9", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20202.9" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20208.8", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20208.8" } }