Update to wix5

.azure/pipelines/ci-unofficial.yml

@@ -59,6 +59,12 @@ variables:
   value: -RuntimeSourceFeed https://ci.dot.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
          /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
+# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
+# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
+- name: _InternalRuntimeDownloadCodeSignArgs
+  value: $(_InternalRuntimeDownloadArgs)
+         /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
+         /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 - group: DotNet-HelixApi-Access
 - name: _SignType
   value: test

src/Installers/Windows/WindowsHostingBundle/ANCM.wxs

@@ -32,12 +32,6 @@
         <!-- We don't care about the results of the searches below. They are conditioned to execute if we've detected IIS.
              If IIS is found, the search will execute and the default "disable" value of the relevant variables will be changed, allowing the UI
              text to be displayed. All these searches need to execute after all the primary util:RegistrySearch operations for IIS. -->
-        <util:RegistrySearch Id="InstallResetIISStateSearch" Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))" Variable="InstallResetIISState" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
-
-        <util:RegistrySearch Id="InstallNoIISStateSearch" Condition="NOT (((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1)))" Variable="InstallNoIISState" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
-
-        <util:RegistrySearch Id="ModifyResetIISStateSearch" Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))" Variable="ModifyResetIISState" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
-
-        <util:RegistrySearch Id="ModifyNoIISStateSearch" Condition="NOT (((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1)))" Variable="ModifyNoIISState" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
+        <util:RegistrySearch Id="IISEnabledSearch" Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))" Variable="IISEnabled" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
     </Fragment>
 </Wix>

src/Installers/Windows/WindowsHostingBundle/Bundle.wxs

@@ -40,10 +40,7 @@
 
         <!-- These variables control the state of conditional UI text elements.
              They are disabled by default and enabled based on whether or not we detect that IIS is installed -->
-        <Variable Name="InstallResetIISState" Value="disable" Type="formatted" />
-        <Variable Name="InstallNoIISState" Value="disable" Type="formatted" />
-        <Variable Name="ModifyResetIISState" Value="disable" Type="formatted" />
-        <Variable Name="ModifyNoIISState" Value="disable" Type="formatted" />
+        <Variable Name="IISEnabled" Value="0" Type="numeric" />
 
         <Chain ParallelCache="yes">
             <MsiPackage SourceFile="$(HostOptions.TargetPath)">

src/Installers/Windows/WindowsHostingBundle/bundle.thm

@@ -28,8 +28,8 @@
         <Page Name="Install">
             <Label Name="WelcomeHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="000000">#(loc.Welcome)</Label>
 
-            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
-            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
+            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" EnableCondition="IISEnabled" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
+            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallNoIIS" EnableCondition="NOT IISEnabled" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
 
             <!-- Align the label with the top of the logo on the left. -->
             <Label Name="LicenseTermsAndPolicies" X="148" Y="288" Width="-12" Height="32" FontId="DefaultFont" HexStyle="000000">#(loc.LicenseAssent)</Label>
@@ -59,8 +59,8 @@
         <Page Name="Modify">
             <Label Name="ModifyHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
 
-            <Label Name="ModifyTextIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.ModifyResetIIS)</Label>
-            <Label Name="ModifyTextNoIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.ModifyNoIIS)</Label>
+            <Hypertext Name="ModifyTextIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes" EnableCondition="IISEnabled" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
+            <Hypertext Name="ModifyTextNoIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes" EnableCondition="IISEnabled" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
 
             <Button Name="RepairButton" X="-236" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
             <Button Name="UninstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>