From 7b7595629e0e602df3a5d1b792b0ef2ce86b6da4 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Wed, 12 Feb 2020 13:41:47 -0800
Subject: [PATCH 1/7] Update dependencies from Arcade

---
 eng/Version.Details.xml  | 12 ++++++------
 eng/Versions.props       |  2 +-
 eng/common/darc-init.ps1 |  2 +-
 eng/common/tools.sh      | 10 +---------
 global.json              |  4 ++--
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 57c5906f0b92..89bcb2be8525 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -417,17 +417,17 @@
       <Uri>https://github.com/dotnet/extensions</Uri>
       <Sha>1286a6ff55e300352dabeb6d778c9fcdd258bd08</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19607.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20112.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
+      <Sha>ebe580ac4b1b8e47facb086c265d76fd66317a60</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19607.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20112.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
+      <Sha>ebe580ac4b1b8e47facb086c265d76fd66317a60</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19607.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20112.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
+      <Sha>ebe580ac4b1b8e47facb086c265d76fd66317a60</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.2-servicing.20067.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f0b625fffdea..0099ed64afea 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.19607.3</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20112.6</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-19614-01</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 46d175fdfdca..b94c2f4e411d 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) {
 
   Write-Host "Installing Darc CLI version $darcVersion..."
   Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
-  & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
+  & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1
 }
 
 InstallDarcCli $darcVersion
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 62218302268f..94965a8fd2a9 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -210,15 +210,7 @@ function InstallDotNet {
 
       local runtimeSourceFeedKey=''
       if [[ -n "${7:-}" ]]; then
-        # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
-        # like the rest of the unix variants. At the same time, MacOS doesn't support
-        # '-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`
+        decodedFeedKey=`echo $7 | base64 --decode`
         runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
       fi
 
diff --git a/global.json b/global.json
index 3070303dd920..36c43ba5d478 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.19607.3",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20112.6",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20112.6"
   }
 }

From 4e1805130428a7633d0fe8dd1174b4b2356b1be1 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Wed, 12 Feb 2020 16:06:46 -0800
Subject: [PATCH 2/7] Try publishing checksums

---
 eng/Publishing.props                                     | 9 ++++++---
 .../src/Microsoft.AspNetCore.App.Runtime.csproj          | 6 ++++++
 src/Installers/Windows/Wix.targets                       | 8 +++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index aa5294832a3c..e77d34f56267 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -3,7 +3,7 @@
     <!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
     <ArtifactsDir>$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
 
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallersAndChecksums</PublishDependsOnTargets>
 
     <_UploadPathRoot>aspnetcore</_UploadPathRoot>
   </PropertyGroup>
@@ -13,7 +13,7 @@
     <!-- Include our "loose" PDBs when publishing symbols. -->
     <FilesToPublishToSymbolServer Include="$(ArtifactsDir)\symbols\**\*.pdb" />
 
-    <!-- Prepare for _PublishInstallers target. -->
+    <!-- Prepare for _PublishInstallersAndChecksums target. -->
     <_InstallersToPublish Remove="@(_InstallersToPublish)" />
     <_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.jar" UploadPathSegment="jar" />
     <_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.pom" UploadPathSegment="jar" />
@@ -27,9 +27,10 @@
         Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
+    <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.SHA512" />
   </ItemGroup>
 
-  <Target Name="_PublishInstallers">
+  <Target Name="_PublishInstallersAndChecksums">
     <!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
     <MSBuild Projects="$(RepoRoot)src\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj"
         Targets="_GetPackageVersionInfo"
@@ -45,6 +46,8 @@
       <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
       <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
 
+      <ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)" />
+
       <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
         <IsShipping>true</IsShipping>
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
index 4a7b1c9c4f89..07b545dfcdcf 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -154,6 +154,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <GenerateChecksumItems Include="$(RedistArchiveOutputPath)">
+      <DestinationPath>$(RedistArchiveOutputPath).SHA512</DestinationPath>
+    </GenerateChecksumItems>
+  </ItemGroup>
+
   <!-- Target chain -->
   <PropertyGroup>
     <ResolveReferencesDependsOn>
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index a6c7224a8481..6fceba22c13b 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -64,7 +64,7 @@
 
   <Target Name="CopyToArtifactsDirectory"
           Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' "
-          AfterTargets="Build">
+          AfterTargets="Build" BeforeTargets="GenerateChecksums">
     <Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
     <ItemGroup>
       <_cabs Include="$(TargetDir)**/*.cab" />
@@ -72,4 +72,10 @@
     <Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
   </Target>
 
+  <ItemGroup Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' ">
+    <GenerateChecksumItems Include="$(InstallersOutputPath)$(PackageFileName)">
+      <DestinationPath>$(InstallersOutputPath)$(PackageFileName).SHA512</DestinationPath>
+    </GenerateChecksumItems>
+  </ItemGroup>
+
 </Project>

From 0fef3b7431aa810936a57b476804b8cb45c87ee5 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Thu, 13 Feb 2020 10:44:48 -0800
Subject: [PATCH 3/7] Fix some errors

---
 eng/Publishing.props                                      | 4 +++-
 src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index e77d34f56267..6d9ea3374906 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -46,7 +46,9 @@
       <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
       <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
 
-      <ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)" />
+      <ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
+        <PublishFlatContainer>true</PublishFlatContainer>
+      </ItemsToPushToBlobFeed>
 
       <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
         <IsShipping>true</IsShipping>
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
index 07b545dfcdcf..66208d917334 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -154,7 +154,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
     <GenerateChecksumItems Include="$(RedistArchiveOutputPath)">
       <DestinationPath>$(RedistArchiveOutputPath).SHA512</DestinationPath>
     </GenerateChecksumItems>

From be4a1ac86996f982019edbeb7bb15f5b57ff15f4 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Thu, 13 Feb 2020 14:41:58 -0800
Subject: [PATCH 4/7] Set RelativeBlobPath

---
 eng/Publishing.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 6d9ea3374906..c7c34f97a61c 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -48,6 +48,7 @@
 
       <ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
         <PublishFlatContainer>true</PublishFlatContainer>
+        <RelativeBlobPath>Dotnet/$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
       </ItemsToPushToBlobFeed>
 
       <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">

From a8a8ad8c9ffccca03e64c06aee156dc5b13a462f Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Thu, 13 Feb 2020 16:52:25 -0800
Subject: [PATCH 5/7] Fix publish location

---
 eng/Publishing.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index c7c34f97a61c..67371c3daade 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -48,7 +48,7 @@
 
       <ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
         <PublishFlatContainer>true</PublishFlatContainer>
-        <RelativeBlobPath>Dotnet/$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
+        <RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
       </ItemsToPushToBlobFeed>
 
       <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">

From 1897a5d816695fdb10a918e80236507b38de5186 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Thu, 13 Feb 2020 16:56:47 -0800
Subject: [PATCH 6/7] Centralize ChecksumExtension

---
 Directory.Build.props                                     | 1 +
 eng/Publishing.props                                      | 2 +-
 src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +-
 src/Installers/Windows/Wix.targets                        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 27c4622d2bfc..3adc325eaf8e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -173,6 +173,7 @@
 
     <ArchiveExtension>.tar.gz</ArchiveExtension>
     <ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
+    <ChecksumExtension>.sha512</ChecksumExtension>
   </PropertyGroup>
 
   <Import Project="eng\Workarounds.props" />
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 67371c3daade..f73010a48b27 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -27,7 +27,7 @@
         Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
-    <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.SHA512" />
+    <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*$(ChecksumExtension)" />
   </ItemGroup>
 
   <Target Name="_PublishInstallersAndChecksums">
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
index 66208d917334..6cd9a075a4d2 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -156,7 +156,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
     <GenerateChecksumItems Include="$(RedistArchiveOutputPath)">
-      <DestinationPath>$(RedistArchiveOutputPath).SHA512</DestinationPath>
+      <DestinationPath>$(RedistArchiveOutputPath)$(ChecksumExtension)</DestinationPath>
     </GenerateChecksumItems>
   </ItemGroup>
 
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 6fceba22c13b..2e4b8dca03c5 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -74,7 +74,7 @@
 
   <ItemGroup Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' ">
     <GenerateChecksumItems Include="$(InstallersOutputPath)$(PackageFileName)">
-      <DestinationPath>$(InstallersOutputPath)$(PackageFileName).SHA512</DestinationPath>
+      <DestinationPath>$(InstallersOutputPath)$(PackageFileName)$(ChecksumExtension)</DestinationPath>
     </GenerateChecksumItems>
   </ItemGroup>
 

From 3859ff50cdb3af3fd55f8fd393551784bd11eb4e Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Fri, 14 Feb 2020 09:49:10 -0800
Subject: [PATCH 7/7] Fix use of ChecksumExtension in publishing.props

---
 eng/Publishing.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index f73010a48b27..57c5a7126963 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -8,7 +8,7 @@
     <_UploadPathRoot>aspnetcore</_UploadPathRoot>
   </PropertyGroup>
 
-  <!-- $(InstallersOutputPath) and $(SymbolsOutputPath) are not defined. Root Directory.Build.props is not imported. -->
+  <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
   <ItemGroup>
     <!-- Include our "loose" PDBs when publishing symbols. -->
     <FilesToPublishToSymbolServer Include="$(ArtifactsDir)\symbols\**\*.pdb" />
@@ -27,7 +27,7 @@
         Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
     <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
-    <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*$(ChecksumExtension)" />
+    <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.sha512" />
   </ItemGroup>
 
   <Target Name="_PublishInstallersAndChecksums">