From df3e4b98a2202a29309275cea5efba0720c486b1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 7 Dec 2018 12:20:13 -0800
Subject: [PATCH] Backport infrastructure cleanup to share sources and project
 references (#4513)

---
 .gitignore                                    |  1 +
 Directory.Build.targets                       |  2 +-
 build/artifacts.props                         |  1 -
 build/repo.props                              |  5 ++-
 src/MetaPackages/korebuild-lock.txt           |  2 --
 src/ServerTests/korebuild-lock.txt            |  2 --
 src/Servers/HttpSys/.gitignore                | 32 -------------------
 src/Servers/HttpSys/NuGetPackageVerifier.json |  8 +----
 .../HttpSys/test/Directory.Build.props        | 14 --------
 ...spNetCore.Server.Kestrel.Core.Tests.csproj |  2 +-
 .../Buffers.Testing/Directory.Build.props     |  6 ----
 src/Shared/Diagnostics/Directory.Build.props  |  7 ----
 src/Shared/Directory.Build.props              |  6 ----
 .../Directory.Build.props                     |  4 ++-
 src/Shared/HttpSys/Directory.Build.props      |  7 ----
 ...t.AspNetCore.Http.Connections.Tests.csproj |  2 +-
 src/Templating/korebuild-lock.txt             |  2 --
 17 files changed, 10 insertions(+), 93 deletions(-)
 delete mode 100644 src/MetaPackages/korebuild-lock.txt
 delete mode 100644 src/ServerTests/korebuild-lock.txt
 delete mode 100644 src/Servers/HttpSys/.gitignore
 delete mode 100644 src/Servers/HttpSys/test/Directory.Build.props
 delete mode 100644 src/Shared/Buffers.Testing/Directory.Build.props
 delete mode 100644 src/Shared/Diagnostics/Directory.Build.props
 delete mode 100644 src/Shared/Directory.Build.props
 delete mode 100644 src/Shared/HttpSys/Directory.Build.props
 delete mode 100644 src/Templating/korebuild-lock.txt

diff --git a/.gitignore b/.gitignore
index fe965fc58f..39bacfa7c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ scripts/tmp/
 .dotnet/
 .tools/
 launchSettings.json
+korebuild-lock.txt
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6f505f9875..32ea0d5590 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -9,7 +9,7 @@
 
   <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
     <!-- Always include framework metapackages in patch updates. -->
-    <IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true'">true</IsPackageInThisPatch>
+    <IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true' OR '$(IsSharedSourcePackage)' == 'true' ">true</IsPackageInThisPatch>
     <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
   </PropertyGroup>
 
diff --git a/build/artifacts.props b/build/artifacts.props
index 09e81d5424..d9887567e1 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -193,7 +193,6 @@
     <PackageArtifact Include="RazorPageGenerator" Category="noship" />
 
     <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources" Category="noship"/>
-    <PackageArtifact Include="Microsoft.Extensions.Buffers.Testing.Sources" Category="noship"/>
   </ItemGroup>
 
 </Project>
diff --git a/build/repo.props b/build/repo.props
index 73cec397f5..ffb92248ac 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SharedSourceDirectories Include="$([System.IO.Directory]::GetDirectories($(SharedSourcesFolder)))" />
+    <SharedSourceDirectories Include="$(SharedSourcesFolder)Hosting.WebHostBuilderFactory\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -70,8 +70,7 @@
                     Exclude="
                       @(ProjectToExclude);
                       $(RepositoryRoot)**\bin\**\*;
-                      $(RepositoryRoot)**\obj\**\*;
-                      $(RepositoryRoot)**\AutobahnTestApp\**\*;" />
+                      $(RepositoryRoot)**\obj\**\*;" />
   </ItemGroup>
 
   <!-- Properties for publishing -->
diff --git a/src/MetaPackages/korebuild-lock.txt b/src/MetaPackages/korebuild-lock.txt
deleted file mode 100644
index d38b7a9c0e..0000000000
--- a/src/MetaPackages/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690
diff --git a/src/ServerTests/korebuild-lock.txt b/src/ServerTests/korebuild-lock.txt
deleted file mode 100644
index d38b7a9c0e..0000000000
--- a/src/ServerTests/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690
diff --git a/src/Servers/HttpSys/.gitignore b/src/Servers/HttpSys/.gitignore
deleted file mode 100644
index e062ff6d76..0000000000
--- a/src/Servers/HttpSys/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-[Oo]bj/
-[Bb]in/
-TestResults/
-.nuget/
-_ReSharper.*/
-packages/
-artifacts/
-PublishProfiles/
-*.user
-*.suo
-*.cache
-*.docstates
-_ReSharper.*
-nuget.exe
-*net45.csproj
-*net451.csproj
-*k10.csproj
-*.psess
-*.vsp
-*.pidb
-*.userprefs
-*DS_Store
-*.ncrunchsolution
-*.*sdf
-*.ipch
-*.sln.ide
-project.lock.json
-/.vs
-.vscode/
-.build/
-.testPublish/
-global.json
diff --git a/src/Servers/HttpSys/NuGetPackageVerifier.json b/src/Servers/HttpSys/NuGetPackageVerifier.json
index c02b36b40a..c5f5582998 100644
--- a/src/Servers/HttpSys/NuGetPackageVerifier.json
+++ b/src/Servers/HttpSys/NuGetPackageVerifier.json
@@ -1,13 +1,7 @@
 {
-    "adx-nonshipping": {
-        "rules": [],
-        "packages": {
-          "Microsoft.AspNetCore.HttpSys.Sources": {}
-        }
-    },
     "Default": {
         "rules": [
             "DefaultCompositeRule"
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/src/Servers/HttpSys/test/Directory.Build.props b/src/Servers/HttpSys/test/Directory.Build.props
deleted file mode 100644
index a143d14d6a..0000000000
--- a/src/Servers/HttpSys/test/Directory.Build.props
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
-    <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms);netcoreapp2.0</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
index e11845c901..d40f17e64a 100644
--- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
+++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <Compile Include="$(KestrelSharedSourceRoot)test\**\*.cs" />
-    <Compile Include="$(RepositoryRoot)\src\Shared\Buffers.Testing\*.cs" />
+    <Compile Include="$(SharedSourceRoot)Buffers.Testing\*.cs" />
     <Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
diff --git a/src/Shared/Buffers.Testing/Directory.Build.props b/src/Shared/Buffers.Testing/Directory.Build.props
deleted file mode 100644
index 0f500dff85..0000000000
--- a/src/Shared/Buffers.Testing/Directory.Build.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <PackageId>Microsoft.Extensions.Buffers.Testing.Sources</PackageId>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Shared/Diagnostics/Directory.Build.props b/src/Shared/Diagnostics/Directory.Build.props
deleted file mode 100644
index dabb33e076..0000000000
--- a/src/Shared/Diagnostics/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Shared/Directory.Build.props b/src/Shared/Directory.Build.props
deleted file mode 100644
index 8c771f4a3f..0000000000
--- a/src/Shared/Directory.Build.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-   <PropertyGroup>
-    <IncludeSymbols>false</IncludeSymbols>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Shared/Hosting.WebHostBuilderFactory/Directory.Build.props b/src/Shared/Hosting.WebHostBuilderFactory/Directory.Build.props
index 77fc28117e..f3d32f04dd 100644
--- a/src/Shared/Hosting.WebHostBuilderFactory/Directory.Build.props
+++ b/src/Shared/Hosting.WebHostBuilderFactory/Directory.Build.props
@@ -2,5 +2,7 @@
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
    <PropertyGroup>
     <PackageId>Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources</PackageId>
+    <IsSharedSourcePackage>true</IsSharedSourcePackage>
+    <IncludeSymbols>false</IncludeSymbols>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Shared/HttpSys/Directory.Build.props b/src/Shared/HttpSys/Directory.Build.props
deleted file mode 100644
index 4eb7e43a44..0000000000
--- a/src/Shared/HttpSys/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-    <PropertyGroup>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj
index b161cd535b..e50d6131ab 100644
--- a/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj
+++ b/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Buffers.Testing\**\*.cs" />
     <Content Include="..\xunit.runner.json" Link="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -19,7 +20,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCorePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Buffers.Testing.Sources" Version="$(MicrosoftExtensionsBuffersTestingSourcesPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Templating/korebuild-lock.txt b/src/Templating/korebuild-lock.txt
deleted file mode 100644
index d38b7a9c0e..0000000000
--- a/src/Templating/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690