Merge pull request #141 from dotnet/darc-master-23d7f4e9-27ee-4ddb-a0…

…7c-e7328b77f3a9

[master] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20202.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20218.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f6dc83c016f91377a2f3f3d44f08f326652a0337</Sha>
+      <Sha>b16cd6899775d52db4d4ac255908853bf4ee8833</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

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
 

global.json

@@ -3,6 +3,6 @@
     "dotnet": "3.1.102"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20202.9"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20218.1"
   }
 }