From f541b45f4d659c58894ac011fc900560d08efb81 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 10 Mar 2021 19:13:28 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
 build 20210309.7 (#30806)

[release/5.0] Update dependencies from dotnet/arcade
---
 NuGet.config            |  4 ----
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 global.json             |  4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 306ba4a91d..25788976f9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,8 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-cfd206a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-cfd206aa/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,10 +20,8 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-f27d337" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-cfd206a" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0e13c018e0..bf824e618b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -313,17 +313,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21159.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21159.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
+      <Sha>917ded6b428fc30b40f5ba4e35eb0c863d7f69e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21159.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21159.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
+      <Sha>917ded6b428fc30b40f5ba4e35eb0c863d7f69e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21159.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21159.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
+      <Sha>917ded6b428fc30b40f5ba4e35eb0c863d7f69e1</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 71146b7120..b0a55ade6b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -136,7 +136,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.4</MicrosoftEntityFrameworkCorePackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21159.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21159.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/global.json b/global.json
index ef66f581db..3bfb4e1341 100644
--- a/global.json
+++ b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21159.2"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21159.7"
   }
 }

From 19785ccdf595772231ee7b93083471ff13bad3de Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 11 Mar 2021 14:31:33 -0800
Subject: [PATCH 2/2] [release/5.0] Fix spelling of property (#30514)

* Fix spelling of property

* Update Versions.props

- fix bad merge

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
 eng/Versions.props            | 2 +-
 eng/targets/Packaging.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index b0a55ade6b..bb103b3f28 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
     <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>5</AspNetCorePatchVersion>
-    <ValidateBasline>true</ValidateBasline>
+    <ValidateBaseline>true</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index d404855dd8..e1a555056f 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,7 +1,7 @@
 <Project>
 
   <Target Name="EnsureBaselineIsUpdated"
-          Condition=" '$(ValidateBasline)' == 'true' AND
+          Condition=" '$(ValidateBaseline)' == 'true' AND
               '$(IsServicingBuild)' == 'true' AND
               '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
               '$(MSBuildProjectName)' != 'BaselineGenerator' AND