Merge in 'release/2.1' changes

.gitignore

@@ -26,3 +26,4 @@ scripts/tmp/
 .dotnet/
 .tools/
 launchSettings.json
+korebuild-lock.txt

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>
 

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>

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)**\obj\**\*;" />
-                      $(RepositoryRoot)**\AutobahnTestApp\**\*;" />
   </ItemGroup>
 
   <!-- Properties for publishing -->

src/MetaPackages/korebuild-lock.txt

@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690

src/ServerTests/korebuild-lock.txt

@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690

src/Servers/HttpSys/.gitignore

@@ -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

src/Servers/HttpSys/NuGetPackageVerifier.json

@@ -1,13 +1,7 @@
 {
-    "adx-nonshipping": {
-        "rules": [],
-        "packages": {
-          "Microsoft.AspNetCore.HttpSys.Sources": {}
-        }
-    },
     "Default": {
         "rules": [
             "DefaultCompositeRule"
         ]
     }
-}
+}

src/Servers/HttpSys/test/Directory.Build.props

@@ -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>

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>
 

src/Shared/Buffers.Testing/Directory.Build.props

@@ -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>

src/Shared/Diagnostics/Directory.Build.props

@@ -1,7 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-</Project>

src/Shared/Directory.Build.props

@@ -1,6 +0,0 @@
-<Project>
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-   <PropertyGroup>
-    <IncludeSymbols>false</IncludeSymbols>
-  </PropertyGroup>
-</Project>

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>

src/Shared/HttpSys/Directory.Build.props

@@ -1,7 +0,0 @@
-<Project>
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-    <PropertyGroup>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
-</Project>

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>
 

src/Templating/korebuild-lock.txt

@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15847
-commithash:08641cb93aa5a9d52dc56c7516828b73aa448690