Some feedback

wtgodbe · wtgodbe · commit 2191f2a55be5 · 2025-09-08T09:30:43.000-07:00
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
@@ -16,7 +16,7 @@
     <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
     <!-- We import D.B.T ourselves in this file -->
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-    <!-- False positive in aspnetcoremodulev2.wxs -->
+    <!-- False positive in ancm_iis_expressv2.wxs -->
     <SuppressSpecificWarnings>5437</SuppressSpecificWarnings>
   </PropertyGroup>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi
@@ -5,7 +5,7 @@
 
 <!-- Be sure to include the common setup include file in your project if using this file! 
 
-<?include $(var.PROJECT_ROOT)\setup\include.wxi ?>
+<?include $(PROJECT_ROOT)\setup\include.wxi ?>
 
 -->
 
@@ -21,36 +21,36 @@
 
         <!-- iis installation lookup -->
         <Property Id="IISINSTALLPATH" Admin="no" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Bitness="$(Bitness)" />
         </Property>
 
         <!-- iis features lookup -->
         <Property Id="IISCOREWEBENGINEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISW3SVCINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISADMINSERVICEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISMANAGEMENTCONSOLEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISNETFXEXTENSIBILITYINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISASPNET" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Bitness="$(Bitness)" />
         </Property>
 
         <Property Id="IISMETABASEIMAGEPATH" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Bitness="$(Bitness)" />
         </Property>
 
         <!-- UI features lookup -->
         <Property Id="IISREMOTECHANNELINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Bitness="$(Bitness)" />
         </Property>
 
         <!--
@@ -61,36 +61,36 @@
             (NOT NETFRAMEWORK20) Or (NETFRAMEWORK20_SP_LEVEL ~>= "#1") Or Installed
         -->
         <Property Id="NETFRAMEWORK20" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Bitness="$(Bitness)" />
         </Property>
         <Property Id="NETFRAMEWORK20_SP_LEVEL" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Bitness="$(Bitness)" />
         </Property>
         <Property Id="NETFRAMEWORK35_SP_LEVEL" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Bitness="$(Bitness)" />
         </Property>
 
         <!-- search for powershell v1 -->
         <Property Id="POWERSHELLINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Bitness="$(Bitness)" />
         </Property>
 
         <!-- Read the start type for the Windows Update service -->
         <Property Id="WINDOWSUPDATE_START_TYPE" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Bitness="$(Bitness)" />
         </Property>
 
         <!-- Figure out the windows sku -->
         <Property Id="WINDOWSEDITION" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Bitness="$(Bitness)" />
         </Property>
 
         <!-- search for web pi -->
         <Property Id="WEBPI3INSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Bitness="$(Bitness)" />
         </Property>
 
         <Property Id="WEBPI4INSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Bitness="$(var.Bitness)" />
+            <RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Bitness="$(Bitness)" />
         </Property>
 </Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi
@@ -11,7 +11,7 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi
@@ -11,7 +11,7 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi
@@ -11,7 +11,7 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi
@@ -11,7 +11,7 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs
@@ -1,6 +1,6 @@
 ﻿<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="$(var.ProductName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" InstallerVersion="$(var.InstallerVersion)" ProductCode="$(var.ProductCode)">
+    <Package Name="$(ProductName)" Language="1033" Version="$(Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(UpgradeCode)" InstallerVersion="$(InstallerVersion)" ProductCode="$(ProductCode)">
         
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
         <Media Id="1" />
@@ -32,7 +32,7 @@
     <Fragment>
         <StandardDirectory Id="ProgramFiles6432Folder">
             <Directory Id="INSTALLFOLDER" Name="dotnet">
-                <Directory Id="MM" Name="$(var.MajorVersion).$(var.MinorVersion)" />
+                <Directory Id="MM" Name="$(MajorVersion).$(MinorVersion)" />
             </Directory>
         </StandardDirectory>
     </Fragment>
@@ -44,10 +44,10 @@
             <?undef ProductOptionsKey?>
             <?endif?>
 
-            <?define ProductOptionsKey=SOFTWARE\Microsoft\dotnet\host\options\$(var.MajorVersion).$(var.MinorVersion)?>
+            <?define ProductOptionsKey=SOFTWARE\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)?>
 
             <Component Id="OPT">
-                <RegistryKey Root="HKLM" Key="$(var.ProductOptionsKey)">
+                <RegistryKey Root="HKLM" Key="$(ProductOptionsKey)">
                     <RegistryValue Name="OPT_NO_ANCM" Type="integer" Value="[OPT_NO_ANCM]" KeyPath="yes" />
                     <RegistryValue Name="OPT_NO_SHAREDFX" Type="integer" Value="[OPT_NO_SHAREDFX]" />
                     <RegistryValue Name="OPT_NO_RUNTIME" Type="integer" Value="[OPT_NO_RUNTIME]" />
diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
@@ -5,17 +5,17 @@
             <RollbackBoundary Id="RB_ANCM" />
 
             <!-- OPT_NO_ANCM could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(var.AspNetCoreModuleV2_x86.TargetPath)" Name="$(var.AspNetCoreModuleV2_x86.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(AspNetCoreModuleV2_x86.TargetPath)" Name="$(AspNetCoreModuleV2_x86.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
 
             <!-- OPT_NO_SHARED_CONFIG_CHECK could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(var.AspNetCoreModuleV2_x64.TargetPath)" Name="$(var.AspNetCoreModuleV2_x64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(AspNetCoreModuleV2_x64.TargetPath)" Name="$(AspNetCoreModuleV2_x64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
             
             <!-- OPT_NO_SHARED_CONFIG_CHECK could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_arm64" SourceFile="$(var.AspNetCoreModuleV2_arm64.TargetPath)" Name="$(var.AspNetCoreModuleV2_arm64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_arm64" SourceFile="$(AspNetCoreModuleV2_arm64.TargetPath)" Name="$(AspNetCoreModuleV2_arm64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
             
diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
@@ -1,5 +1,5 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-    <Bundle Name="$(var.BundleName)" Version="$(var.BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.BundleUpgradeCode)">
+    <Bundle Name="$(BundleName)" Version="$(BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(BundleUpgradeCode)">
         <BootstrapperApplication>
           <bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770" SuppressDowngradeFailure="yes" SuppressOptionsUI="yes" ThemeFile="bundle.thm" LocalizationFile="LCID\1033\thm.wxl" Theme="hyperlinkLicense" />
           <?foreach lcid in 2052;1028;1029;1031;3082;1033;1036;1040;1041;1042;1045;1046;1049;1055?>
@@ -15,12 +15,12 @@
         <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch" />
 
         <!-- Customizations of the default BA -->
-        <Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" />
-        <OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" />
+        <Log Prefix="dd_$(BundleLogPrefix)_" Extension=".log" />
+        <OptionalUpdateRegistration Manufacturer="$(BundleRegManufacturer)" ProductFamily="$(BundleRegFamily)" Name="$(BundleRegName)" />
 
         <!-- Bundle variables -->
-        <Variable Name="BundleNameShort" Value="$(var.BundleNameShort)" Type="formatted" />
-        <Variable Name="BundleNameSub" Value="$(var.BundleNameSub)" Type="formatted" />
+        <Variable Name="BundleNameShort" Value="$(BundleNameShort)" Type="formatted" />
+        <Variable Name="BundleNameSub" Value="$(BundleNameSub)" Type="formatted" />
         <Variable Name="OPT_NO_ANCM" bal:Overridable="yes" />
         <Variable Name="OPT_NO_SHAREDFX" bal:Overridable="yes" />
         <Variable Name="OPT_NO_RUNTIME" bal:Overridable="yes" />
@@ -32,10 +32,10 @@
         <?define Options=OPT_NO_ANCM;OPT_NO_SHAREDFX;OPT_NO_RUNTIME;OPT_NO_X86;OPT_NO_SHARED_CONFIG_CHECK ?>
         <?define RegistrySeachCondition="NOT (OPT_NO_ANCM OR OPT_NO_ANCM=0 OR OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=0 OR OPT_NO_RUNTIME OR OPT_NO_RUNTIME=0 OR OPT_NO_X86 OR OPT_NO_X86=0 OR OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=0)" ?>
 
-        <?foreach Option in $(var.Options) ?>
-            <util:RegistrySearch Id="$(var.Option)_should_be_set" Condition="$(var.RegistrySeachCondition)" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)" Value="$(var.Option)" Result="exists" Variable="$(var.Option)_Exists" />
+        <?foreach Option in $(Options) ?>
+            <util:RegistrySearch Id="$(Option)_should_be_set" Condition="$(RegistrySeachCondition)" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)" Value="$(Option)" Result="exists" Variable="$(Option)_Exists" />
 
-            <util:RegistrySearch Condition="$(var.Option)_Exists" After="$(var.Option)_should_be_set" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(var.MajorVersion).$(var.MinorVersion)" Value="$(var.Option)" Variable="$(var.Option)" Result="value" />
+            <util:RegistrySearch Condition="$(Option)_Exists" After="$(Option)_should_be_set" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)" Value="$(Option)" Variable="$(Option)" Result="value" />
         <?endforeach?>
 
         <!-- These variables control the state of conditional UI text elements.
@@ -46,7 +46,7 @@
         <Variable Name="ModifyNoIISState" Value="disable" Type="formatted" />
 
         <Chain ParallelCache="yes">
-            <MsiPackage SourceFile="$(var.HostOptions.TargetPath)">
+            <MsiPackage SourceFile="$(HostOptions.TargetPath)">
                 <MsiProperty Name="OPT_NO_ANCM" Value="[OPT_NO_ANCM]" />
                 <MsiProperty Name="OPT_NO_SHAREDFX" Value="[OPT_NO_SHAREDFX]" />
                 <MsiProperty Name="OPT_NO_RUNTIME" Value="[OPT_NO_RUNTIME]" />
diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs b/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs
diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs
