From 92baa4a75b2cb110f23599736be91a62551852bf Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Mon, 15 Oct 2018 17:46:36 -0700
Subject: [PATCH] Cleanup ANCM installers/ Sign AspNetCore custom action
 (#1499) (#1502)

---
 Directory.Build.props                         |   2 +
 Directory.Build.targets                       |   1 +
 eng/targets/Cpp.Common.props                  |  11 +++++
 eng/targets/Cpp.Common.targets                |   6 +++
 .../ANCMIISExpressV1/AncmIISExpressV1.wixproj |  12 ++---
 .../ANCMIISExpressV1/ancm_iis_express.wxs     |  14 +++---
 .../ANCMIISExpressV2/AncmIISExpressV2.wixproj |  10 ++--
 .../ANCMIISExpressV2/ancm_iis_expressv2.wxs   |  22 ++++-----
 .../{Installers => }/ANCMV1/AncmV1.wixproj    |  11 +++--
 .../ANCMV1/aspnetcoremodule.wxs               |  28 ++++++-----
 .../{Installers => }/ANCMV2/AncmV2.wixproj    |  11 +++--
 .../ANCMV2/aspnetcoremodulev2.wxs             |  32 ++++++-------
 .../CustomAction/aspnetcoreCA.vcxproj         |  14 +++---
 .../Directory.Build.props                     |  44 +++++++++++-------
 .../IIS-Setup/IIS-Common/build/compiler.props |  17 -------
 .../IIS-Common/lib/CommonLib.vcxproj          |  13 +++---
 .../IIS-Setup/build/exports.props             |  23 ---------
 .../IIS-Setup/build/submodule.props           |  11 -----
 .../IIS-Setup/iisca/lib/iisca.vcxproj         |  12 ++---
 .../bitmaps/AspNetCoreModule.ico              | Bin
 .../{Installers => }/bitmaps/bannrbmp.bmp     | Bin
 .../{Installers => }/bitmaps/dlgbmp.bmp       | Bin
 .../build/copy-outputs.targets                |   0
 .../IIS-Common => }/build/exports.props       |   4 ++
 .../IIS-Common => }/build/settings.props      |   1 -
 .../build/settings/common.props               |   0
 .../build/settings/debug.props                |   0
 .../build/settings/release.props              |   0
 .../IIS-Common => }/build/submodule.props     |   0
 .../IIS-Common => }/build/versions.props      |   0
 .../{Installers => }/license/license.rtf      |   0
 .../{Installers => }/setupstrings.wxl         |   0
 src/Installers/Windows/WindowsInstallers.proj |  16 +++----
 src/Installers/Windows/Wix.props              |   7 +--
 src/Installers/Windows/Wix.targets            |   3 +-
 35 files changed, 147 insertions(+), 178 deletions(-)
 create mode 100644 eng/targets/Cpp.Common.props
 create mode 100644 eng/targets/Cpp.Common.targets
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMIISExpressV1/AncmIISExpressV1.wixproj (75%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMIISExpressV1/ancm_iis_express.wxs (99%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMIISExpressV2/AncmIISExpressV2.wixproj (78%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMIISExpressV2/ancm_iis_expressv2.wxs (98%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMV1/AncmV1.wixproj (77%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMV1/aspnetcoremodule.wxs (93%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMV2/AncmV2.wixproj (78%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/ANCMV2/aspnetcoremodulev2.wxs (94%)
 delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/compiler.props
 delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/exports.props
 delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/submodule.props
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/bitmaps/AspNetCoreModule.ico (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/bitmaps/bannrbmp.bmp (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/bitmaps/dlgbmp.bmp (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/copy-outputs.targets (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/exports.props (64%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/settings.props (79%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/settings/common.props (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/settings/debug.props (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/settings/release.props (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/submodule.props (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{IIS-Setup/IIS-Common => }/build/versions.props (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/license/license.rtf (100%)
 rename src/Installers/Windows/AspNetCoreModule-Setup/{Installers => }/setupstrings.wxl (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index 4316633c..531b5d87 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,4 +23,6 @@
   </PropertyGroup>
 
   <Import Project="eng\targets\Wix.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
+  <Import Project="eng\targets\Cpp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
+
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index cf47ab42..ebda4d37 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -9,4 +9,5 @@
   </PropertyGroup>
 
   <Import Project="eng\targets\Wix.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
+  <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
 </Project>
diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
new file mode 100644
index 00000000..f295dbaf
--- /dev/null
+++ b/eng/targets/Cpp.Common.props
@@ -0,0 +1,11 @@
+<!-- Targets for making .vcxproj better. -->
+<Project>
+
+  <PropertyGroup>
+    <SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
+  </PropertyGroup>
+
+  <Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
+  <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
+
+</Project>
diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets
new file mode 100644
index 00000000..f2cad0d8
--- /dev/null
+++ b/eng/targets/Cpp.Common.targets
@@ -0,0 +1,6 @@
+<!-- Targets for making .vcxproj better. -->
+<Project>
+
+  <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.targets" Condition="'$(DisableMicroBuild)' != 'true' AND '$(MicroBuildPluginDirectory)' != ''" />
+
+</Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/AncmIISExpressV1.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj
similarity index 75%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/AncmIISExpressV1.wixproj
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj
index 94cae349..8aac844a 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/AncmIISExpressV1.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj
@@ -4,19 +4,17 @@
 
   <PropertyGroup>
     <Name>AspNetCoreModuleIISExpress</Name>
-    <NamespaceGuid>D36FDC38-FE53-48CC-BC82-A17C28F1CEE1</NamespaceGuid> <!-- TODO make this namespace guid different-->
     <ProjectGuid>2A6A4709-30D2-4716-A597-55DF0FB74D37</ProjectGuid>
     <OutputType>Package</OutputType>
     <SuppressIces>ICE03</SuppressIces>
+    <DisableGuidGeneration>true</DisableGuidGeneration>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'x86'">
     <OutputName>ancm_iis_express_x86_en</OutputName>
-    <ProjectGuid>2A6A4709-30D2-4716-A597-55DF0FB74D37</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x64'">
     <OutputName>ancm_iis_express_x64_en</OutputName>
-    <ProjectGuid>2A6A4709-30D2-4716-A597-55DF0FB74D37</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(SignType)' != '' ">
     <SignOutput>True</SignOutput>
@@ -36,8 +34,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
+    <Error Condition="!Exists('..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\settings.props'))" />
+    <Error Condition="!Exists('..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\versions.props'))" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
@@ -68,7 +66,7 @@
     </Content>
   </ItemGroup>
 
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
+  <Import Project="..\build\settings.props" Condition="Exists('..\build\settings.props')" />
+  <Import Project="..\build\versions.props" Condition="Exists('..\build\versions.props')" />
   <!-- Overwrite standard versioning scheme -->
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/ancm_iis_express.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
similarity index 99%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/ancm_iis_express.wxs
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
index 5cd69a13..00a8af36 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/ancm_iis_express.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
@@ -5,10 +5,9 @@
 -->
 
 <?define Codepage = "1252" ?>
-<?include ..\..\IIS-Setup\include.wxi ?>
+<?include ..\IIS-Setup\include.wxi ?>
 
-<!-- NB: *Must* update the ANCMProductCode GUID on each release! -->
-<?define ANCMProductCode = "*" ?>
+<?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "ADF3781F-5BC7-4D35-8BA6-2029A882210A" ?>
   <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module,x86" ?>
@@ -17,7 +16,6 @@
   <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module,x64" ?>
 <?endif?>
 
-<?define MsiVersion = "1$(var.Version)" ?>
 <?define ProductShortName="IIS Express AspNetCore Module" ?>
 <?define ProductNameShort="IISExpress_ANCM" ?>
 
@@ -48,10 +46,10 @@
 <?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.ANCMProductCode)"
+    <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreIISExpressModuleProductName)"
           Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.MsiVersion)"
+          Version="$(var.ANCMMsiVersion)"
           Language="!(loc.Language)"
           Codepage="$(var.Codepage)"
           UpgradeCode="$(var.ANCMUpgradeCode)" >
@@ -73,8 +71,8 @@
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
         <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.MsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
 
         <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
similarity index 78%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/AncmIISExpressV2.wixproj
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
index ab62ca11..d6676832 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/AncmIISExpressV2.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
@@ -4,10 +4,10 @@
 
   <PropertyGroup>
     <Name>AspNetCoreModuleV2IISExpress</Name>
-    <NamespaceGuid>D36FDC38-FE53-48CC-BC82-A17C28F1CEE1</NamespaceGuid> <!-- TODO make this namespace guid different-->
     <ProjectGuid>17c76489-4c09-4e14-b81c-7a86cd937144</ProjectGuid>
     <OutputType>Package</OutputType>
     <SuppressIces>ICE03</SuppressIces>
+    <DisableGuidGeneration>true</DisableGuidGeneration>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'x86'">
@@ -37,8 +37,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
+    <Error Condition="!Exists('..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\settings.props'))" />
+    <Error Condition="!Exists('..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\versions.props'))" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
@@ -70,7 +70,7 @@
     </Content>
   </ItemGroup>
 
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
+  <Import Project="..\build\settings.props" Condition="Exists('..\build\settings.props')" />
+  <Import Project="..\build\versions.props" Condition="Exists('..\build\versions.props')" />
   <!-- Overwrite standard versioning scheme -->
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
similarity index 98%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/ancm_iis_expressv2.wxs
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
index 98739c1e..12a2c887 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/ancm_iis_expressv2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
@@ -5,10 +5,9 @@
 -->
 
 <?define Codepage = "1252" ?>
-<?include ..\..\IIS-Setup\include.wxi ?>
+<?include ..\IIS-Setup\include.wxi ?>
 
-<!-- NB: *Must* update the ProductCode GUID on each release! -->
-<?define ANCMProductCode = "*" ?>
+<?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "de400ae0-3cd7-4a35-a234-b5a41b90893c" ?>
   <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x86" ?>
@@ -17,7 +16,6 @@
   <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x64" ?>
 <?endif?>
 
-<?define MsiVersion = "1$(var.Version)" ?>
 <?define ProductShortName="IIS Express AspNetCore Module V2" ?>
 <?define ProductNameShort="IISExpress_ANCM_V2" ?>
 <?define ProductVersionString = "V2"?>
@@ -47,15 +45,15 @@
 
 <?define AspNetCoreTargetPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\aspnetcorev2.dll" ?>
 <?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMV2Root)x86\aspnetcorev2.dll" ?>
-<?define AspNetCoreHandlerPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\$(var.ANCMOutOfProcessHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreHandlerWoW64Path = "$(var.PreBuiltANCMV2Root)x86\$(var.ANCMOutOfProcessHandlerVersion)\aspnetcorev2_outofprocess.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.ANCMProductCode)"
+    <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreIISExpressModuleProductNameV2)"
           Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.MsiVersion)"
+          Version="$(var.ANCMMsiVersion)"
           Language="!(loc.Language)"
           Codepage="$(var.Codepage)"
           UpgradeCode="$(var.ANCMUpgradeCode)" >
@@ -77,8 +75,8 @@
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
         <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.MsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
 
         <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
@@ -186,7 +184,7 @@
                 <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
               </RegistryKey>
             </Component>
-            <Directory Id="HandlerVersionDir" Name="$(var.MsiVersion)" >
+            <Directory Id="HandlerVersionDir" Name="$(var.ANCMMsiVersion)" >
               <Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
                 <File Id="AspNetCoreModuleHandlerDll"
                       Name="aspnetcorev2_outofprocess.dll"
@@ -229,7 +227,7 @@
                     <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
                   </RegistryKey>
                 </Component>
-                <Directory Id="HandlerVersionDir32" Name="$(var.MsiVersion)" >
+                <Directory Id="HandlerVersionDir32" Name="$(var.ANCMMsiVersion)" >
                   <Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Win64="no">
                     <File Id="AspNetCoreModuleHandlerDll.wow"
                           Name="aspnetcorev2_outofprocess.dll"
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/AncmV1.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj
similarity index 77%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/AncmV1.wixproj
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj
index 27038fe2..c1f38949 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/AncmV1.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj
@@ -4,9 +4,10 @@
 
   <PropertyGroup>
     <Name>AspNetCoreModule</Name>
-    <NamespaceGuid>D36FDC38-FE53-48CC-BC82-A17C28F1CEE1</NamespaceGuid> <!-- TODO make this namespace guid different-->
     <ProjectGuid>D36FDC38-FE53-48CC-BC82-A17C28F1CEE1</ProjectGuid>
+    <GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
     <OutputType>Package</OutputType>
+    <DisableGuidGeneration>true</DisableGuidGeneration>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'x86'">
@@ -35,8 +36,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
+    <Error Condition="!Exists('$(ANCMBuildDirectory)settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ANCMBuildDirectory)settings.props'))" />
+    <Error Condition="!Exists('$(ANCMBuildDirectory)versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ANCMBuildDirectory)versions.props'))" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
@@ -67,7 +68,7 @@
     </Content>
   </ItemGroup>
 
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
+  <Import Project="$(ANCMBuildDirectory)settings.props" Condition="Exists('$(ANCMBuildDirectory)settings.props')" />
+  <Import Project="$(ANCMBuildDirectory)versions.props" Condition="Exists('$(ANCMBuildDirectory)versions.props')" />
   <!-- Overwrite standard versioning scheme -->
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/aspnetcoremodule.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
similarity index 93%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/aspnetcoremodule.wxs
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
index 0b8f359a..cdb387e4 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV1/aspnetcoremodule.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
@@ -5,10 +5,9 @@
 -->
 
 <?define Codepage = "1252" ?>
-<?include ..\..\IIS-Setup\include.wxi ?>
+<?include ..\IIS-Setup\include.wxi ?>
 
-<!-- NB: *Must* update the ProductCode GUID on each release! -->
-<?define ANCMProductCode = "*" ?>
+<?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "A9D4A2C7-F290-4065-81FB-067EFDB90043" ?>
   <?define OldX86UpgradeCode = "DC6A6FDC-C18F-4A6F-B12A-1A835472CB33" ?>
@@ -17,7 +16,6 @@
   <?define ANCMUpgradeCode = "DC6A6FDC-C18F-4A6F-B12A-1A835472CB33" ?>
   <?define ANCMDepProviderKey = "IIS_AspNetCore_Module,x64" ?>
 <?endif?>
-<?define MsiVersion = "1$(var.Version)" ?>
 <?define ProductShortName="IIS AspNetCore Module" ?>
 <?define ProductNameShort="IIS_AspNetCore_Module" ?>
 
@@ -36,10 +34,10 @@
 <?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.ANCMProductCode)"
+    <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreModuleProductName)"
           Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.MsiVersion)"
+          Version="$(var.ANCMMsiVersion)"
           Language="!(loc.Language)"
           Codepage="$(var.Codepage)"
           UpgradeCode="$(var.ANCMUpgradeCode)" >
@@ -55,10 +53,10 @@
         <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high"/>
 
         <!-- include the standard app searches -->
-        <?include ..\..\IIS-Setup\appsearch\appsearch.wxi ?>
+        <?include ..\IIS-Setup\appsearch\appsearch.wxi ?>
 
         <!-- make patching UI go from welcome to ready to repair -->
-        <?include ..\..\IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
+        <?include ..\IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
 
         <Property Id="ARPCONTACT">Microsoft Corporation</Property>
         <Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
@@ -68,14 +66,14 @@
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
         <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.MsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.MsiVersion)" Maximum="$(var.MsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" Maximum="$(var.ANCMMsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
       <?if $(var.Platform) = "x86" ?>
        <Upgrade Id="$(var.OldX86UpgradeCode)">
-            <UpgradeVersion Property="OLDERPRODUCTFOUND" Minimum="0.8.1962" Maximum="$(var.MsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" MigrateFeatures="yes" />
-            <UpgradeVersion Property="NEWERPRODUCTFOUND" OnlyDetect="yes"  Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
+            <UpgradeVersion Property="OLDERPRODUCTFOUND" Minimum="0.8.1962" Maximum="$(var.ANCMMsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" MigrateFeatures="yes" />
+            <UpgradeVersion Property="NEWERPRODUCTFOUND" OnlyDetect="yes"  Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
        </Upgrade>
       <?endif ?>
         <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
@@ -123,7 +121,7 @@
                 <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
                     <RegistryKey Key="$(var.ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
@@ -165,7 +163,7 @@
                 <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
                     <RegistryKey Key="$(var.ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
similarity index 78%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/AncmV2.wixproj
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
index 41bf3f3b..1969ce72 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/AncmV2.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
@@ -4,9 +4,10 @@
 
   <PropertyGroup>
     <Name>AspNetCoreModuleV2</Name>
-    <NamespaceGuid>D36FDC38-FE53-48CC-BC82-A17C28F1CEE1</NamespaceGuid> <!-- TODO make this namespace guid different-->
     <ProjectGuid>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</ProjectGuid>
     <OutputType>Package</OutputType>
+    <GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
+    <DisableGuidGeneration>true</DisableGuidGeneration>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'x86'">
@@ -35,8 +36,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
+    <Error Condition="!Exists('..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\settings.props'))" />
+    <Error Condition="!Exists('..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\versions.props'))" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
@@ -67,7 +68,7 @@
     </Content>
   </ItemGroup>
 
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
+  <Import Project="..\build\settings.props" Condition="Exists('..\build\settings.props')" />
+  <Import Project="..\build\versions.props" Condition="Exists('..\build\versions.props')" />
   <!-- Overwrite standard versioning scheme -->
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
similarity index 94%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/aspnetcoremodulev2.wxs
rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
index 1a16328d..77514778 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/ANCMV2/aspnetcoremodulev2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
@@ -5,10 +5,9 @@
 -->
 
 <?define Codepage = "1252" ?>
-<?include ..\..\IIS-Setup\include.wxi ?>
+<?include ..\IIS-Setup\include.wxi ?>
 
-<!-- NB: *Must* update the ProductCode GUID on each release! -->
-<?define ANCMProductCode = "*" ?>
+<?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "d7168f76-9dd0-407d-bf22-0b450139e6a7" ?>
   <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x86" ?>
@@ -16,7 +15,6 @@
   <?define ANCMUpgradeCode = "8d50fde7-0b84-4900-b60d-bd952979ba0b" ?>
   <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x64" ?>
 <?endif?>
-<?define MsiVersion = "1$(var.Version)" ?>
 <?define ProductShortName="IIS AspNetCore Module V2" ?>
 <?define ProductNameShort="IIS_ANCM_V2" ?>
 <?define ProductVersionString = "V2"?>
@@ -33,15 +31,15 @@
 
 <?define AspNetCoreTargetPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\aspnetcorev2.dll" ?>
 <?define AspNetCoreWoW64TargetPath = "$(var.PreBuiltANCMV2Root)x86\aspnetcorev2.dll" ?>
-<?define AspNetCoreHandlerPath = "$(var.PreBuiltANCMV2Root)$(var.Platform)\$(var.ANCMOutOfProcessHandlerVersion)\aspnetcorev2_outofprocess.dll" ?>
-<?define AspNetCoreHandlerWoW64Path = "$(var.PreBuiltANCMV2Root)x86\$(var.ANCMOutOfProcessHandlerVersion)\aspnetcorev2_outofprocess.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.ANCMProductCode)"
+    <Product Id="$(var.ProductCode)"
           Name="!(loc.AspNetCoreModuleProductNameV2)"
           Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.MsiVersion)"
+          Version="$(var.ANCMMsiVersion)"
           Language="!(loc.Language)"
           Codepage="$(var.Codepage)"
           UpgradeCode="$(var.ANCMUpgradeCode)" >
@@ -57,10 +55,10 @@
         <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high"/>
 
         <!-- include the standard app searches -->
-        <?include  ..\..\IIS-Setup\appsearch\appsearch.wxi ?>
+        <?include  ..\IIS-Setup\appsearch\appsearch.wxi ?>
 
         <!-- make patching UI go from welcome to ready to repair -->
-        <?include  ..\..\IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
+        <?include  ..\IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
 
         <Property Id="ARPCONTACT">Microsoft Corporation</Property>
         <Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
@@ -70,9 +68,9 @@
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
         <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.MsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.MsiVersion)" Maximum="$(var.MsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" Maximum="$(var.ANCMMsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
 
         <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
@@ -120,7 +118,7 @@
                 <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
                     <RegistryKey Key="$(var.ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
@@ -161,7 +159,7 @@
                                    <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
                                </RegistryKey>
                            </Component>
-                           <Directory Id="HandlerVersionDir" Name="$(var.MsiVersion)" >
+                           <Directory Id="HandlerVersionDir" Name="$(var.ANCMMsiVersion)" >
                                <Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
                                    <File Id="AspNetCoreModuleHandlerDll"
                                          Name="aspnetcorev2_outofprocess.dll"
@@ -182,7 +180,7 @@
                <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
                     <RegistryKey Key="$(var.ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
@@ -204,7 +202,7 @@
                                     <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
                                 </RegistryKey>
                             </Component>
-                            <Directory Id="HandlerVersionDir32" Name="$(var.MsiVersion)" SourceName="WowOnly">
+                            <Directory Id="HandlerVersionDir32" Name="$(var.ANCMMsiVersion)" SourceName="WowOnly">
                                 <Component Id="AspNetCoreModuleHandler.wow" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
                                     <File Id="AspNetCoreModuleHandlerDll.wow"
                                           Name="aspnetcorev2_outofprocess.dll"
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
index 9d621fb3..e47590e1 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
@@ -12,8 +12,8 @@
   <Import Condition="$(IIS-Setup) == '' AND Exists('$(_IIS-SetupExportsPath)')" Project="$(_IIS-SetupExportsPath)" />
 
   <!-- Build error if submodule dependencies could not be found. -->
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
+  <Import Project="$(MSBuildThisprojectdirectory)..\build\versions.props" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\versions.props')" />
+  <Import Project="$(MSBuildThisprojectdirectory)..\build\settings.props" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\settings.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -82,6 +82,7 @@
     <ProjectReference Include="$(IIS-Common)lib\CommonLib.vcxproj">
       <Project>{b54a8f61-60de-4ad9-87ca-d102f230678e}</Project>
     </ProjectReference>
+     <FilesToSign Include="$(OutDir)$(TargetName)$(TargetExt)" Authenticode="Microsoft400" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
@@ -89,10 +90,9 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\copy-outputs.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\copy-outputs.targets'))" />
+    <Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\versions.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\settings.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets'))" />
   </Target>
-  <Import Project="$(IIS-Common)build\copy-outputs.targets" Condition="Exists('$(IIS-Common)build\copy-outputs.targets')" />
-
+  <Import Project="$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
index 63b61c1a..e790ba07 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
@@ -3,33 +3,41 @@
   <Import Project="$(RepositoryRoot)\.deps\dependencies.g.props" />
 
   <PropertyGroup>
-    <AspNetCoreSetupRoot>$(RepositoryRoot)src\Installers\Windows\AspNetCoreModule-Setup\</AspNetCoreSetupRoot>
-    <IIS-Setup>$(AspNetCoreSetupRoot)IIS-Setup\</IIS-Setup>
-    <IIS-Common>$(IIS-Setup)IIS-Common\</IIS-Common>
-
-    <CustomActionVariable>CustomAction=$(AspNetCoreSetupRoot)CustomAction\bin\$(Configuration)\$(Platform)\aspnetcoreca.dll</CustomActionVariable>
-
-    <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>
-
-    <ANCMOutOfProcessHandlerVersion>2.0.0</ANCMOutOfProcessHandlerVersion>
-    <DefineConstants>ANCMOutOfProcessHandlerVersion=$(ANCMOutOfProcessHandlerVersion);$(DefineConstants)</DefineConstants>
-    <DefineConstants>PreBuiltANCMRoot=$(PreBuiltANCMRoot);PreBuiltANCMV2Root=$(PreBuiltANCMV2Root);$(DefineConstants)</DefineConstants>
-    <DefineConstants>$(CustomActionVariable);PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants)</DefineConstants>
-
+    <!-- Build number used by ANCM msis -->
     <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
     <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
 
-
+    <!-- Properties used by IIS-Common and IIS-Setup for libs/dlls -->
     <BUILD_MAJOR>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</BUILD_MAJOR>
     <BLDVERMAJOR>$(PRODUCT_MAJOR)</BLDVERMAJOR>
     <BLDVERMINOR>$(PRODUCT_MINOR)</BLDVERMINOR>
     <BLDNUMMAJOR>$(BUILD_MAJOR)</BLDNUMMAJOR>
     <BLDNUMMINOR>$(BUILD_MINOR)</BLDNUMMINOR>
+
+    <!-- ANCM msi version is prepended with a 1 due to previous msi versions starting with 8.x.x.0 -->
+    <ANCMMsiVersion>1$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(BUILD_MAJOR).0</ANCMMsiVersion>
+
+    <!-- The handler version in the M.A.AspNetCoreV2 nuget package. Today, this is hard coded to 2.0.0
+          The actual handler folder version is dependent on the ANCMMsiVersion -->
+    <ANCMOutOfProcessNugetPackageHandlerVersion>2.0.0</ANCMOutOfProcessNugetPackageHandlerVersion>
+
+    <!-- Location of main folders--> 
+    <AspNetCoreSetupRoot>$(RepositoryRoot)src\Installers\Windows\AspNetCoreModule-Setup\</AspNetCoreSetupRoot>
+    <IIS-Setup>$(AspNetCoreSetupRoot)IIS-Setup\</IIS-Setup>
+    <IIS-Common>$(IIS-Setup)IIS-Common\</IIS-Common>
+    <ANCMBuildDirectory>$(AspNetCoreSetupRoot)build\</ANCMBuildDirectory>
+
+    <!-- Variables used by ANCM wxs projects. -->
+    <CustomActionVariable>CustomAction=$(AspNetCoreSetupRoot)CustomAction\bin\$(Configuration)\$(Platform)\aspnetcoreca.dll</CustomActionVariable>
+    <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>
+
     <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>$(CustomActionVariable);PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/compiler.props b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/compiler.props
deleted file mode 100644
index 7394db4a..00000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/compiler.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <CppNugetVersion>14.11.25547</CppNugetVersion>
-    <CppNugetPath Condition="$(CppNugetPath) == '' AND Exists('$(UserProfile)\.nuget\packages\visualcpptools.community.vs2017layout\$(CppNugetVersion)\build\native\VisualCppTools.Community.VS2017Layout.props')">$(UserProfile)\.nuget\packages\visualcpptools.community.vs2017layout\$(CppNugetVersion)\build\native\VisualCppTools.Community.VS2017Layout.props</CppNugetPath>
-    <CppNugetPath Condition="$(CppNugetPath) == ''">$(UserProfile)\.nuget\GlobalPackages\visualcpptools.community.vs2017layout.$(CppNugetVersion)\build\native\VisualCppTools.Community.VS2017Layout.props</CppNugetPath>
-  </PropertyGroup>
-
-  <Import Project="$(CppNugetPath)" Condition="Exists('$(CppNugetPath)') AND '$(UseCppToolChainFromNuGet)' != 'false' " />
-
-  <Target Name="EnsureNugetCompilerBuildImports" BeforeTargets="PrepareForBuild" Condition=" '$(UseCppToolChainFromNuGet)' != 'false' ">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(CppNugetPath)')" Text="$([System.String]::Format('$(ErrorText)', '$(CppNugetPath)'))" />
-  </Target>
-</Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj
index 1e32646e..35768b00 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\build\submodule.props" Condition="Exists('$(ProjectDir)..\build\submodule.props')" />
-  <Import Project="$(ProjectDir)..\build\versions.props" Condition="Exists('$(ProjectDir)..\build\versions.props')" />
-  <Import Project="$(ProjectDir)..\build\settings.props" Condition="Exists('$(ProjectDir)..\build\settings.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\versions.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\settings.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -71,8 +72,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(ProjectDir)..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ProjectDir)..\build\submodule.props'))" />
-    <Error Condition="!Exists('$(ProjectDir)..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ProjectDir)..\build\versions.props'))" />
-    <Error Condition="!Exists('$(ProjectDir)..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ProjectDir)..\build\settings.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\versions.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\settings.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/exports.props b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/exports.props
deleted file mode 100644
index 94f411d0..00000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/exports.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project InitialTargets="EnsureCommonExists" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Provide exports to submodule hosts -->
-
-  <PropertyGroup>
-    <IIS-Setup Condition="$(IIS-Setup) == ''">$(MSBuildThisFileDirectory)..\</IIS-Setup>
-  </PropertyGroup>
-
-  <!-- Imports for when this solution is a submodule host -->
-
-  <PropertyGroup>
-    <_IIS-CommonExportsPath>$(IIS-Setup)\IIS-Common\build\exports.props</_IIS-CommonExportsPath>
-  </PropertyGroup>
-
-  <Import Condition="$(IIS-Common) == '' AND Exists('$(_IIS-CommonExportsPath)')" Project="$(_IIS-CommonExportsPath)" />
-
-  <!-- Build error if submodule dependencies could not be found. -->
-
-  <Target Name="EnsureCommonExists">
-    <Error Condition="!Exists($(IIS-Common))" Text="The IIS-Common submodule could not be found. Use 'git submodule update --init --recursive' to pull down the IIS-Common repository." />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/submodule.props b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/submodule.props
deleted file mode 100644
index d51d7f8d..00000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/build/submodule.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Add extension point for hosting as a submodule -->
-
-  <Import Condition="'$(SolutionDir)' != '' AND '$(SolutionDir)build\' != '$(MSBuildThisFileDirectory)' AND Exists('$(SolutionDir)build\submodule.props')" Project="$(SolutionDir)build\submodule.props" />
-
-  <!-- Import this modules properties if not yet declared -->
-
-  <Import Condition="$(IIS-Setup) == ''" Project="$(MSBuildThisFileDirectory)exports.props" />
-
-</Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj
index a05a1211..b01b4ffb 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\build\submodule.props" Condition="Exists('$(ProjectDir)..\..\build\submodule.props')" />
-  <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
-  <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\build\submodule.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\settings.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" />
+  <Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\versions.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -124,8 +124,8 @@
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(ProjectDir)..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ProjectDir)..\..\build\submodule.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\settings.props'))" />
-    <Error Condition="!Exists('$(IIS-Common)build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(IIS-Common)build\versions.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\settings.props'))" />
+    <Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\versions.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/AspNetCoreModule.ico b/src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/AspNetCoreModule.ico
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/AspNetCoreModule.ico
rename to src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/AspNetCoreModule.ico
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/bannrbmp.bmp b/src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/bannrbmp.bmp
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/bannrbmp.bmp
rename to src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/bannrbmp.bmp
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/dlgbmp.bmp b/src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/dlgbmp.bmp
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/bitmaps/dlgbmp.bmp
rename to src/Installers/Windows/AspNetCoreModule-Setup/bitmaps/dlgbmp.bmp
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/copy-outputs.targets b/src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/copy-outputs.targets
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/exports.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/exports.props
similarity index 64%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/exports.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/exports.props
index fb90d742..512b0821 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/exports.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/exports.props
@@ -6,4 +6,8 @@
     <IIS-Common Condition="$(IIS-Common) == ''">$(MSBuildThisFileDirectory)..\</IIS-Common>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <IIS-Setup Condition="$(IIS-Setup) == ''">$(MSBuildThisFileDirectory)..\</IIS-Setup>
+  </PropertyGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings.props
similarity index 79%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/settings.props
index bd51e2d1..ba1ca746 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings.props
@@ -3,6 +3,5 @@
   <Import Project="$(MSBuildThisFileDirectory)settings\common.props" />
   <Import Project="$(MSBuildThisFileDirectory)settings\release.props" />
   <Import Project="$(MSBuildThisFileDirectory)settings\debug.props" />
-  <Import Project="$(MSBuildThisFileDirectory)compiler.props" />
 
 </Project>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/common.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/debug.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/debug.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/release.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/release.props
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/settings/release.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/settings/release.props
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/submodule.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/submodule.props
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/submodule.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/submodule.props
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/versions.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/versions.props
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/build/versions.props
rename to src/Installers/Windows/AspNetCoreModule-Setup/build/versions.props
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/license/license.rtf b/src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/license/license.rtf
rename to src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Installers/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/setupstrings.wxl
similarity index 100%
rename from src/Installers/Windows/AspNetCoreModule-Setup/Installers/setupstrings.wxl
rename to src/Installers/Windows/AspNetCoreModule-Setup/setupstrings.wxl
diff --git a/src/Installers/Windows/WindowsInstallers.proj b/src/Installers/Windows/WindowsInstallers.proj
index c81419d2..f8b8135b 100644
--- a/src/Installers/Windows/WindowsInstallers.proj
+++ b/src/Installers/Windows/WindowsInstallers.proj
@@ -6,14 +6,14 @@
     <InstallerProject Include="AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x86" />
 
     <!-- Build the ANCM msis -->
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/AncmIISExpressV1.wixproj" AdditionalProperties="Platform=x64" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMIISExpressV1/AncmIISExpressV1.wixproj" AdditionalProperties="Platform=x86" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x64" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMIISExpressV2/AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x86" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMV1/ANCMV1.wixproj" AdditionalProperties="Platform=x64" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMV1/ANCMV1.wixproj" AdditionalProperties="Platform=x86" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMV2/ANCMV2.wixproj" AdditionalProperties="Platform=x64" />
-    <InstallerProject Include="AspNetCoreModule-Setup/Installers/ANCMV2/ANCMV2.wixproj" AdditionalProperties="Platform=x86" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj" AdditionalProperties="Platform=x64" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj" AdditionalProperties="Platform=x86" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x64" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x86" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMV1/ANCMV1.wixproj" AdditionalProperties="Platform=x64" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMV1/ANCMV1.wixproj" AdditionalProperties="Platform=x86" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMV2/ANCMV2.wixproj" AdditionalProperties="Platform=x64" />
+    <InstallerProject Include="AspNetCoreModule-Setup/ANCMV2/ANCMV2.wixproj" AdditionalProperties="Platform=x86" />
 
     <!-- Build the SharedFramework bundles-->
     <InstallerProject Include="SharedFrameworkBundle/SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props
index 049805f9..f2737eda 100644
--- a/src/Installers/Windows/Wix.props
+++ b/src/Installers/Windows/Wix.props
@@ -1,12 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <!-- This needs to include the build version for ANCM. I'd assume this is fine to include with other bundles. -->
-    <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
-    <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
-    <BUILD_MAJOR>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</BUILD_MAJOR>
-    <Version>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(BUILD_MAJOR)</Version>
-
+    <Version>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).0</Version>
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <Lang Condition="'$(Lang)' == ''">ENU</Lang>
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index a40275cd..85eecfa2 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -12,7 +12,7 @@
 
   <UsingTask AssemblyFile="$(OutputPath)..\InstallerTasks\InstallerTasks.dll" TaskName="RepoTasks.GenerateGuid" />
 
-  <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" />
+  <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
 
   <Target Name="_GeneratePackageGuids" Condition="'$(OutputType)' == 'package'">
     <GenerateGuid NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs)">
@@ -39,4 +39,5 @@
       <DefineConstants>$(DefineConstants);BundleProviderKey=$(BundleProviderKey);BundleUpgradeCode=$(BundleUpgradeCode)</DefineConstants>
     </PropertyGroup>
   </Target>
+
 </Project>