Backport infrastructure cleanup to share sources and project referenc…

…es (dotnet#4513)
Applesauce314 · Dec 7, 2018 · df3e4b9 · df3e4b9
1 parent ae11d5d
commit df3e4b9
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 93 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/src/ServerTests/korebuild-lock.txt b/src/ServerTests/korebuild-lock.txt
diff --git a/src/Servers/HttpSys/.gitignore b/src/Servers/HttpSys/.gitignore
diff --git 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"
         ]
     }
-}
+}
diff --git a/src/Servers/HttpSys/test/Directory.Build.props b/src/Servers/HttpSys/test/Directory.Build.props
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
@@ -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
diff --git a/src/Shared/Diagnostics/Directory.Build.props b/src/Shared/Diagnostics/Directory.Build.props
diff --git a/src/Shared/Directory.Build.props b/src/Shared/Directory.Build.props
diff --git 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>
+</Project>
diff --git a/src/Shared/HttpSys/Directory.Build.props b/src/Shared/HttpSys/Directory.Build.props
diff --git a/...soft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/...soft.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