diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea493936af..94b3b13f14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -413,17 +413,17 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 1a55276ab9d16792cec595ba870df39a9d97d5ca https://github.com/dotnet/extensions @@ -434,4 +434,4 @@ d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf - + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index e10323db1b..082dc20102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> - 1.0.0-beta.20113.5 + 1.0.0-beta.20213.4 3.4.1-beta4-20127-10 @@ -271,4 +271,4 @@ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - + \ No newline at end of file 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 67ec79203b..974708a611 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.20113.5", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4" } }