From 8dc0b49ea727cb8b10e265adedd90d75cd7dc6f8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 19:58:09 +0000
Subject: [PATCH] [release/3.1] Update dependencies from dotnet/arcade (#20815)

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

- Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20113.5 -> 1.0.0-beta.20213.4
- Microsoft.DotNet.GenAPI: 1.0.0-beta.20113.5 -> 1.0.0-beta.20213.4
- Microsoft.DotNet.Helix.Sdk: 2.0.0-beta.20113.5 -> 2.0.0-beta.20213.4

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Internal: 3.1.4-servicing.20181.2 -> 3.1.4-servicing.20202.1 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing: 3.1.4-servicing.20181.5 -> 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)

* Fixup nuget.config

* Only update from Arcade

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
---
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      |  4 ++--
 eng/common/tools.sh     |  9 ++++++++-
 global.json             |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

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 @@
       <Uri>https://github.com/dotnet/extensions</Uri>
       <Sha>cf044102f01a3402a680fa58cabea8a9ca53aa3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20113.5">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20213.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
+      <Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20213.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
+      <Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20213.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
+      <Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.4-servicing.20181.5" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
@@ -434,4 +434,4 @@
       <Sha>d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>
\ 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 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
@@ -271,4 +271,4 @@
     <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.blob.core.windows.net/dotnet/</DotNetAssetRootUrl>
     <DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
   </PropertyGroup>
-</Project>
+</Project>
\ 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"
   }
 }