Generate GUIDs for ANCM DepProviders

Author: wtgodbe

src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj

@@ -18,6 +18,12 @@
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <ANCMDepProviderKey Condition="'$(Platform)' == 'x86'">IISExpress_AspNetCore_Module_V2,x86</ANCMDepProviderKey>
+    <ANCMDepProviderKey Condition="'$(Platform)' != 'x86'">IISExpress_AspNetCore_Module_V2,x64</ANCMDepProviderKey>
+    <DefineConstants>$(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey)</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
       <Link>iisca.wxs</Link>

src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs

@@ -8,10 +8,8 @@
 <?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "de400ae0-3cd7-4a35-a234-b5a41b90893c" ?>
-  <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x86" ?>
 <?else?>
   <?define ANCMUpgradeCode = "da062c0f-12c2-4703-8ed7-0cad342a53a1" ?>
-  <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x64" ?>
 <?endif?>
 
 <?define ProductShortName="IIS Express AspNetCore Module V2" ?>
@@ -506,8 +504,8 @@
 
     <Fragment>
         <Feature Id="FT_DepProvider_$(var.ProductNameShort)" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install" AllowAbsent="no">
-            <Component Id="C_DepProvider_$(var.ProductNameShort)" Directory="TARGETDIR" Bitness="always32" Guid="*">
-                <Provides Key="$(var.ANCMDepProviderKey)" dep:Check="yes" />
+            <Component Id="C_DepProvider_$(var.ProductNameShort)" Directory="TARGETDIR" Bitness="always32" Guid="$(DepProviderGuid)">
+                <Provides Key="$(ANCMDepProviderKey)" dep:Check="yes" />
             </Component>
         </Feature>
     </Fragment>

src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

@@ -15,6 +15,12 @@
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <ANCMDepProviderKey Condition="'$(Platform)' == 'x86'">IIS_AspNetCore_Module_V2,x86</ANCMDepProviderKey>
+    <ANCMDepProviderKey Condition="'$(Platform)' != 'x86'">IIS_AspNetCore_Module_V2,x64</ANCMDepProviderKey>
+    <DefineConstants>$(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey)</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
       <Link>iisca.wxs</Link>

src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs

@@ -8,10 +8,8 @@
 <?define ProductCode = "*" ?>
 <?if $(var.IsWin64)=no ?>
   <?define ANCMUpgradeCode = "d7168f76-9dd0-407d-bf22-0b450139e6a7" ?>
-  <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x86" ?>
 <?else?>
   <?define ANCMUpgradeCode = "8d50fde7-0b84-4900-b60d-bd952979ba0b" ?>
-  <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x64" ?>
 <?endif?>
 <?define ProductShortName="IIS AspNetCore Module V2" ?>
 <?define ProductNameShort="IIS_ANCM_V2" ?>
@@ -293,8 +291,8 @@
             <ComponentRef Id="C_DepProvider_$(var.ProductNameShort)" />
         </Feature>
 
-        <Component Id="C_DepProvider_$(var.ProductNameShort)" Directory="TARGETDIR" Bitness="always32">
-            <Provides Key="$(var.ANCMDepProviderKey)" dep:Check="yes" />
+        <Component Id="C_DepProvider_$(var.ProductNameShort)" Directory="TARGETDIR" Bitness="always32" Guid="$(DepProviderGuid)">
+            <Provides Key="$(ANCMDepProviderKey)" dep:Check="yes" />
         </Component>
     </Fragment>
 

src/Installers/Windows/Wix.props

@@ -22,6 +22,7 @@
     <!-- Namespace used to generate stable UUID3 GUIDs for MSI ProductCode, etc. DO NOT CHANGE THESE. -->
     <HostingBundleNamespaceGuid>E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E</HostingBundleNamespaceGuid>
     <SharedFrameworkNamespaceGuid>C43D5520-11B3-4D62-B6FE-5D6840B04101</SharedFrameworkNamespaceGuid>
+    <ANCMNamespaceGuid>EC59D6F5-B7E6-4E46-A617-EC8329960614</ANCMNamespaceGuid>
   </PropertyGroup>
 
   <PropertyGroup>

src/Installers/Windows/Wix.targets

@@ -82,6 +82,16 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="_GenerateANCMGuids" Condition="'$(ANCMDepProviderKey)' != ''" BeforeTargets="CoreCompile">
+    <GenerateGuid NamespaceGuid="$(ANCMNamespaceGuid)" Values="$(ANCMDepProviderKey)">
+      <Output TaskParameter="Guid" PropertyName="DepProviderGuid" />
+    </GenerateGuid>
+
+    <PropertyGroup>
+      <DefineConstants>$(DefineConstants);DepProviderGuid=$(DepProviderGuid)</DefineConstants>
+    </PropertyGroup>    
+  </Target>
+
   <Target Name="_CheckPackageFileNameIsSet" BeforeTargets="PrepareForBuild">
     <Error Text="Missing required property: PackageFileName" Condition="'$(PackageFileName)' == ''" />
   </Target>