Replace Win64 attribute with Bitness attribute

author: Rob Mensching <rob@firegiant.com> 2021-02-11 15:29:36 -0800
committer: Rob Mensching <rob@firegiant.com> 2021-02-11 15:36:16 -0800
commit: e697f71971eeab96fc6ea6c0ad966a863547aeda (patch)
tree: 83305ea82229ca587e75b41ea0c5ed666c08e5be
parent: d575e10df780bd27c880feb3b3c8ef9546bc8549 (diff)
download: wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.tar.gz
wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.tar.bz2
wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.zip
6 files changed, 7 insertions, 7 deletions
diff --git a/global.json b/global.json
index 0124a83d..98cf5be7 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
  "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0186"
+    "WixToolset.Sdk": "4.0.0-build-0188"
  }
 }
diff --git a/src/wixlib/NetCoreShared.wxs b/src/wixlib/NetCoreShared.wxs
index 18f9e5a4..540eae6a 100644
--- a/src/wixlib/NetCoreShared.wxs
+++ b/src/wixlib/NetCoreShared.wxs
@@ -14,7 +14,7 @@
        Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
        Value="InstallLocation"
        Result="value"
-        Win64="no" />
+        Bitness="always32" />
  </Fragment>
  <?endforeach?>
 </Wix>
diff --git a/src/wixlib/NetFx2.wxs b/src/wixlib/NetFx2.wxs
index 92386b02..9ca358f1 100644
--- a/src/wixlib/NetFx2.wxs
+++ b/src/wixlib/NetFx2.wxs
@@ -38,7 +38,7 @@
    <!-- Location of .NET Framework 2.0 (64-bit) redistributable install root directory -->
    <Fragment>
        <Property Id="NETFRAMEWORK20INSTALLROOTDIR64" Secure="yes">
-            <RegistrySearch Id="NetFxInstallRootForNetfx20Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx20Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
                <DirectorySearch Id="NetFx20InstallRootSearch64" Path="v2.0.50727" Depth="0" />
            </RegistrySearch>
        </Property>
diff --git a/src/wixlib/NetFx3.5.wxs b/src/wixlib/NetFx3.5.wxs
index 422608da..7544e433 100644
--- a/src/wixlib/NetFx3.5.wxs
+++ b/src/wixlib/NetFx3.5.wxs
@@ -50,7 +50,7 @@
    <!-- Location of .NET Framework 3.5 (64-bit) redistributable install root directory -->
    <Fragment>
        <Property Id="NETFRAMEWORK35INSTALLROOTDIR64" Secure="yes">
-            <RegistrySearch Id="NetFxInstallRootForNetfx35Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx35Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
                <DirectorySearch Id="NetFx35InstallRootSearch64" Path="v3.5" Depth="0" />
            </RegistrySearch>
        </Property>
diff --git a/src/wixlib/NetFx3.wxs b/src/wixlib/NetFx3.wxs
index 12d51750..ee5dbdb3 100644
--- a/src/wixlib/NetFx3.wxs
+++ b/src/wixlib/NetFx3.wxs
@@ -39,7 +39,7 @@
    <!-- Location of .NET Framework 3.0 (64-bit) redistributable install root directory -->
    <Fragment>
        <Property Id="NETFRAMEWORK30INSTALLROOTDIR64" Secure="yes">
-            <RegistrySearch Id="NetFxInstallRootForNetfx30Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx30Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
                <DirectorySearch Id="NetFx30InstallRootSearch64" Path="v3.0" Depth="0" />
            </RegistrySearch>
        </Property>
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index 8816a235..73e8e6e0 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -214,7 +214,7 @@
  <!-- Location of .NET Framework 4.0 client (64-bit) redistributable install root directory -->
  <Fragment>
    <Property Id="NETFRAMEWORK40CLIENTINSTALLROOTDIR64" Secure="yes">
-      <RegistrySearch Id="NetFxInstallRootForNetfx40Client64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" Win64="yes" />
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Client64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" Bitness="always64" />
    </Property>
  </Fragment>
@@ -242,7 +242,7 @@
  <!-- Location of .NET Framework 4.0 full (64-bit) redistributable install root directory -->
  <Fragment>
    <Property Id="NETFRAMEWORK40FULLINSTALLROOTDIR64" Secure="yes">
-      <RegistrySearch Id="NetFxInstallRootForNetfx40Full64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" Win64="yes" />
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Full64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" Bitness="always64" />
    </Property>
  </Fragment>
author	Rob Mensching <rob@firegiant.com>	2021-02-11 15:29:36 -0800
committer	Rob Mensching <rob@firegiant.com>	2021-02-11 15:36:16 -0800
commit	e697f71971eeab96fc6ea6c0ad966a863547aeda (patch)
tree	83305ea82229ca587e75b41ea0c5ed666c08e5be
parent	d575e10df780bd27c880feb3b3c8ef9546bc8549 (diff)
download	wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.tar.gz wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.tar.bz2 wix-e697f71971eeab96fc6ea6c0ad966a863547aeda.zip

diff --git a/global.json b/global.json index 0124a83d..98cf5be7 100644 --- a/global.json +++ b/global.json
@@ -1,5 +1,5 @@
1	{	1	{
2	"msbuild-sdks": {	2	"msbuild-sdks": {
3	"WixToolset.Sdk": "4.0.0-build-0186"	3	"WixToolset.Sdk": "4.0.0-build-0188"
4	}	4	}
5	}	5	}


diff --git a/src/wixlib/NetCoreShared.wxs b/src/wixlib/NetCoreShared.wxs index 18f9e5a4..540eae6a 100644 --- a/src/wixlib/NetCoreShared.wxs +++ b/src/wixlib/NetCoreShared.wxs
@@ -14,7 +14,7 @@
14	Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"	14	Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
15	Value="InstallLocation"	15	Value="InstallLocation"
16	Result="value"	16	Result="value"
17	Win64="no" />	17	Bitness="always32" />
18	</Fragment>	18	</Fragment>
19	<?endforeach?>	19	<?endforeach?>
20	</Wix>	20	</Wix>


diff --git a/src/wixlib/NetFx2.wxs b/src/wixlib/NetFx2.wxs index 92386b02..9ca358f1 100644 --- a/src/wixlib/NetFx2.wxs +++ b/src/wixlib/NetFx2.wxs
@@ -38,7 +38,7 @@
38	<!-- Location of .NET Framework 2.0 (64-bit) redistributable install root directory -->	38	<!-- Location of .NET Framework 2.0 (64-bit) redistributable install root directory -->
39	<Fragment>	39	<Fragment>
40	<Property Id="NETFRAMEWORK20INSTALLROOTDIR64" Secure="yes">	40	<Property Id="NETFRAMEWORK20INSTALLROOTDIR64" Secure="yes">
41	<RegistrySearch Id="NetFxInstallRootForNetfx20Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">	41	<RegistrySearch Id="NetFxInstallRootForNetfx20Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
42	<DirectorySearch Id="NetFx20InstallRootSearch64" Path="v2.0.50727" Depth="0" />	42	<DirectorySearch Id="NetFx20InstallRootSearch64" Path="v2.0.50727" Depth="0" />
43	</RegistrySearch>	43	</RegistrySearch>
44	</Property>	44	</Property>


diff --git a/src/wixlib/NetFx3.5.wxs b/src/wixlib/NetFx3.5.wxs index 422608da..7544e433 100644 --- a/src/wixlib/NetFx3.5.wxs +++ b/src/wixlib/NetFx3.5.wxs
@@ -50,7 +50,7 @@
50	<!-- Location of .NET Framework 3.5 (64-bit) redistributable install root directory -->	50	<!-- Location of .NET Framework 3.5 (64-bit) redistributable install root directory -->
51	<Fragment>	51	<Fragment>
52	<Property Id="NETFRAMEWORK35INSTALLROOTDIR64" Secure="yes">	52	<Property Id="NETFRAMEWORK35INSTALLROOTDIR64" Secure="yes">
53	<RegistrySearch Id="NetFxInstallRootForNetfx35Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">	53	<RegistrySearch Id="NetFxInstallRootForNetfx35Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
54	<DirectorySearch Id="NetFx35InstallRootSearch64" Path="v3.5" Depth="0" />	54	<DirectorySearch Id="NetFx35InstallRootSearch64" Path="v3.5" Depth="0" />
55	</RegistrySearch>	55	</RegistrySearch>
56	</Property>	56	</Property>


diff --git a/src/wixlib/NetFx3.wxs b/src/wixlib/NetFx3.wxs index 12d51750..ee5dbdb3 100644 --- a/src/wixlib/NetFx3.wxs +++ b/src/wixlib/NetFx3.wxs
@@ -39,7 +39,7 @@
39	<!-- Location of .NET Framework 3.0 (64-bit) redistributable install root directory -->	39	<!-- Location of .NET Framework 3.0 (64-bit) redistributable install root directory -->
40	<Fragment>	40	<Fragment>
41	<Property Id="NETFRAMEWORK30INSTALLROOTDIR64" Secure="yes">	41	<Property Id="NETFRAMEWORK30INSTALLROOTDIR64" Secure="yes">
42	<RegistrySearch Id="NetFxInstallRootForNetfx30Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Win64="yes">	42	<RegistrySearch Id="NetFxInstallRootForNetfx30Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
43	<DirectorySearch Id="NetFx30InstallRootSearch64" Path="v3.0" Depth="0" />	43	<DirectorySearch Id="NetFx30InstallRootSearch64" Path="v3.0" Depth="0" />
44	</RegistrySearch>	44	</RegistrySearch>
45	</Property>	45	</Property>


diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs index 8816a235..73e8e6e0 100644 --- a/src/wixlib/NetFx4.wxs +++ b/src/wixlib/NetFx4.wxs
@@ -214,7 +214,7 @@
214	<!-- Location of .NET Framework 4.0 client (64-bit) redistributable install root directory -->	214	<!-- Location of .NET Framework 4.0 client (64-bit) redistributable install root directory -->
215	<Fragment>	215	<Fragment>
216	<Property Id="NETFRAMEWORK40CLIENTINSTALLROOTDIR64" Secure="yes">	216	<Property Id="NETFRAMEWORK40CLIENTINSTALLROOTDIR64" Secure="yes">
217	<RegistrySearch Id="NetFxInstallRootForNetfx40Client64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" Win64="yes" />	217	<RegistrySearch Id="NetFxInstallRootForNetfx40Client64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" Bitness="always64" />
218	</Property>	218	</Property>
219	</Fragment>	219	</Fragment>
220		220
@@ -242,7 +242,7 @@
242	<!-- Location of .NET Framework 4.0 full (64-bit) redistributable install root directory -->	242	<!-- Location of .NET Framework 4.0 full (64-bit) redistributable install root directory -->
243	<Fragment>	243	<Fragment>
244	<Property Id="NETFRAMEWORK40FULLINSTALLROOTDIR64" Secure="yes">	244	<Property Id="NETFRAMEWORK40FULLINSTALLROOTDIR64" Secure="yes">
245	<RegistrySearch Id="NetFxInstallRootForNetfx40Full64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" Win64="yes" />	245	<RegistrySearch Id="NetFxInstallRootForNetfx40Full64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" Bitness="always64" />
246	</Property>	246	</Property>
247	</Fragment>	247	</Fragment>
248		248