diff --git a/build/artifacts.props b/build/artifacts.props
index f8e9e9b507..d69b642bdf 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -94,8 +94,6 @@ This can be done once #4246 is complete, and done in conjunction with converting
       <PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
 
     <!-- This packages are produce for testing purposes only. -->
-      <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
-      <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
       <PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Category="noship" />
       <PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
 
diff --git a/build/repo.props b/build/repo.props
index 28b1b9b521..ec96979315 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -65,8 +65,6 @@
     </When>
     <Otherwise>
       <ItemGroup Condition=" '$(BuildWindowsInstallers)' == 'true' ">
-        <ProjectToBuild Include="$(RepositoryRoot)src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj" />
-
         <!-- Build the ANCM custom action -->
         <ProjectToBuild Include="$(RepositoryRoot)src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
         <ProjectToBuild Include="$(RepositoryRoot)src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x86" />
diff --git a/eng/targets/ResolveIisReferences.targets b/eng/targets/ResolveIisReferences.targets
index 0449352d7b..4beec3df91 100644
--- a/eng/targets/ResolveIisReferences.targets
+++ b/eng/targets/ResolveIisReferences.targets
@@ -8,30 +8,13 @@ with the right MSBuild incantations to get output copied to the right place.
   <Choose>
     <!-- IIS native projects only build on Windows with MSBuild.exe -->
     <When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">
-      <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' ">
-        <Reference Remove="AspNetCoreModule" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64"  />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86"  />
-      </ItemGroup>
-
-      <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
-        <Reference Remove="AspNetCoreModuleV2" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"  Platform="x64" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0"  Platform="x64" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"  Platform="x64" />
-
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
-        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
-      </ItemGroup>
-
       <ItemGroup Condition="@(NativeProjectReference->Count()) != 0 AND '$(BuildNative)' != 'false' ">
         <!-- TODO: investigate building just one arch at a time. -->
         <ProjectReference Include="@(NativeProjectReference)">
           <!-- Set the arch-->
           <SetPlatform>Platform=%(Platform)</SetPlatform>
           <!-- The base path for the output. -->
-           <LinkBase>%(Platform)\%(HandlerPath)\</LinkBase>
+          <LinkBase>%(Platform)\%(HandlerPath)\</LinkBase>
           <!-- This reference assembly doesn't need -->
           <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
           <!-- NativeContent is a custom type of item group which is assigned a target path after project references are resolved.  -->
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
index 4ffaaa5e94..f4abe4ea34 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
@@ -36,15 +36,6 @@
     <?define SchemaGuid = "61134449-1DA9-447F-8F2A-DCE91C757629" ?>
 <?endif ?>
 
-<!-- ANCM dlls must be provided in specified root folder -->
-<?if $(var.PreBuiltANCMRoot) = "" ?>
-  <?error PreBuiltANCMRoot must be defined ?>
-<?endif?>
-
-<?define AspNetCoreTargetPath = "$(var.PreBuiltANCMRoot)$(var.Platform)\aspnetcore.dll" ?>
-<?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMRoot)x86\aspnetcore.dll" ?>
-<?define AspNetCoreSchemaPath = "$(var.PreBuiltANCMSchema)aspnetcore_schema.xml" ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
     <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreIISExpressModuleProductName)"
@@ -170,7 +161,7 @@
             <Component Id="AspNetCoreModule" Guid="A1D9FE60-0486-4ED9-AEC7-6544B827B1AE" Win64="$(var.IsWin64)">
                 <File Id="AspNetCoreModuleDll"
                       Name="aspnetcore.dll"
-                      Source="$(var.AspNetCoreTargetPath)"
+                      Source="$(var.AspNetCoreV1TargetPath)"
                       DiskId="1"
                       Vital="yes">
                 </File>
@@ -200,7 +191,7 @@
                         <Component Id="AspNetCoreModule.wow" Guid="F16FBAF7-4A51-4FB4-AB17-FE02548A6C7E" Win64="no">
                             <File Id="AspNetCoreModuleDll.wow"
                                     Name="aspnetcore.dll"
-                                    Source="$(var.AspNetCoreWoW64TargetPath)"
+                                    Source="$(var.AspNetCoreV2WoW64TargetPath)"
                                     DiskId="1"
                                     Vital="yes">
                             </File>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
index 62c90523f3..027db61965 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
@@ -38,17 +38,6 @@
     <?define SchemaGuid = "e629b31a-3d56-4b5c-959c-586fc1c55599" ?>
 <?endif ?>
 
-<!-- ANCM dlls must be provided in specified root folder -->
-<?if $(var.PreBuiltANCMV2Root) = "" ?>
-  <?error PreBuiltANCMV2Root must be defined ?>
-<?endif?>
-
-<?define AspNetCoreTargetPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\aspnetcorev2.dll" ?>
-<?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMV2Root)x86\aspnetcorev2.dll" ?>
-<?define AspNetCoreHandlerPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\$(var.ANCMOutOfProcessNugetPackageHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreHandlerWoW64Path = "$(var.PreBuiltANCMV2Root)x86\$(var.ANCMOutOfProcessNugetPackageHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreSchemaPath = "$(var.PreBuiltANCMV2Schema)aspnetcore_schema_v2.xml" ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
     <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreIISExpressModuleProductNameV2)"
@@ -175,7 +164,7 @@
             <Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
               <File Id="AspNetCoreModuleDll"
                     Name="aspnetcorev2.dll"
-                    Source="$(var.AspNetCoreTargetPath)"
+                    Source="$(var.AspNetCoreV2TargetPath)"
                     DiskId="1"
                     Vital="yes">
               </File>
@@ -188,7 +177,7 @@
               <Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
                 <File Id="AspNetCoreModuleHandlerDll"
                       Name="aspnetcorev2_outofprocess.dll"
-                      Source="$(var.AspNetCoreHandlerPath)"
+                      Source="$(var.AspNetCoreV2HandlerTargetPath)"
                       DiskId="1"
                       Vital="yes">
                 </File>
@@ -218,7 +207,7 @@
                 <Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Win64="no">
                   <File Id="AspNetCoreModuleDll.wow"
                         Name="aspnetcorev2.dll"
-                        Source="$(var.AspNetCoreWoW64TargetPath)"
+                        Source="$(var.AspNetCoreV2WoW64TargetPath)"
                         DiskId="1"
                         Vital="yes">
                   </File>
@@ -231,7 +220,7 @@
                   <Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Win64="no">
                     <File Id="AspNetCoreModuleHandlerDll.wow"
                           Name="aspnetcorev2_outofprocess.dll"
-                          Source="$(var.AspNetCoreHandlerWoW64Path)"
+                          Source="$(var.AspNetCoreV2HandlerWoW64TargetPath)"
                           DiskId="1"
                           Vital="yes">
                     </File>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj
deleted file mode 100644
index 16cace9755..0000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <RestorePackagesPath>$(RepositoryRoot).deps\ANCM</RestorePackagesPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Remove="Internal.AspNetCore.Sdk" />
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <RestoreSources Condition="Exists('$(RepositoryRoot).deps\ANCM')">
-      $(RestoreSources);
-      $(RepositoryRoot).deps\ANCM;
-    </RestoreSources>
-  </PropertyGroup>
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Target Name="Build" />
-</Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
index e589ae342c..e282a257a9 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
@@ -24,15 +24,6 @@
 <?define PlatformValue = "x86" ?>
 <?endif?>
 
-<!-- ANCM dlls must be provided in specified root folder -->
-<?if $(var.PreBuiltANCMRoot) = "" ?>
-  <?error PreBuiltANCMRoot must be defined ?>
-<?endif?>
-
-<?define AspNetCoreTargetPath = "$(var.PreBuiltANCMRoot)$(var.Platform)\aspnetcore.dll" ?>
-<?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMRoot)x86\aspnetcore.dll" ?>
-<?define AspNetCoreSchemaPath = "$(var.PreBuiltANCMSchema)aspnetcore_schema.xml" ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
     <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreModuleProductName)"
@@ -132,7 +123,7 @@
                     <Component Id="AspNetCoreModule" Guid="A1D9FE60-0486-4ED9-AEC7-6544B827B1AE" Win64="$(var.IsWin64)">
                         <File Id="AspNetCoreModuleDll"
                               Name="aspnetcore.dll"
-                              Source="$(var.AspNetCoreTargetPath)"
+                              Source="$(var.AspNetCoreV2TargetPath)"
                               DiskId="1"
                               Vital="yes">
                         </File>
@@ -173,7 +164,7 @@
                     <Component Id="AspNetCoreModule.wow" Guid="F16FBAF7-4A51-4FB4-AB17-FE02548A6C7E" Win64="no">
                         <File Id="AspNetCoreModuleDll.wow"
                                 Name="aspnetcore.dll"
-                                Source="$(var.AspNetCoreWoW64TargetPath)"
+                                Source="$(var.AspNetCoreV2WoW64TargetPath)"
                                 DiskId="1"
                                 Vital="yes">
                         </File>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
index de647f5237..3a6662c808 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
@@ -24,17 +24,6 @@
 <?define PlatformValue = "x86" ?>
 <?endif?>
 
-<!-- ANCM dlls must be provided in specified root folder -->
-<?if $(var.PreBuiltANCMV2Root) = "" ?>
-  <?error PreBuiltANCMV2Root must be defined ?>
-<?endif?>
-
-<?define AspNetCoreTargetPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\aspnetcorev2.dll" ?>
-<?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMV2Root)x86\aspnetcorev2.dll" ?>
-<?define AspNetCoreHandlerPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\$(var.ANCMOutOfProcessNugetPackageHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreHandlerWoW64Path = "$(var.PreBuiltANCMV2Root)x86\$(var.ANCMOutOfProcessNugetPackageHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreSchemaPath = "$(var.PreBuiltANCMV2Schema)aspnetcore_schema_v2.xml" ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
     <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreModuleProductNameV2)"
@@ -149,7 +138,7 @@
                            <Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
                                <File Id="AspNetCoreModuleV2Dll"
                                      Name="aspnetcorev2.dll"
-                                     Source="$(var.AspNetCoreTargetPath)"
+                                     Source="$(var.AspNetCoreV2TargetPath)"
                                      DiskId="1"
                                      Vital="yes">
                                </File>
@@ -163,7 +152,7 @@
                                <Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
                                    <File Id="AspNetCoreModuleHandlerDll"
                                          Name="aspnetcorev2_outofprocess.dll"
-                                         Source="$(var.AspNetCoreHandlerPath)"
+                                         Source="$(var.AspNetCoreV2HandlerTargetPath)"
                                          DiskId="1"
                                          Vital="yes">
                                    </File>
@@ -192,7 +181,7 @@
                             <Component Id="AspNetCoreModuleV2.wow" Guid="1b8ecba0-c002-442a-92c0-0fa9c0f21df4" Win64="no">
                                 <File Id="AspNetCoreModuleV2Dll.wow"
                                     Name="aspnetcorev2.dll"
-                                    Source="$(var.AspNetCoreWoW64TargetPath)"
+                                    Source="$(var.AspNetCoreV2WoW64TargetPath)"
                                     DiskId="1"
                                     Vital="yes">
                                 </File>
@@ -206,7 +195,7 @@
                                 <Component Id="AspNetCoreModuleHandler.wow" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
                                     <File Id="AspNetCoreModuleHandlerDll.wow"
                                           Name="aspnetcorev2_outofprocess.dll"
-                                          Source="$(var.AspNetCoreHandlerWoW64Path)"
+                                          Source="$(var.AspNetCoreV2HandlerWoW64TargetPath)"
                                           DiskId="1"
                                           Vital="yes">
                                     </File>
@@ -308,7 +297,7 @@
 
     <Fragment>
         <Binary Id="IISCustomActionDll" SourceFile="$(var.aspnetcoreCA.TargetPath)"/>
-        <Binary Id="AncmMofFile" SourceFile="$(var.PreBuiltANCMV2Schema)ancm.mof"/>
+        <Binary Id="AncmMofFile" SourceFile="$(var.AspNetCoreMofPath)"/>
     </Fragment>
 </Wix>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
index ada3840cee..1725636e1b 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
@@ -3,8 +3,6 @@
   <Import Project="$(RepositoryRoot)\.deps\dependencies.g.props" Condition="Exists('$(RepositoryRoot)\.deps\dependencies.g.props')" />
 
   <PropertyGroup>
-    <MicrosoftAspNetCoreAspNetCoreModulePackageVersion Condition="'$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)' == ''">$(PackageVersion)</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
-    <MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion Condition="'$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)' == ''">$(PackageVersion)</MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion>
 
     <!-- Build number used by ANCM msis -->
     <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
@@ -31,15 +29,46 @@
     <ANCMBuildDirectory>$(AspNetCoreSetupRoot)build\</ANCMBuildDirectory>
 
     <!-- Variables used by ANCM wxs projects. -->
-    <PreBuiltANCMSchema>$(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModule\$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)\</PreBuiltANCMSchema>
-    <PreBuiltANCMV2Schema>$(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModuleV2\$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)\</PreBuiltANCMV2Schema>
-    <PreBuiltANCMRoot>$(PreBuiltANCMSchema)contentFiles\any\any\</PreBuiltANCMRoot>
-    <PreBuiltANCMV2Root>$(PreBuiltANCMV2Schema)contentFiles\any\any\</PreBuiltANCMV2Root>
 
+    <_ServerIISBasePath>$(RepositoryRoot)\src\Servers\IIS\</_ServerIISBasePath>
     <DefineConstants>BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants)</DefineConstants>
     <DefineConstants>ANCMMsiVersion=$(ANCMMsiVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants)</DefineConstants>
-    <DefineConstants>PreBuiltANCMRoot=$(PreBuiltANCMRoot);PreBuiltANCMV2Root=$(PreBuiltANCMV2Root);$(DefineConstants)</DefineConstants>
-    <DefineConstants>PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants)</DefineConstants>
+    <DefineConstants>
+      AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml;
+      AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\ancm.mof;
+
+      AspNetCoreV1TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll;
+      AspNetCoreV1WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll;
+
+      AspNetCoreV2TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll;
+      AspNetCoreV2WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll;
+
+      AspNetCoreV2HandlerTargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.dll;
+      AspNetCoreV2HandlerWoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll;
+
+      $(DefineConstants)
+    </DefineConstants>
   </PropertyGroup>
 
+ <ItemGroup>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"  Platform="x64">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="x64">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="Win32">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"  Platform="Win32">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="Win32">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props
index 710f5553d0..f836b47097 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props
@@ -14,7 +14,6 @@
     <ClCompile>
       <StringPooling>true</StringPooling>
       <Optimization>Disabled</Optimization>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -22,7 +21,6 @@
       <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>/JMC-</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj
index beaee9e258..c354db8eb1 100644
--- a/src/MusicStore/samples/MusicStore/MusicStore.csproj
+++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj
@@ -13,11 +13,6 @@
     <Content Update="ForTesting\**\*" CopyToPublishDirectory="Never" Condition=" '$(PublishForTesting)' != 'true' " />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp' AND '$(Configuration)' == 'RuntimeStore' ">
     <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
   </ItemGroup>
diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
deleted file mode 100644
index 9b37939d97..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <!-- There is no build output -->
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- There are no symbols. -->
-    <IncludeSymbols>false</IncludeSymbols>
-    <!-- There is no API to check -->
-    <EnableApiCheck>false</EnableApiCheck>
-    <!-- Manually control dependencies -->
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <!-- The only build output of a pkgproj is the project -->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <!-- There is no documentation  -->
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <!-- There is no documentation  -->
-    <RunPackageAnalysis>false</RunPackageAnalysis>
-
-    <PackageId>$(MSBuildProjectName)</PackageId>
-    <TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
-  </PropertyGroup>
-
-  <Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
-    <ItemGroup>
-      <ArtifactInfo Include="$(TargetPath)">
-        <ArtifactType>NuGetPackage</ArtifactType>
-        <PackageId>$(PackageId)</PackageId>
-        <Version>$(PackageVersion)</Version>
-        <Certificate>$(PackageSigningCertName)</Certificate>
-        <ShouldBeSigned>true</ShouldBeSigned>
-        <IsContainer>true</IsContainer>
-      </ArtifactInfo>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
deleted file mode 100644
index ef1b44bc18..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <PackageId>$(MSBuildProjectName)</PackageId>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <PackageTags>aspnetcore</PackageTags>
-    <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
-    <Pack>true</Pack>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <PackageDescription>ASP.NET Core Module</PackageDescription>
-    <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/aspnetcore_schema.xml" />
-    <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props" PackagePath="build\" />
-    <Reference Include="AspNetCoreModule" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="_._" PackagePath="lib/$(TargetFramework)/" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <Target Name="CopyFilesToOutputDirectory" />
-  <Target Name="CoreCompile" DependsOnTargets="ResolveReferences" />
-  <Target Name="CreateManifestResourceNames" />
-</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props
deleted file mode 100644
index 4e6fbe80e8..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll</AspNetCoreModuleX64Location>
-    <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll</AspNetCoreModuleX86Location>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
deleted file mode 100644
index 3ccb87cc94..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <!-- There is no build output -->
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- There are no symbols. -->
-    <IncludeSymbols>false</IncludeSymbols>
-    <!-- There is no API to check -->
-    <EnableApiCheck>false</EnableApiCheck>
-    <!-- Manually control dependencies -->
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <!-- The only build output of a pkgproj is the project -->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <!-- There is no documentation  -->
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <!-- There is no documentation  -->
-    <RunPackageAnalysis>false</RunPackageAnalysis>
-
-    <TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
-  </PropertyGroup>
-
-  <Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
-    <ItemGroup>
-      <ArtifactInfo Include="$(TargetPath)">
-        <ArtifactType>NuGetPackage</ArtifactType>
-        <PackageId>$(PackageId)</PackageId>
-        <Version>$(PackageVersion)</Version>
-        <Certificate>$(PackageSigningCertName)</Certificate>
-        <ShouldBeSigned>true</ShouldBeSigned>
-        <IsContainer>true</IsContainer>
-      </ArtifactInfo>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in
deleted file mode 100644
index 7b3be4a261..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <AspNetCoreModuleOutOfProcessVersion>${AspNetCoreModuleOutOfProcessVersion}</AspNetCoreModuleOutOfProcessVersion>
-    <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2.dll</AspNetCoreModuleX64Location>
-    <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2.dll</AspNetCoreModuleX86Location>
-    <InProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX64Location>
-    <InProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX86Location>
-    <OutOfProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX64Location>
-    <OutOfProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX86Location>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
deleted file mode 100644
index 1cc9e02ba9..0000000000
--- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
+++ /dev/null
@@ -1,42 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <PackageId>$(MSBuildProjectName)</PackageId>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <PackageTags>aspnetcore</PackageTags>
-    <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
-    <Pack>true</Pack>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <PackageDescription>ASP.NET Core Module</PackageDescription>
-    <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x64" />
-
-    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x86/2.0.0" />
-    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x86/2.0.0" />
-    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x64/2.0.0" />
-    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x64/2.0.0" />
-
-    <Content Include="..\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/" />
-    <Content Include="..\AspNetCore\ancm.mof" PackagePath="/" />
-    <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props.in" PackagePath="build\" />
-    <Reference Include="AspNetCoreModuleV2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="_._" PackagePath="lib/$(TargetFramework)/" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <Target Name="CopyFilesToOutputDirectory" />
-  <Target Name="CoreCompile" DependsOnTargets="ResolveReferences" />
-  <Target Name="CreateManifestResourceNames" />
-</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index 897ebe80cd..985d1af857 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
     <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="Win32" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
index 9da5c35404..0d568e16e3 100644
--- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
@@ -24,8 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="AspNetCoreModule" Condition="'$(OS)' == 'Windows_NT'" />
-    <Reference Include="AspNetCoreModuleV2" Condition="'$(OS)' == 'Windows_NT'" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging" />
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
index 9f311d3264..91d014099e 100644
--- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -24,8 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="AspNetCoreModule" Condition="'$(OS)' == 'Windows_NT'" />
-    <Reference Include="AspNetCoreModuleV2" Condition="'$(OS)' == 'Windows_NT'" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
index 85af44807e..eb7d5e8539 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
@@ -12,8 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="AspNetCoreModule" Condition="'$(OS)' == 'Windows_NT'"/>
-    <Reference Include="AspNetCoreModuleV2" Condition="'$(OS)' == 'Windows_NT'"/>
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Server.IIS" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
index 2fb4c01737..ddb613fda7 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -24,8 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="AspNetCoreModule" Condition="'$(OS)' == 'Windows_NT'" />
-    <Reference Include="AspNetCoreModuleV2" Condition="'$(OS)' == 'Windows_NT'" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index fad9d07dea..86c6741dc0 100644
--- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -11,6 +11,7 @@
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
     <UseProjectReferences>true</UseProjectReferences>
     <IsPackable>true</IsPackable>
+    <AspNetCoreModuleOutOfProcessVersion>2.0.0</AspNetCoreModuleOutOfProcessVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\assets.props" />
@@ -31,9 +32,9 @@
     <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64"/>
     <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x64" />
 
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="Win32" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="Win32" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="Win32" />
   </ItemGroup>
 
   <Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(OS)' == 'Windows_NT'">
@@ -42,6 +43,13 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="AddPackNativeComponents" BeforeTargets="_GetPackageFiles;GetSignedPackageFiles" Condition="$(PackNativeAssets) == 'true'">
+    <ItemGroup>
+      <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)" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
     <Reference Include="Microsoft.NETCore.Windows.ApiSets" />
diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props
index f05a8f5251..20b2d7125e 100644
--- a/src/Servers/IIS/build/assets.props
+++ b/src/Servers/IIS/build/assets.props
@@ -9,263 +9,261 @@
     </PropertyGroup>
     <ItemGroup>
        <Components
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcore"
-          PropetyName="AspNetCoreModuleV1Shim"
-          BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcore" 
+          PropetyName="AspNetCoreModuleV1Shim" 
+          BaseOutputPath="AspNetCoreModuleV1" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
         />
         <Components
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcore"
-          PropetyName="AspNetCoreModuleV1Shim"
-          BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcore" 
+          PropetyName="AspNetCoreModuleV1Shim" 
+          BaseOutputPath="AspNetCoreModuleV1" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
         />
         <Components
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcorev2"
-          PropetyName="AspNetCoreModuleV2Shim"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcorev2" 
+          PropetyName="AspNetCoreModuleV2Shim" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
         />
         <Components
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcorev2"
-          PropetyName="AspNetCoreModuleV2Shim"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcorev2" 
+          PropetyName="AspNetCoreModuleV2Shim" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
         />
         <Components
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="InProcessRequestHandler.vcxproj"
-          NativeAsset="aspnetcorev2_inprocess"
-          PropetyName="AspNetCoreModuleV2InProcessHandler"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="InProcessRequestHandler.vcxproj" 
+          NativeAsset="aspnetcorev2_inprocess" 
+          PropetyName="AspNetCoreModuleV2InProcessHandler" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
         />
         <Components
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="InProcessRequestHandler.vcxproj"
-          NativeAsset="aspnetcorev2_inprocess"
-          PropetyName="AspNetCoreModuleV2InProcessHandler"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="InProcessRequestHandler.vcxproj" 
+          NativeAsset="aspnetcorev2_inprocess" 
+          PropetyName="AspNetCoreModuleV2InProcessHandler" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" 
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.pdb"
         />
         <Components
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
-          ProjectName="OutOfProcessRequestHandler.vcxproj"
-          PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
-          NativeAsset="aspnetcorev2_outofprocess"
-          BaseOutputPath="AspNetCoreModuleV2"
-          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler" 
+          ProjectName="OutOfProcessRequestHandler.vcxproj" 
+          PropetyName="AspNetCoreModuleV2OutOfProcessHandler" 
+          NativeAsset="aspnetcorev2_outofprocess" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
         />
         <Components
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
-          ProjectName="OutOfProcessRequestHandler.vcxproj"
-          PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
-          NativeAsset="aspnetcorev2_outofprocess"
-          BaseOutputPath="AspNetCoreModuleV2"
-          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler" 
+          ProjectName="OutOfProcessRequestHandler.vcxproj" 
+          PropetyName="AspNetCoreModuleV2OutOfProcessHandler" 
+          NativeAsset="aspnetcorev2_outofprocess" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" 
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.pdb"
         />
 
        <ShimComponents
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcore"
-          PropetyName="AspNetCoreModuleV1Shim"
-          BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcore" 
+          PropetyName="AspNetCoreModuleV1Shim" 
+          BaseOutputPath="AspNetCoreModuleV1" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
         />
         <ShimComponents
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcore"
-          PropetyName="AspNetCoreModuleV1Shim"
-          BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcore" 
+          PropetyName="AspNetCoreModuleV1Shim" 
+          BaseOutputPath="AspNetCoreModuleV1" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
         />
         <ShimComponents
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcorev2"
-          PropetyName="AspNetCoreModuleV2Shim"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcorev2" 
+          PropetyName="AspNetCoreModuleV2Shim" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
         />
         <ShimComponents
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcorev2"
-          PropetyName="AspNetCoreModuleV2Shim"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcorev2" 
+          PropetyName="AspNetCoreModuleV2Shim" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
         />
         <ShimComponents
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
-          ProjectName="OutOfProcessRequestHandler.vcxproj"
-          PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
-          NativeAsset="aspnetcorev2_outofprocess"
-          BaseOutputPath="AspNetCoreModuleV2"
-          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler" 
+          ProjectName="OutOfProcessRequestHandler.vcxproj" 
+          PropetyName="AspNetCoreModuleV2OutOfProcessHandler" 
+          NativeAsset="aspnetcorev2_outofprocess" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
-          HandlerPath="2.0.0"
         />
         <ShimComponents
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
-          ProjectName="OutOfProcessRequestHandler.vcxproj"
-          PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
-          NativeAsset="aspnetcorev2_outofprocess"
-          BaseOutputPath="AspNetCoreModuleV2"
-          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
-          HandlerPath="2.0.0"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler" 
+          ProjectName="OutOfProcessRequestHandler.vcxproj" 
+          PropetyName="AspNetCoreModuleV2OutOfProcessHandler" 
+          NativeAsset="aspnetcorev2_outofprocess" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" 
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.pdb"
         />
 
        <InProcessComponents
-          VCPlatform="x64"
-          Platform="x64"
-          ProjectName="InProcessRequestHandler.vcxproj"
-          NativeAsset="aspnetcorev2_inprocess"
-          PropetyName="AspNetCoreModuleV2InProcessHandler"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          VCPlatform="x64" 
+          Platform="x64" 
+          ProjectName="InProcessRequestHandler.vcxproj" 
+          NativeAsset="aspnetcorev2_inprocess" 
+          PropetyName="AspNetCoreModuleV2InProcessHandler" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
         />
         <InProcessComponents
-          VCPlatform="Win32"
-          Platform="x86"
-          ProjectName="InProcessRequestHandler.vcxproj"
-          NativeAsset="aspnetcorev2_inprocess"
-          PropetyName="AspNetCoreModuleV2InProcessHandler"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
+          VCPlatform="Win32" 
+          Platform="x86" 
+          ProjectName="InProcessRequestHandler.vcxproj" 
+          NativeAsset="aspnetcorev2_inprocess" 
+          PropetyName="AspNetCoreModuleV2InProcessHandler" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" 
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.pdb"
         />
 
        <RunShimComponents
-          VCPlatform="$(NativeVCPlatform)"
-          Platform="$(NativePlatform)"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcore"
-          PropetyName="AspNetCoreModuleV1Shim"
-          BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="$(NativeVCPlatform)" 
+          Platform="$(NativePlatform)" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcore" 
+          PropetyName="AspNetCoreModuleV1Shim" 
+          BaseOutputPath="AspNetCoreModuleV1" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.pdb"
         />
         <RunShimComponents
-          VCPlatform="$(NativeVCPlatform)"
-          Platform="$(NativePlatform)"
-          ProjectName="AspNetCore.vcxproj"
-          NativeAsset="aspnetcorev2"
-          PropetyName="AspNetCoreModuleV2Shim"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          VCPlatform="$(NativeVCPlatform)" 
+          Platform="$(NativePlatform)" 
+          ProjectName="AspNetCore.vcxproj" 
+          NativeAsset="aspnetcorev2" 
+          PropetyName="AspNetCoreModuleV2Shim" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.pdb"
         />
         <RunShimComponents
-          VCPlatform="$(NativeVCPlatform)"
-          Platform="$(NativePlatform)"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
-          ProjectName="OutOfProcessRequestHandler.vcxproj"
-          PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
-          NativeAsset="aspnetcorev2_outofprocess"
-          BaseOutputPath="AspNetCoreModuleV2"
-          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          VCPlatform="$(NativeVCPlatform)" 
+          Platform="$(NativePlatform)" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler" 
+          ProjectName="OutOfProcessRequestHandler.vcxproj" 
+          PropetyName="AspNetCoreModuleV2OutOfProcessHandler" 
+          NativeAsset="aspnetcorev2_outofprocess" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.pdb"
         />
 
        <RunInProcessComponents
-          VCPlatform="$(NativeVCPlatform)"
-          Platform="$(NativePlatform)"
-          ProjectName="InProcessRequestHandler.vcxproj"
-          NativeAsset="aspnetcorev2_inprocess"
-          PropetyName="AspNetCoreModuleV2InProcessHandler"
-          BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          VCPlatform="$(NativeVCPlatform)" 
+          Platform="$(NativePlatform)" 
+          ProjectName="InProcessRequestHandler.vcxproj" 
+          NativeAsset="aspnetcorev2_inprocess" 
+          PropetyName="AspNetCoreModuleV2InProcessHandler" 
+          BaseOutputPath="AspNetCoreModuleV2" 
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler" 
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll" 
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" 
           PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.pdb"
         />
 
     </ItemGroup>
     <PropertyGroup>
 
-       <AspNetCoreModuleV1ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll</AspNetCoreModuleV1ShimDll>
-       <AspNetCoreModuleV2ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll</AspNetCoreModuleV2ShimDll>
-       <AspNetCoreModuleV2InProcessHandlerDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll</AspNetCoreModuleV2InProcessHandlerDll>
+       <AspNetCoreModuleV1ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll</AspNetCoreModuleV1ShimDll> 
+       <AspNetCoreModuleV2ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll</AspNetCoreModuleV2ShimDll> 
+       <AspNetCoreModuleV2InProcessHandlerDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll</AspNetCoreModuleV2InProcessHandlerDll> 
        <AspNetCoreModuleV2OutOfProcessHandlerDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll</AspNetCoreModuleV2OutOfProcessHandlerDll>
     </PropertyGroup>
 </Project>
diff --git a/src/Servers/IIS/build/repo.props b/src/Servers/IIS/build/repo.props
deleted file mode 100644
index 727a2e970f..0000000000
--- a/src/Servers/IIS/build/repo.props
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project>
-  <Import Project="..\..\..\build\dependencies.props" />
-  <Import Project="..\..\..\build\runtimes.props" />
-
-  <PropertyGroup>
-    <OverridePackageOutputPath>false</OverridePackageOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- TODO: temporary while we reorganize source code and refactor dependency management -->
-    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
-
-    <AspNetCoreModuleOutOfProcessVersion>2.0.0</AspNetCoreModuleOutOfProcessVersion>
-
-    <StressTestWebSiteZipOutputPath>$(BuildDir)StressTestWebSite.zip</StressTestWebSiteZipOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Servers/IIS/build/repo.targets b/src/Servers/IIS/build/repo.targets
deleted file mode 100644
index 12023b84c4..0000000000
--- a/src/Servers/IIS/build/repo.targets
+++ /dev/null
@@ -1,129 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <PrepareDependsOn>$(PrepareDependsOn)</PrepareDependsOn>
-    <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetNativeArtifactsInfo</GetArtifactInfoDependsOn>
-    <CompileDependsOn Condition="'$(OS)'=='Windows_NT'">BuildNativeAssets;$(CompileDependsOn)</CompileDependsOn>
-    <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects</PackageDependsOn>
-    <TestDependsOn>$(TestDependsOn);RunNativeTest</TestDependsOn>
-    <NuGetVerifierRuleFile Condition="'$(OS)' != 'Windows_NT'">$(RepositoryRoot)NuGetPackageVerifier.xplat.json</NuGetVerifierRuleFile>
-    <SourceBase>$(RepositoryRoot)src\</SourceBase>
-    <NativeOutput>bin\$(Configuration)\</NativeOutput>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Platforms Include="x86" VCPlatform="Win32" />
-    <Platforms Include="x64" VCPlatform="x64" />
-  </ItemGroup>
-  <Import Project="assets.props" />
-
-  <Target Name="BuildNativeAssets" DependsOnTargets="Prepare;GetToolsets" >
-    <PropertyGroup>
-      <BuildArgs>-p:Configuration=Native$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) -m</BuildArgs>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ANCMProject Include="$(MSBuildThisFileDirectory)..\IISIntegration.sln $(BuildArgs) -p:Platform=%(Platforms.Identity) -bl:$(LogOutputDir)native.%(Platforms.Identity).binlog"/>
-    </ItemGroup>
-
-    <Error
-      Text="Could not find an installation of Visual Studio with the C++ development tools."
-      Condition="'$(VisualStudioMSBuildx86Path)' == ''" />
-
-    <Exec Command="&quot;$(VisualStudioMSBuildx86Path)&quot; %(ANCMProject.Identity)"
-      Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
-  </Target>
-
-  <Target Name="GetNativeArtifactsInfo">
-    <PropertyGroup>
-      <AncmPackageOutputPath>$(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg</AncmPackageOutputPath>
-      <AncmV2PackageOutputPath>$(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg</AncmV2PackageOutputPath>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <ArtifactInfo Include="$(AncmPackageOutputPath)">
-        <ArtifactType>NuGetPackage</ArtifactType>
-        <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
-        <Version>$(PackageVersion)</Version>
-        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-      </ArtifactInfo>
-      <FilesToSign Include="$(AncmPackageOutputPath)" Certificate="$(PackageSigningCertName)" />
-      <FilesToSign Include="$(RepositoryRoot)tools\installancm.ps1" Container="$(AncmPackageOutputPath)" Certificate="$(PowerShellSigningCertName)" />
-
-      <ArtifactInfo Include="$(AncmV2PackageOutputPath)">
-        <ArtifactType>NuGetPackage</ArtifactType>
-        <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
-        <Version>$(PackageVersion)</Version>
-        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-      </ArtifactInfo>
-      <FilesToSign Include="$(AncmV2PackageOutputPath)" Certificate="$(PackageSigningCertName)" />
-
-      <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(AncmV2PackageOutputPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="PackageNativeProjects">
-    <PropertyGroup>
-      <AspNetCoreModuleV2PropsFile>$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.props.in</AspNetCoreModuleV2PropsFile>
-      <AspNetCoreModuleV2PropsOutputFile>$(MSBuildThisFileDirectory)..\artifacts\Microsoft.AspNetCore.AspNetCoreModuleV2.props</AspNetCoreModuleV2PropsOutputFile>
-    </PropertyGroup>
-
-    <GenerateFileFromTemplate
-        TemplateFile="$(AspNetCoreModuleV2PropsFile)"
-        Properties="AspNetCoreModuleOutOfProcessVersion=$(AspNetCoreModuleOutOfProcessVersion)"
-        OutputPath="$(AspNetCoreModuleV2PropsOutputFile)" />
-
-    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModule.nuspec"
-      DestinationFolder="$(ProductPackageOutputPath)"
-      Properties="version=$(PackageVersion);Configuration=$(Configuration)"
-      Overwrite="true"
-      BasePath="$(RepositoryRoot)" />
-
-    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec"
-      DestinationFolder="$(ProductPackageOutputPath)"
-      Properties="version=$(PackageVersion);Configuration=$(Configuration);AspNetCoreModuleOutOfProcessVersion=$(AspNetCoreModuleOutOfProcessVersion);AspNetCoreModuleV2Props=$(AspNetCoreModuleV2PropsOutputFile)"
-      Overwrite="true"
-      BasePath="$(RepositoryRoot)" />
-
-    <ItemGroup>
-      <AncmFiles Include="%(Components.DllLocation)" Link="%(Components.BaseOutputPath)\%(Components.Platform)\%(Components.NativeAsset).dll" />
-      <AncmFiles Include="%(Components.PdbLocation)" Link="%(Components.BaseOutputPath)\%(Components.Platform)\%(Components.NativeAsset).pdb" />
-
-      <!-- Schema-->
-      <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" Link="AspNetCoreModuleV1\aspnetcore_schema.xml" />
-      <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" Link="AspNetCoreModuleV2\aspnetcore_schema_v2.xml" />
-      <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\ancm.mof" Link="AspNetCoreModuleV2\ancm.mof" />
-    </ItemGroup>
-
-  </Target>
-
-  <Target Name="RunNativeTest" DependsOnTargets="GetToolsets">
-    <PropertyGroup>
-      <BuildArgs>-p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary</BuildArgs>
-    </PropertyGroup>
-    <Exec Command="&quot;$(VisualStudioMSBuildx86Path)&quot; &quot;$(RepositoryRoot)test\CommonLibTests\CommonLibTests.vcxproj&quot; /t:Test $(BuildArgs) -p:Platform=%(Platforms.VCPlatform)"
-      Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
-  </Target>
-
-  <Target Name="PackageStressTestApp">
-    <PropertyGroup>
-      <StressAppBasePath>$(MSBuildThisFileDirectory)..\test\WebSites\StressTestWebSite\</StressAppBasePath>
-      <StressAppPublishPath>$(StressAppBasePath)bin\published\</StressAppPublishPath>
-    </PropertyGroup>
-
-    <RemoveDir Directories="$(StressAppPublishPath)" />
-    <MSBuild
-      Projects="$(StressAppBasePath)\StressTestWebSite.csproj"
-      Targets="Publish"
-      Properties="TargetFramework=netcoreapp3.0;Configuration=$(Configuration);RuntimeIdentifier=win7-%(Platforms.Identity);PublishDir=$(StressAppPublishPath)\%(Identity);BuildProjectReferences=false" />
-
-    <ItemGroup>
-      <StressAppFiles Include="$(StressAppPublishPath)\**\*" />
-    </ItemGroup>
-
-    <ZipArchive File="$(StressTestWebSiteZipOutputPath)"
-      Overwrite="true"
-      SourceFiles="@(StressAppFiles)"
-      WorkingDirectory="$(StressAppPublishPath)" />
-  </Target>
-</Project>
diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1
index f4b98959ed..7f02d34a44 100644
--- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1
+++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1
@@ -10,7 +10,7 @@ $platforms = @(
         VCPlatform = "Win32";
     }
 );
-$srcDir = "`$(MSBuildThisFileDirectory)..\src";
+$srcDir = "`$(MSBuildThisFileDirectory)..";
 $projects = @(
     @{
         ProjectDirectory = "$srcDir\AspNetCoreModuleV1\AspNetCore";
diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
index fb9cd35046..5ca77d6880 100644
--- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
+++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -27,8 +27,8 @@
     <!-- Make sure redist folder is built and ready -->
     <ProjectReference Include="..\..\Installers\Archive\Archive.Redist.zipproj" PrivateAssets="All" ReferenceOutputAssembly="False" />
 
-    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(SharedFxArchitecture)" />
-    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="$(SharedFxArchitecture)" />
+    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(SharedFxArchitecture)" />
+    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="$(SharedFxArchitecture)" />
 
   </ItemGroup>