From 69a17d83068055d64b3b3e356a7392e1f384eade Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Tue, 23 Oct 2018 09:54:24 -0700
Subject: [PATCH 1/2] update PR

---
 .appveyor.yml                                 |  2 +-
 .vsts-pipelines/builds/ci-internal-21.yml     | 30 ++++++++++
 .vsts-pipelines/templates/build-steps.yml     | 42 ++++++++++++++
 IISIntegration.NoV1.sln                       | 17 +++++-
 IISIntegration.sln                            | 23 ++++++++
 build/build.msbuild                           | 34 -----------
 build/buildpipeline/windows.groovy            |  2 +-
 build/dependencies.props                      | 14 ++++-
 build/functional-test-assets.targets          | 10 ++++
 build/repo.props                              | 13 ++++-
 build/repo.targets                            | 16 ++++--
 build/testsite.props                          |  1 -
 korebuild-lock.txt                            |  5 ++
 ...osoft.AspNetCore.AspNetCoreModuleV2.nuspec |  3 +-
 .../CommonLib/ServerErrorHandler.h            |  6 +-
 .../CommonLib/StringHelpers.h                 |  8 +--
 .../Core/IISHttpContext.IO.cs                 | 12 ++--
 .../Core/IO/AsyncIOEngine.cs                  |  4 +-
 .../Microsoft.AspNetCore.Server.IIS.csproj    | 12 ++++
 ...tCore.Server.IntegrationTesting.IIS.csproj | 29 +++-------
 .../Inprocess/ErrorPagesTests.cs              | 36 +++++++++---
 .../Inprocess/StartupTests.cs                 |  0
 .../OutOfProcess/GlobalVersionTests.cs        |  1 +
 test/CommonLibTests/utility_tests.cpp         | 15 +++++
 .../BackwardsCompatibilityTests.cs            | 49 ++++++++++++++++
 .../DeployerSelector.cs                       | 13 +++++
 ...kwardsCompatibility.FunctionalTests.csproj | 56 +++++++++++++++++++
 .../RequiresNewShim.cs                        | 17 ++++++
 test/IIS.FunctionalTests/DeployerSelector.cs  |  1 +
 .../IIS.FunctionalTests.csproj                |  3 +
 test/IIS.FunctionalTests/RequiresNewShim.cs   | 17 ++++++
 .../Inprocess/StdOutRedirectionTests.cs       |  0
 .../MofFileTests.cs                           |  0
 .../Properties/AssemblyInfo.cs                |  4 +-
 .../RequiresIISAttribute.cs                   |  2 +-
 .../ServicesTests.cs                          |  0
 test/IIS.Tests/ClientDisconnectTests.cs       |  6 +-
 test/IIS.Tests/IIS.Tests.csproj               |  5 +-
 test/IIS.Tests/TestServerTest.cs              |  2 +-
 .../DeployerSelector.cs                       |  1 +
 .../IISExpress.FunctionalTests.csproj         |  2 +
 .../Properties/AssemblyInfo.cs                |  2 +
 .../RequiresNewShim.cs                        | 17 ++++++
 version.props                                 | 10 ++++
 44 files changed, 443 insertions(+), 99 deletions(-)
 create mode 100644 .vsts-pipelines/builds/ci-internal-21.yml
 delete mode 100644 build/build.msbuild
 create mode 100644 build/functional-test-assets.targets
 rename test/{IIS.FunctionalTests => Common.FunctionalTests}/Inprocess/StartupTests.cs (100%)
 create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
 create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
 create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
 create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs
 create mode 100644 test/IIS.FunctionalTests/RequiresNewShim.cs
 rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Inprocess/StdOutRedirectionTests.cs (100%)
 rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/MofFileTests.cs (100%)
 rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Properties/AssemblyInfo.cs (82%)
 rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/RequiresIISAttribute.cs (99%)
 rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/ServicesTests.cs (100%)
 create mode 100644 test/IISExpress.FunctionalTests/RequiresNewShim.cs

diff --git a/.appveyor.yml b/.appveyor.yml
index 2b99c7fb7e..ca883867c8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,7 +16,7 @@ install:
 - git submodule update --init --recursive
 - net start w3svc
 build_script:
-- ps: .\run.ps1 default-build
+- ps: .\run.ps1 default-build /p:SkipIISBackwardsCompatibilityTests=true
 clone_depth: 1
 environment:
   global:
diff --git a/.vsts-pipelines/builds/ci-internal-21.yml b/.vsts-pipelines/builds/ci-internal-21.yml
new file mode 100644
index 0000000000..1506ee3149
--- /dev/null
+++ b/.vsts-pipelines/builds/ci-internal-21.yml
@@ -0,0 +1,30 @@
+trigger:
+- release/2.2
+
+resources:
+  repositories:
+  - repository: buildtools
+    type: git
+    name: aspnet-BuildTools
+    ref: refs/heads/release/2.2
+
+phases:
+- template: .azure\templates\jobs\default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    codeSign: false
+    buildArgs: /p:BuildServerIIS21=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true
+    beforeBuild:
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 SetupDumps"
+        displayName: Prepare repo
+    afterBuild:
+      - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown"
+        displayName: Stop AppVerifier
+        condition: always()
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        condition: eq(variables['system.pullrequest.isfork'], false)
+        inputs:
+          artifactName: logs
+          artifactType: Container
+          pathtoPublish: artifacts/logs
\ No newline at end of file
diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml
index 36219f533b..a1cd198773 100644
--- a/.vsts-pipelines/templates/build-steps.yml
+++ b/.vsts-pipelines/templates/build-steps.yml
@@ -2,6 +2,48 @@ phases:
 - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
   parameters:
     agentOs: Windows
+    phaseName: IIS_Express_Tests
+    buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true
+    beforeBuild:
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
+        displayName: Prepare repo
+    afterBuild:
+      - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown"
+        displayName: Stop AppVerifier
+        condition: always()
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        condition: eq(variables['system.pullrequest.isfork'], false)
+        inputs:
+          artifactName: logs
+          artifactType: Container
+          pathtoPublish: artifacts/logs
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    phaseName: IIS_Tests
+    buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISExpressTests=true
+    beforeBuild:
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
+        displayName: Prepare repo
+    afterBuild:
+      - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown"
+        displayName: Stop AppVerifier
+        condition: always()
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        condition: eq(variables['system.pullrequest.isfork'], false)
+        inputs:
+          artifactName: logs
+          artifactType: Container
+          pathtoPublish: artifacts/logs
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    phaseName: IIS_BackCompat_Tests
+    buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true
     beforeBuild:
       - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
         displayName: Prepare repo
diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln
index cbe801fc32..2ee59d14bf 100644
--- a/IISIntegration.NoV1.sln
+++ b/IISIntegration.NoV1.sln
@@ -36,10 +36,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 	ProjectSection(SolutionItems) = preProject
 		build\applicationhost.config = build\applicationhost.config
 		build\applicationhost.iis.config = build\applicationhost.iis.config
-		build\build.msbuild = build\build.msbuild
 		build\Build.Settings = build\Build.Settings
 		build\Config.Definitions.Props = build\Config.Definitions.Props
 		build\dependencies.props = build\dependencies.props
+		build\functional-test-assets.targets = build\functional-test-assets.targets
 		build\Key.snk = build\Key.snk
 		build\launchSettings.json = build\launchSettings.json
 		build\native.targets = build\native.targets
@@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -383,6 +385,18 @@ Global
 		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU
 		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU
 		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -413,6 +427,7 @@ Global
 		{34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
 		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 		{D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+		{582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/IISIntegration.sln b/IISIntegration.sln
index 34a5050f7e..6e8b394d5a 100644
--- a/IISIntegration.sln
+++ b/IISIntegration.sln
@@ -121,6 +121,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{28055B05-25D4-4F17-9F36-A1D09FDDA607}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -637,6 +639,26 @@ Global
 		{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.Build.0 = Release|Any CPU
 		{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.ActiveCfg = Release|Any CPU
 		{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.Build.0 = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.Build.0 = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.Build.0 = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x64.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x86.ActiveCfg = Debug|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.Build.0 = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x64.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x86.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.Build.0 = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.ActiveCfg = Release|Any CPU
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -670,6 +692,7 @@ Global
 		{CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
 		{A091777D-66B3-42E1-B95C-85322DE40706} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 		{A641A208-2974-4E48-BCFF-54E3AAFA4FB9} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+		{28055B05-25D4-4F17-9F36-A1D09FDDA607} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/build/build.msbuild b/build/build.msbuild
deleted file mode 100644
index c97f1a53b5..0000000000
--- a/build/build.msbuild
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<Project ToolsVersion="12.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
-   <Import Project="$(MSBuildThisFileDirectory)\Build.Settings" /> 
-
-   <ItemGroup> 
-     <Projects Include="$(SolutionDir)\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" /> 
-     <Projects Include="$(SolutionDir)\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" /> 
-     <Projects Include="$(SolutionDir)\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
-     <Projects Include="$(SolutionDir)\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" /> 
-     <Projects Include="$(SolutionDir)\test\CommonLibTests\CommonLibTests.vcxproj">
-   </ItemGroup> 
- 
-   <Target Name="Build">
-     <MSBuild Targets="$(BuildTargets)" 
-       Projects="@(Projects)" 
-       Properties="Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)" /> 
-   </Target> 
-
-   <Target Name="Clean"> 
-     <MSBuild Targets="Clean" 
-       Projects="@(Projects)" /> 
-   </Target> 
- 
-   <Target Name="Rebuild"> 
-     <MSBuild Targets="Clean;Build" 
-       Projects="$(MSBuildProjectFile)" 
-       Properties="BuildTargets=Rebuild;Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)"/> 
-   </Target> 
-
-   <Target Name="Test" DependsOnTargets="Build"> 
-     <!-- once we have test project ready, we should add executions to run the test post build-->
-   </Target> 
-   <Import Project="Config.Definitions.Props" /> 
- </Project> 
diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy
index 35bb4737ae..cc42e9ab4f 100644
--- a/build/buildpipeline/windows.groovy
+++ b/build/buildpipeline/windows.groovy
@@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') {
     stage ('Build') {
         def logFolder = getLogFolder()
         def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'"
-        bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";"
+        bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";"
     }
 }
diff --git a/build/dependencies.props b/build/dependencies.props
index 0c79d2d27c..00e1e18cdf 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -54,6 +54,18 @@
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
   <PropertyGroup Label="Package Versions: Pinned" />
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+  <PropertyGroup Label="Package Versions: Backward compatibility" >
+    <MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
+    <MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="Package Versions: 2.1 build" >
+    <MicrosoftAspNetCoreAuthenticationCore21PackageVersion>2.1.0</MicrosoftAspNetCoreAuthenticationCore21PackageVersion>
+    <MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreHostingAbstractions21PackageVersion>
+    <MicrosoftAspNetCoreHttpSysSources21PackageVersion>2.1.0</MicrosoftAspNetCoreHttpSysSources21PackageVersion>
+    <SystemIOPipelines21PackageVersion>4.5.2</SystemIOPipelines21PackageVersion>
+    <SystemSecurityPrincipalWindows21PackageVersion>4.5.0</SystemSecurityPrincipalWindows21PackageVersion>
+  </PropertyGroup>
 </Project>
diff --git a/build/functional-test-assets.targets b/build/functional-test-assets.targets
new file mode 100644
index 0000000000..81fb82b4a3
--- /dev/null
+++ b/build/functional-test-assets.targets
@@ -0,0 +1,10 @@
+<Project>
+  <Import Project="assets.props"/>
+  <Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="$(PackNativeAssets) == 'true'">
+      <ItemGroup>
+        <None Include="%(RunShimComponents.DllLocation)" CopyToOutputDirectory="PreserveNewest" Link="%(RunShimComponents.Platform)\%(RunShimComponents.PackageSubPath)%(RunShimComponents.NativeAsset).dll" />
+
+        <None Include="%(RunShimComponents.PdbLocation)" CopyToOutputDirectory="PreserveNewest" Link="%(RunShimComponents.Platform)\%(RunShimComponents.PackageSubPath)%(RunShimComponents.NativeAsset).pdb" />
+      </ItemGroup>
+    </Target>
+</Project>
diff --git a/build/repo.props b/build/repo.props
index a0d69a9923..83212e12d6 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -2,7 +2,6 @@
   <Import Project="dependencies.props" />
 
   <PropertyGroup>
-    <AssemblySigningCertName>Microsoft400</AssemblySigningCertName>
     <AncmZipOutputPath>$(BuildDir)AspNetCoreModule.zip</AncmZipOutputPath>
     <StressTestWebSiteZipOutputPath>$(BuildDir)StressTestWebSite.zip</StressTestWebSiteZipOutputPath>
   </PropertyGroup>
@@ -13,6 +12,18 @@
     <ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(SkipIISTests)' == 'true'" >
+      <ExcludeFromTest Include="$(RepositoryRoot)test\IIS.FunctionalTests\*.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SkipIISExpressTests)' == 'true'" >
+      <ExcludeFromTest Include="$(RepositoryRoot)test\IISExpress.FunctionalTests\*.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SkipIISBackwardsCompatibilityTests)' == 'true'" >
+      <ExcludeFromTest Include="$(RepositoryRoot)test\IIS.BackwardsCompatibility.FunctionalTests\*.csproj" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
diff --git a/build/repo.targets b/build/repo.targets
index 5b63ccb152..3e937d6bf9 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -35,22 +35,28 @@
   </Target>
 
   <Target Name="GetNativeArtifactsInfo">
+    <PropertyGroup>
+      <AncmPackageOutputPath>$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg</AncmPackageOutputPath>
+      <AncmV2PackageOutputPath>$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg</AncmV2PackageOutputPath>
+    </PropertyGroup>
+
     <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
+      <ArtifactInfo Include="$(AncmPackageOutputPath)">
         <ArtifactType>NuGetPackage</ArtifactType>
         <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
         <Version>$(PackageVersion)</Version>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
       </ArtifactInfo>
-      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
+      <FilesToSign Include="$(AncmPackageOutputPath)" Certificate="$(PackageSigningCertName)" />
+      <FilesToSign Include="$(RepositoryRoot)tools\installancm.ps1" Container="$(AncmPackageOutputPath)" Certificate="$(PowerShellSigningCertName)" />
 
-      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg">
+      <ArtifactInfo Include="$(AncmV2PackageOutputPath)">
         <ArtifactType>NuGetPackage</ArtifactType>
         <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
         <Version>$(PackageVersion)</Version>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
       </ArtifactInfo>
-      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
+      <FilesToSign Include="$(AncmV2PackageOutputPath)" Certificate="$(PackageSigningCertName)" />
 
       <ArtifactInfo Include="$(AncmZipOutputPath)">
         <ArtifactType>ZipArchive</ArtifactType>
@@ -66,7 +72,7 @@
 
       <FilesToSign Include="$(AncmZipOutputPath)" Certificate="None" IsContainer="true" />
       <FilesToExcludeFromSigning Include="$(StressTestWebSiteZipOutputPath)" />
-      <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
+      <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(AncmV2PackageOutputPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/build/testsite.props b/build/testsite.props
index 1ef6bf81cc..74f205b4cf 100644
--- a/build/testsite.props
+++ b/build/testsite.props
@@ -23,7 +23,6 @@
     <NativeFolder>x64</NativeFolder>
   </PropertyGroup>
 
-
   <PropertyGroup>
     <!-- For standalone publish, all dlls are flattened to the same folder.
          Set the base path to the request handler
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 27b605e3c6..c8a05de2fc 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 version:3.0.0-alpha1-20181011.11
 commithash:f57aa8ddda0abdd74ada55853587bedb4f364065
+=======
+version:2.2.0-preview2-20181019.5
+commithash:84a1c04b13bd7127728fee91989db8f2f58c8781
+>>>>>>> 61f1a70784dc0a32cf98f8ddd169c0293b0390ab
diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
index fb29b1adf5..bc33d6121c 100644
--- a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
@@ -38,8 +38,7 @@
 
     <file src="src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml"/>
     <file src="src\AspNetCoreModuleV2\AspNetCore\ancm.mof" />
-    <file src="tools\installancm.ps1"/>
     <file src="LICENSE.txt"/>
     <file src="$AspNetCoreModuleV2Props$" target="build\" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
index f6745768a7..69aa0d440a 100644
--- a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
+++ b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
@@ -63,13 +63,15 @@ private:
         {
             HRSRC rc = nullptr;
             HGLOBAL rcData = nullptr;
-            const char* data = nullptr;
+            std::string data;
+            const char* pTempData = nullptr;
 
             THROW_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML));
             THROW_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc));
             auto const size = SizeofResource(module, rc);
             THROW_LAST_ERROR_IF(size == 0);
-            THROW_LAST_ERROR_IF_NULL(data = static_cast<const char*>(LockResource(rcData)));
+            THROW_LAST_ERROR_IF_NULL(pTempData = static_cast<const char*>(LockResource(rcData)));
+            data = std::string(pTempData, size);
 
             auto additionalErrorLink = Environment::GetEnvironmentVariableValue(L"ANCM_ADDITIONAL_ERROR_PAGE_LINK");
             std::string additionalHtml;
diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h
index 40b3b821c7..3adc8863a4 100644
--- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h
+++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h
@@ -22,8 +22,8 @@ std::wstring format(const std::wstring& format, Args ... args)
     if (!format.empty())
     {
         const size_t size = swprintf(nullptr, 0, format.c_str(), args ...); // Extra char for '\0'
-        result.resize(size + 1);
-        if (swprintf(result.data(), result.size(), format.c_str(), args ... ) == -1)
+        result.resize(size);
+        if (swprintf(result.data(), result.size() + 1, format.c_str(), args ... ) == -1)
         {
             throw std::system_error(std::error_code(errno, std::system_category()));
         }
@@ -39,8 +39,8 @@ std::string format(const std::string& format, Args ... args)
     if (!format.empty())
     {
         const size_t size = snprintf(nullptr, 0, format.c_str(), args ...); // Extra char for '\0'
-        result.resize(size + 1);
-        if (snprintf(result.data(), result.size(), format.c_str(), args ... ) == -1)
+        result.resize(size);
+        if (snprintf(result.data(), result.size() + 1, format.c_str(), args ... ) == -1)
         {
             throw std::system_error(std::error_code(errno, std::system_category()));
         }
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs
index bfe44d634c..e945500672 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs
@@ -184,11 +184,11 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
             }
         }
 
-        private void AbortIO()
+        private bool AbortIO()
         {
             if (Interlocked.CompareExchange(ref _requestAborted, 1, 0) != 0)
             {
-                return;
+                return false;
             }
 
             _bodyOutput.Dispose();
@@ -208,6 +208,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
                     }
                 });
             }
+
+            return true;
         }
 
         public void Abort(Exception reason)
@@ -221,8 +223,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
 
         internal void ConnectionReset()
         {
-            AbortIO();
-            Log.ConnectionDisconnect(_logger, ((IHttpConnectionFeature)this).ConnectionId);
+            if (AbortIO())
+            {
+                Log.ConnectionDisconnect(_logger, ((IHttpConnectionFeature)this).ConnectionId);
+            }
         }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
index e7a01b331d..f169cebf77 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
@@ -52,7 +52,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
             {
                 if (_stopped)
                 {
-                    throw new IOException("IO stopped", NativeMethods.ERROR_OPERATION_ABORTED);
+                    // Abort all operation after IO was stopped
+                    ioOperation.Complete(NativeMethods.ERROR_OPERATION_ABORTED, 0);
+                    return;
                 }
 
                 if (_runningOperation != null)
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
index 22d494a606..53145c2b29 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
@@ -18,7 +18,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.HttpSys.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreHttpSysSourcesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Buffers.MemoryPool.Sources" Version="$(MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
 
+  <ItemGroup Condition="'$(BuildServerIIS21)' != 'true'">
     <PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
 
@@ -27,6 +29,16 @@
     <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion)" />
   </ItemGroup>
 
+
+  <ItemGroup Condition="'$(BuildServerIIS21)' == 'true'">
+    <PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelines21PackageVersion)" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindows21PackageVersion)" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCore21PackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractions21PackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(VCTargetsPath)' != ''">
     <ProjectReference Include="..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" >
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index f0332ef10b..bdfe8abfa9 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -24,39 +24,24 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(VCTargetsPath)' != ''">
-    <ProjectReference Include="..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" >
+    <ProjectReference Include="..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" >
+    <ProjectReference Include="..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj " >
+    <ProjectReference Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj ">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
 
   <Target Name="AddPackNativeComponents" BeforeTargets="_GetPackageFiles;GetSignedPackageFiles" Condition="$(PackNativeAssets) == 'true'">
     <ItemGroup>
-      <Content Include="%(ShimComponents.DllLocation)"
-            PackageCopyToOutput="true"
-            PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)"/>
+      <Content Include="%(ShimComponents.DllLocation)" PackageCopyToOutput="true" PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)" />
 
-      <SignedPackageFile Include="%(ShimComponents.DllLocation)"
-                         PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)%(ShimComponents.NativeAsset).dll"
-                         Certificate="$(AssemblySigningCertName)" />
+      <SignedPackageFile Include="%(ShimComponents.DllLocation)" PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)%(ShimComponents.NativeAsset).dll" Certificate="$(AssemblySigningCertName)" />
 
     </ItemGroup>
   </Target>
-
-  <Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="$(PackNativeAssets) == 'true'">
-    <ItemGroup>
-      <None Include="%(RunShimComponents.DllLocation)"
-            CopyToOutputDirectory="PreserveNewest"
-            Link="%(RunShimComponents.Platform)\%(RunShimComponents.PackageSubPath)%(RunShimComponents.NativeAsset).dll" />
-
-      <None Include="%(RunShimComponents.PdbLocation)"
-            CopyToOutputDirectory="PreserveNewest"
-            Link="%(RunShimComponents.Platform)\%(RunShimComponents.PackageSubPath)%(RunShimComponents.NativeAsset).pdb" />
-    </ItemGroup>
-  </Target>
+  
 </Project>
diff --git a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
index 6b0e0b93b2..936ad852ac 100644
--- a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
-        public async Task IncludesAdditionalErrorPageTextInProcessHandlerLoadFailure()
+        public async Task IncludesAdditionalErrorPageTextInProcessHandlerLoadFailure_CorrectString()
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true);
             var response = await DeployAppWithStartupFailure(deploymentParameters);
@@ -33,13 +33,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
             StopServer();
 
-            Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync());
+            var responseString = await response.Content.ReadAsStringAsync();
+            Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", responseString);
+            VerifyNoExtraTrailingBytes(responseString);
+
             await AssertLink(response);
         }
 
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
-        public async Task IncludesAdditionalErrorPageTextOutOfProcessStartupFailure()
+        public async Task IncludesAdditionalErrorPageTextOutOfProcessStartupFailure_CorrectString()
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true);
             var response = await DeployAppWithStartupFailure(deploymentParameters);
@@ -48,13 +51,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
             StopServer();
 
-            Assert.Contains("HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure", await response.Content.ReadAsStringAsync());
+            var responseString = await response.Content.ReadAsStringAsync();
+            Assert.Contains("HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure", responseString);
+            VerifyNoExtraTrailingBytes(responseString);
+
             await AssertLink(response);
         }
 
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
-        public async Task IncludesAdditionalErrorPageTextOutOfProcessHandlerLoadFailure()
+        public async Task IncludesAdditionalErrorPageTextOutOfProcessHandlerLoadFailure_CorrectString()
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true);
             deploymentParameters.HandlerSettings["handlerVersion"] = "88.93";
@@ -67,13 +73,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
             StopServer();
 
-            Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", await response.Content.ReadAsStringAsync());
+            var responseString = await response.Content.ReadAsStringAsync();
+            Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", responseString);
+            VerifyNoExtraTrailingBytes(responseString);
+
             await AssertLink(response);
         }
 
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
-        public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure()
+        public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure_CorrectString()
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true);
             deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn");
@@ -86,10 +95,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
             StopServer();
 
-            Assert.Contains("HTTP Error 500.30 - ANCM In-Process Start Failure", await response.Content.ReadAsStringAsync());
+            var responseString = await response.Content.ReadAsStringAsync();
+            Assert.Contains("HTTP Error 500.30 - ANCM In-Process Start Failure", responseString);
+            VerifyNoExtraTrailingBytes(responseString);
+
             await AssertLink(response);
         }
 
+        private static void VerifyNoExtraTrailingBytes(string responseString)
+        {
+            if (!DeployerSelector.IsBackwardsCompatiblityTest)
+            {
+                Assert.EndsWith("</html>\r\n", responseString);
+            }
+        }
+
         private static async Task AssertLink(HttpResponseMessage response)
         {
             Assert.Contains("<a href=\"http://example\"> <cite> http://example </cite></a> and ", await response.Content.ReadAsStringAsync());
diff --git a/test/IIS.FunctionalTests/Inprocess/StartupTests.cs b/test/Common.FunctionalTests/Inprocess/StartupTests.cs
similarity index 100%
rename from test/IIS.FunctionalTests/Inprocess/StartupTests.cs
rename to test/Common.FunctionalTests/Inprocess/StartupTests.cs
diff --git a/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
index cb76b503c5..f9e6836b6f 100644
--- a/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
+++ b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
@@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
+        [RequiresNewShim]
         public async Task GlobalVersion_EnvironmentVariableWorks()
         {
             var temporaryFile = Path.GetTempFileName();
diff --git a/test/CommonLibTests/utility_tests.cpp b/test/CommonLibTests/utility_tests.cpp
index 567e47762b..ee69d79054 100644
--- a/test/CommonLibTests/utility_tests.cpp
+++ b/test/CommonLibTests/utility_tests.cpp
@@ -3,6 +3,7 @@
 
 #include "stdafx.h"
 #include "Environment.h"
+#include "StringHelpers.h"
 
 TEST(PassUnexpandedEnvString, ExpandsResult)
 {
@@ -58,3 +59,17 @@ TEST(GetEnvironmentVariableValue, ReturnsNulloptWhenNotFound)
     auto result = Environment::GetEnvironmentVariableValue(L"RANDOM_ENV_VAR_2");
     EXPECT_FALSE(result.has_value());
 }
+
+TEST(CheckStringHelpers, FormatWithoutContentDoesNotIncreaseSizeString)
+{
+    std::string testString = "test";
+    auto result = format(testString);
+    EXPECT_EQ(testString.size(), result.size());
+}
+
+TEST(CheckStringHelpers, FormatWithoutContentDoesNotIncreaseSizeWstring)
+{
+    std::wstring testString = L"test";
+    auto result = format(testString);
+    EXPECT_EQ(testString.size(), result.size());
+}
diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
new file mode 100644
index 0000000000..a7243b0272
--- /dev/null
+++ b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    [Collection(PublishedSitesCollection.Name)]
+    public class BackwardsCompatibilityTests : IISFunctionalTestBase
+    {
+        private readonly PublishedSitesFixture _fixture;
+
+        public BackwardsCompatibilityTests(PublishedSitesFixture fixture)
+        {
+            _fixture = fixture;
+        }
+
+        [ConditionalFact]
+        public async Task CheckBackwardsCompatibilityIsUsed()
+        {
+            var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true);
+            iisDeploymentParameters.PreservePublishedApplicationForDebugging = true;
+            var deploymentResult = await DeployAsync(iisDeploymentParameters);
+
+            var arch = iisDeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\aspnetcorev2.dll" : $@"x86\aspnetcorev2.dll";
+
+            var fileInfo = FileVersionInfo.GetVersionInfo(Path.Combine(AppContext.BaseDirectory, arch));
+            var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld");
+            var handles = deploymentResult.HostProcess.Modules;
+            foreach (ProcessModule handle in handles)
+            {
+                if (handle.ModuleName == "aspnetcorev2.dll")
+                {
+                    Assert.Equal("12.2.18283.0", handle.FileVersionInfo.FileVersion);
+                    return;
+                }
+            }
+            throw new XunitException($"Could not find aspnetcorev2.dll loaded in process {deploymentResult.HostProcess.ProcessName}");
+        }
+    }
+}
diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
new file mode 100644
index 0000000000..b6dc197e8a
--- /dev/null
+++ b/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    public static class DeployerSelector
+    {
+        public static ServerType ServerType => ServerType.IIS;
+        public static bool IsBackwardsCompatiblityTest => true;
+    }
+}
diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
new file mode 100644
index 0000000000..58708fa85f
--- /dev/null
+++ b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <TestGroupName>IISBackwardsCompatibility.FunctionalTests</TestGroupName>
+    <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="..\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
+    <ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
+    <ProjectReference Include="..\WebSites\InProcessWebSite\InProcessWebSite.csproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\WebSites\StressTestWebSite\StressTestWebSite.csproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Common.FunctionalTests\**\*.cs" />
+    <Compile Include="..\IIS.Shared.FunctionalTests\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
+    <PackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="AppHostConfig\HostableWebCore.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="AppHostConfig\HostableWebCore.config">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs
new file mode 100644
index 0000000000..f14085b05b
--- /dev/null
+++ b/test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    public sealed class RequiresNewShimAttribute : Attribute, ITestCondition
+    {
+        public bool IsMet => false;
+
+        public string SkipReason => "Test verifies new behavior in the aspnetcorev2.dll that isn't supported in earlier versions.";
+    }
+}
diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/test/IIS.FunctionalTests/DeployerSelector.cs
index 2032b716b9..2359de7226 100644
--- a/test/IIS.FunctionalTests/DeployerSelector.cs
+++ b/test/IIS.FunctionalTests/DeployerSelector.cs
@@ -8,5 +8,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
     public static class DeployerSelector
     {
         public static ServerType ServerType => ServerType.IIS;
+        public static bool IsBackwardsCompatiblityTest => false;
     }
 }
diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
index 0114f027ca..47c316f65a 100644
--- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
+++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -26,8 +26,11 @@
 
   <ItemGroup>
     <Compile Include="..\Common.FunctionalTests\**\*.cs" />
+    <Compile Include="..\IIS.Shared.FunctionalTests\**\*.cs" />
   </ItemGroup>
 
+  <Import Project="..\..\build\functional-test-assets.targets" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
diff --git a/test/IIS.FunctionalTests/RequiresNewShim.cs b/test/IIS.FunctionalTests/RequiresNewShim.cs
new file mode 100644
index 0000000000..1765ba2d1e
--- /dev/null
+++ b/test/IIS.FunctionalTests/RequiresNewShim.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    public sealed class RequiresNewShimAttribute : Attribute, ITestCondition
+    {
+        public bool IsMet => true;
+
+        public string SkipReason => "IIS.FunctionalTests always run against new shim.";
+    }
+}
diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
similarity index 100%
rename from test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
rename to test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
diff --git a/test/IIS.FunctionalTests/MofFileTests.cs b/test/IIS.Shared.FunctionalTests/MofFileTests.cs
similarity index 100%
rename from test/IIS.FunctionalTests/MofFileTests.cs
rename to test/IIS.Shared.FunctionalTests/MofFileTests.cs
diff --git a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs b/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 82%
rename from test/IIS.FunctionalTests/Properties/AssemblyInfo.cs
rename to test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
index 9941a6b5a5..b26f48a815 100644
--- a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs
+++ b/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 [assembly: RequiresIIS]
-
+[assembly: ShortClassName]
diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
similarity index 99%
rename from test/IIS.FunctionalTests/RequiresIISAttribute.cs
rename to test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
index 6c47c4d090..cfbbf70486 100644
--- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs
+++ b/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
@@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         public RequiresIISAttribute()
-            : this (IISCapability.None) { }
+            : this(IISCapability.None) { }
 
         public RequiresIISAttribute(IISCapability capabilities)
         {
diff --git a/test/IIS.FunctionalTests/ServicesTests.cs b/test/IIS.Shared.FunctionalTests/ServicesTests.cs
similarity index 100%
rename from test/IIS.FunctionalTests/ServicesTests.cs
rename to test/IIS.Shared.FunctionalTests/ServicesTests.cs
diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs
index d8c7d4ef89..dbe562aa7c 100644
--- a/test/IIS.Tests/ClientDisconnectTests.cs
+++ b/test/IIS.Tests/ClientDisconnectTests.cs
@@ -2,13 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
-using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
@@ -207,8 +205,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                 }
                 Assert.IsType<OperationCanceledException>(exception);
             }
-
-            AssertConnectionDisconnectLog();
         }
 
         [ConditionalFact]
@@ -289,7 +285,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         private void AssertConnectionDisconnectLog()
         {
-            Assert.Contains(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect");
+            Assert.Single(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect");
         }
 
         private static async Task SendContentLength1Post(TestConnection connection)
diff --git a/test/IIS.Tests/IIS.Tests.csproj b/test/IIS.Tests/IIS.Tests.csproj
index 614a286626..3fdb2a5363 100644
--- a/test/IIS.Tests/IIS.Tests.csproj
+++ b/test/IIS.Tests/IIS.Tests.csproj
@@ -1,16 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
   </PropertyGroup>
 
-  <Import Project="..\..\build\assets.props" />
+  <Import Project="..\..\build\functional-test-assets.targets" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj" />
     <ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
   </ItemGroup>
 
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
diff --git a/test/IIS.Tests/TestServerTest.cs b/test/IIS.Tests/TestServerTest.cs
index c168af99d8..40b538ea52 100644
--- a/test/IIS.Tests/TestServerTest.cs
+++ b/test/IIS.Tests/TestServerTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
     [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
-    public class TestServerTest : LoggedTest
+    public class TestServerTest : StrictTestServerTests
     {
         [ConditionalFact]
         public async Task SingleProcessTestServer_HelloWorld()
diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/test/IISExpress.FunctionalTests/DeployerSelector.cs
index 5344cbacf0..c21900e0fb 100644
--- a/test/IISExpress.FunctionalTests/DeployerSelector.cs
+++ b/test/IISExpress.FunctionalTests/DeployerSelector.cs
@@ -8,5 +8,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
     public static class DeployerSelector
     {
         public static ServerType ServerType => ServerType.IISExpress;
+        public static bool IsBackwardsCompatiblityTest => false;
     }
 }
diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
index e62095f98f..ff8fd55afb 100644
--- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
+++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -21,6 +21,8 @@
     <Compile Include="..\Common.FunctionalTests\**\*.cs" />
   </ItemGroup>
 
+  <Import Project="..\..\build\functional-test-assets.targets" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
diff --git a/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
index a3ad8b187e..b26f48a815 100644
--- a/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
+++ b/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
@@ -2,7 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
+using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 [assembly: RequiresIIS]
+[assembly: ShortClassName]
diff --git a/test/IISExpress.FunctionalTests/RequiresNewShim.cs b/test/IISExpress.FunctionalTests/RequiresNewShim.cs
new file mode 100644
index 0000000000..a43e9b8da7
--- /dev/null
+++ b/test/IISExpress.FunctionalTests/RequiresNewShim.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    public sealed class RequiresNewShimAttribute : Attribute, ITestCondition
+    {
+        public bool IsMet => true;
+
+        public string SkipReason => "IISExpress.FunctionalTests always run against new shim.";
+    }
+}
diff --git a/version.props b/version.props
index 4c37bb8777..fa5e09df09 100644
--- a/version.props
+++ b/version.props
@@ -8,6 +8,16 @@
     <AspNetCoreModuleVersionMinor>$(DotNetMinorVersion)</AspNetCoreModuleVersionMinor>
     <AspNetCoreModuleVersionRevision>$(DotNetPatchVersion)</AspNetCoreModuleVersionRevision>
     <VersionSuffix>alpha1</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildServerIIS21)' == 'true'">ancm-oob</VersionSuffix>
+    <DotNetMajorVersion>2</DotNetMajorVersion>
+    <DotNetMinorVersion>2</DotNetMinorVersion>
+    <DotNetMinorVersion Condition="'$(BuildServerIIS21)' == 'true'">1</DotNetMinorVersion>
+    <DotNetPatchVersion>0</DotNetPatchVersion>
+    <VersionPrefix>$(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion)</VersionPrefix>
+    <AspNetCoreModuleVersionMajor>12</AspNetCoreModuleVersionMajor>
+    <AspNetCoreModuleVersionMinor>2</AspNetCoreModuleVersionMinor>
+    <AspNetCoreModuleVersionRevision>$(DotNetPatchVersion)</AspNetCoreModuleVersionRevision>
+    <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>

From c5c7f921faa4cf1730c2ef708a12d8d23f22809e Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Tue, 23 Oct 2018 10:56:45 -0700
Subject: [PATCH 2/2] Fix korebuild-lock.txt changes

---
 korebuild-lock.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index c8a05de2fc..27b605e3c6 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version:3.0.0-alpha1-20181011.11
 commithash:f57aa8ddda0abdd74ada55853587bedb4f364065
-=======
-version:2.2.0-preview2-20181019.5
-commithash:84a1c04b13bd7127728fee91989db8f2f58c8781
->>>>>>> 61f1a70784dc0a32cf98f8ddd169c0293b0390ab