From b5e51f39ef7aa18af0d81fec0f4845d7fead5361 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 02:14:24 +0000
Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/sdk
 build 20200513.9

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20263.1 -> To Version 3.1.400-preview.20263.9
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0c861857da..2c5e3db5a7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -48,9 +48,9 @@
     </Dependency>
   </ToolsetDependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-preview.20263.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-preview.20263.9">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>b9874ceb1f1baae24c34436220ace0f1a073bdcf</Sha>
+      <Sha>f9bb37a4c1db7833e86cd6f86669c39680d4f7d4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c3bd72b5e..2cf2140d83 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>3.1.400-preview.20263.1</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.1.400-preview.20263.9</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

From 01fa0f4ae5bcc3524c5c05f7a55e8045fb1b1d15 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Thu, 14 May 2020 22:10:35 -0700
Subject: [PATCH 2/6] Update stage 0

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index e7706d791b..680ab6d710 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.200-preview-014946",
+    "dotnet": "3.1.400-preview-015138",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppInternalPackageVersion)"

From bb3d10bfec84d1305acec086e4b4ff6deaba7be8 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Thu, 14 May 2020 22:29:40 -0700
Subject: [PATCH 3/6] Stage 0 update for LKG version

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 2cf2140d83..8d477012df 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,7 +13,7 @@
   <!-- Production Dependencies -->
   <PropertyGroup>
     <!-- "Stage 0" from https://github.com/dotnet/core-sdk -->
-    <DotNetCoreSdkLKGVersion>3.1.200-preview-014946</DotNetCoreSdkLKGVersion>
+    <DotNetCoreSdkLKGVersion>3.1.400-preview-015138</DotNetCoreSdkLKGVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->

From a1407742843a781a6c4e6b672cf65f5657e7f9f9 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Fri, 15 May 2020 11:58:47 -0500
Subject: [PATCH 4/6] Bump MSBuild version to 16.7

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 8d477012df..61d663a924 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>16.5.0-preview-20064-06</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.7.0-preview-20265-03</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>

From e8277b8f10e8e7e89528c387dea2583c611d9984 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Mon, 18 May 2020 14:28:40 -0700
Subject: [PATCH 5/6] Update NuGet clien version to 6609

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2c5e3db5a7..34ea98dc2e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -60,9 +60,9 @@
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
       <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.7.0-preview.1.6592">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.7.0-preview.1.6609">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>4dbf16e68eabf507b9f156c801b1b7c3b0586e43</Sha>
+      <Sha>12a375a8a02764b772a20371abaf797639a7f961</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 61d663a924..406245e473 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,7 +57,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client-->
-    <NuGetBuildTasksPackageVersion>5.7.0-preview.1.6592</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>5.7.0-preview.1.6609</NuGetBuildTasksPackageVersion>
     <NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
     <NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
     <NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>

From ea951fdf2dcc8c192dafa047937705c7a26893de Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <dsplaisted@gmail.com>
Date: Mon, 18 May 2020 17:15:39 -0700
Subject: [PATCH 6/6] Fix deployment of hostfxr for SDK Resolver

After https://github.com/dotnet/sdk/pull/11358, EmitLegacyAssetsFileItems needs to be set to true in order to generate FileDefinitions items.
---
 .../Microsoft.DotNet.MSBuildSdkResolver.csproj                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index 3bf755e8d7..3108644e05 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -13,6 +13,8 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <PublishDir>$(SdkResolverOutputDirectory)</PublishDir>
     <IsPackable>true</IsPackable>
+    <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
+    <EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
   </PropertyGroup>
 
   <ItemGroup>