From fc38f9e0c32c78c0f693a8c484a5aa3accf79a7b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 22:05:20 +0000
Subject: [PATCH] [blazor-wasm] Update dependencies from dotnet/arcade
 dotnet/blazor (#20743)

* Update dependencies from https://github.com/dotnet/blazor build 20200410.3

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-preview5.20210.1 -> 3.2.0-preview5.20210.3

* Update dependencies from https://github.com/dotnet/blazor build 20200410.4

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-preview5.20210.1 -> 3.2.0-preview5.20210.4

* Update dependencies from https://github.com/dotnet/blazor build 20200411.1

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-preview5.20210.1 -> 3.2.0-preview5.20211.1

* Update dependencies from https://github.com/dotnet/arcade build 20200408.8

- Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20202.9 -> 1.0.0-beta.20208.8
- Microsoft.DotNet.GenAPI: 1.0.0-beta.20202.9 -> 1.0.0-beta.20208.8
- Microsoft.DotNet.Helix.Sdk: 2.0.0-beta.20202.9 -> 2.0.0-beta.20208.8

* Update dependencies from https://github.com/dotnet/blazor build 20200413.1

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-preview5.20210.1 -> 3.2.0-preview5.20213.1

* Update dependencies from https://github.com/dotnet/blazor build 20200413.2

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-preview5.20210.3 -> 3.2.0-preview5.20213.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Pranav K <prkrishn@hotmail.com>
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 eng/common/tools.sh     |  9 ++++++++-
 global.json             |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

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 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20202.9">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20208.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f6dc83c016f91377a2f3f3d44f08f326652a0337</Sha>
+      <Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20202.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20208.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f6dc83c016f91377a2f3f3d44f08f326652a0337</Sha>
+      <Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20202.9">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20208.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f6dc83c016f91377a2f3f3d44f08f326652a0337</Sha>
+      <Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
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 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20202.9</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20208.8</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
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"
   }
 }