File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed
Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change 33 <ProductDependencies >
44 </ProductDependencies >
55 <ToolsetDependencies >
6- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 1.0.0-beta.20202.9 " >
6+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 1.0.0-beta.20208.8 " >
77 <Uri >https://github.com/dotnet/arcade</Uri >
8- <Sha >f6dc83c016f91377a2f3f3d44f08f326652a0337 </Sha >
8+ <Sha >0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 </Sha >
99 </Dependency >
1010 </ToolsetDependencies >
1111</Dependencies >
Original file line number Diff line number Diff line change @@ -210,7 +210,14 @@ function InstallDotNet {
210210
211211 local runtimeSourceFeedKey=' '
212212 if [[ -n " ${7:- } " ]]; then
213- decodedFeedKey=` echo $7 | base64 --decode`
213+ # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
214+ # '-d'. To work around this, do a simple detection and switch the parameter
215+ # accordingly.
216+ decodeArg=" --decode"
217+ if base64 --help 2>&1 | grep -q " BusyBox" ; then
218+ decodeArg=" -d"
219+ fi
220+ decodedFeedKey=` echo $7 | base64 $decodeArg `
214221 runtimeSourceFeedKey=" --feed-credential $decodedFeedKey "
215222 fi
216223
Original file line number Diff line number Diff line change 1010 }
1111 },
1212 "msbuild-sdks" : {
13- "Microsoft.DotNet.Arcade.Sdk" : " 1.0.0-beta.20202.9 " ,
13+ "Microsoft.DotNet.Arcade.Sdk" : " 1.0.0-beta.20208.8 " ,
1414 "Microsoft.DotNet.Helix.Sdk" : " 2.0.0-beta.19069.2"
1515 }
1616}
You can’t perform that action at this time.
0 commit comments