From e97237a5e66fe339454de44b8fd2f4dd9c4839b9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2020 19:55:30 +0000
Subject: [PATCH 1/3] Update dependencies from
 https://github.com/microsoft/msbuild build 20200716.2

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20360-03 -> To Version 16.8.0-preview-20366-02
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e9420c04033e..edc9871d263b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -33,13 +33,13 @@
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
       <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.7.0-preview-20360-03">
+    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20366-02">
       <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>188921e2ffecf6c74dd4583cf01b62465fcbee3c</Sha>
+      <Sha>91cb5270a2a94a31e8d2ca27aafa6ae2dc94be17</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="16.7.0-preview-20360-03">
+    <Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20366-02">
       <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>188921e2ffecf6c74dd4583cf01b62465fcbee3c</Sha>
+      <Sha>91cb5270a2a94a31e8d2ca27aafa6ae2dc94be17</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="10.10.0-beta.20361.3">
       <Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1fac0e1e11f9..80138e879c76 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -83,10 +83,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>16.7.0-preview-20360-03</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.8.0-preview-20366-02</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>16.7.0-preview-20360-03</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20366-02</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>

From 5b8d9edd944a6b9b2e74750855013cecd324a0b8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jul 2020 16:18:26 +0000
Subject: [PATCH 2/3] Update dependencies from
 https://github.com/microsoft/msbuild build 20200717.6

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20360-03 -> To Version 16.8.0-preview-20367-06
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index edc9871d263b..225ee4092859 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -33,13 +33,13 @@
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
       <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20366-02">
+    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20367-06">
       <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>91cb5270a2a94a31e8d2ca27aafa6ae2dc94be17</Sha>
+      <Sha>ccca596f350c87b9483577b956ed3dae7e7e1960</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20366-02">
+    <Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20367-06">
       <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>91cb5270a2a94a31e8d2ca27aafa6ae2dc94be17</Sha>
+      <Sha>ccca596f350c87b9483577b956ed3dae7e7e1960</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="10.10.0-beta.20361.3">
       <Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 80138e879c76..fe71ba5267ff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -83,10 +83,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>16.8.0-preview-20366-02</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.8.0-preview-20367-06</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20366-02</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20367-06</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>

From 42533fcdac99d64ec537689310e01749c18185b0 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 17 Jul 2020 01:57:21 -0700
Subject: [PATCH 3/3] Fix issues packing projects

---
 Directory.Build.targets                                    | 7 +++++++
 .../Microsoft.NET.Build.Tasks.csproj                       | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6f88acb6248f..6ec6b35ada26 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -11,6 +11,13 @@
       <CopyToOutputDirectory Condition="'%(Filename)' == 'xunit.runner.utility.netcoreapp10'">false</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'%(Filename)' == 'xunit.runner.reporters.netcoreapp10'">false</CopyToOutputDirectory>
     </None>
+
+    <!-- These files are included by the Microsoft.TestPlatform.TestHost package, but we don't want them in the .NET Tool NuGet package
+         (by default they would go in the content and contentFiles folders, generating NU5100 warnings. -->
+    <Content Update="@(Content)">
+      <Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.exe'">false</Pack>
+      <Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.dll'">false</Pack>
+    </Content>
     
   </ItemGroup>
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index 3ff8b10300b9..ecc4d885c6e8 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -32,6 +32,9 @@
     <OutputPath>$(BaseOutputPath)</OutputPath>
     <IsPackable>true</IsPackable>
     <PackageLayoutOutputPath>$(ArtifactsBinDir)$(Configuration)\Sdks\$(PackageId)\</PackageLayoutOutputPath>
+
+    <!-- Allow .editorconfig file for analyzers to be packed -->
+    <NoDefaultExcludes>true</NoDefaultExcludes>
   </PropertyGroup>
 
   <ItemDefinitionGroup>