From 5f52370264f137ced39b46a926243d9f7525648d Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Thu, 20 Feb 2020 18:12:00 -0800
Subject: [PATCH] Merge fixes

---
 eng/Build.props                                           | 8 ++++++++
 eng/ProjectReferences.props                               | 2 +-
 .../Microsoft.Extensions.Configuration.KeyPerFile.csproj  | 1 -
 .../Microsoft.Extensions.FileProviders.Embedded.csproj    | 1 -
 ...xtensions.Diagnostics.HealthChecks.Abstractions.csproj | 1 -
 .../Microsoft.Extensions.Diagnostics.HealthChecks.csproj  | 1 -
 .../Microsoft.JSInterop/src/Microsoft.JSInterop.csproj    | 1 -
 .../Microsoft.Extensions.Localization.Abstractions.csproj | 1 -
 .../src/Microsoft.Extensions.Localization.csproj          | 1 -
 src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj | 1 -
 .../src/Microsoft.Extensions.WebEncoders.csproj           | 1 -
 11 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 05533d91f4..4c0542db15 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -190,6 +190,14 @@
                           $(RepoRoot)src\Azure\**\src\*.csproj;
                           $(RepoRoot)src\SignalR\**\src\*.csproj;
                           $(RepoRoot)src\Components\**\src\*.csproj;
+                          $(RepoRoot)src\FileProviders\**\src\*.csproj;
+                          $(RepoRoot)src\Configuration.KeyPerFile\**\src\*.csproj;
+                          $(RepoRoot)src\Localization\**\src\*.csproj;
+                          $(RepoRoot)src\ObjectPool\**\src\*.csproj;
+                          $(RepoRoot)src\JSInterop\**\src\*.csproj;
+                          $(RepoRoot)src\WebEncoders\**\src\*.csproj;
+                          $(RepoRoot)src\HealthChecks\**\src\*.csproj;
+                          $(RepoRoot)src\Testing\**\src\*.csproj;
                           "
                         Exclude="
                           @(ProjectToBuild);
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 61d87526d8..f71e3d1d72 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -63,6 +63,7 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj"  />
     <ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\ref\Microsoft.AspNetCore.Cryptography.Internal.csproj" />
@@ -152,6 +153,5 @@
     <ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\ref\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\ref\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
index b8b281716e..af1ecb684f 100644
--- a/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
+++ b/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
@@ -5,7 +5,6 @@
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>configuration</PackageTags>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
index 97d9600f13..13000f0814 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
@@ -8,7 +8,6 @@
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp.nuspec</NuspecFile>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>files;filesystem</PackageTags>
diff --git a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
index fac2cf9a99..659c39adc1 100644
--- a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
+++ b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
@@ -13,7 +13,6 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>diagnostics;healthchecks</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
index 9e89a9e06e..a737e01d45 100644
--- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
+++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
@@ -12,7 +12,6 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>diagnostics;healthchecks</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
index 83acae807f..2c8e56a9eb 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
+++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
@@ -7,7 +7,6 @@
     <PackageTags>javascript;interop</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
index 92139f6145..4bf8ba5329 100644
--- a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
+++ b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
@@ -12,7 +12,6 @@ Microsoft.Extensions.Localization.IStringLocalizer&lt;T&gt;</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>localization</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
index f69b533885..c3ffbeb772 100644
--- a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
+++ b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
@@ -9,7 +9,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>localization</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
index ab3be847ad..b2cc5954ce 100644
--- a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
+++ b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
@@ -7,7 +7,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>pooling</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 
diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
index c4fbf99fa6..9b8efbd16f 100644
--- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
+++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
@@ -8,7 +8,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore</PackageTags>
     <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>