Replace Win64 attribute with Bitness attribute
Rob Mensching committed
Feb 11, 2021 at 15:29 UTC
e697f71971eeab96fc6ea6c0ad966a863547aeda
6 files changed
+7
-7
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0186"
3
+ "WixToolset.Sdk": "4.0.0-build-0188"
4
}
5
}
src/wixlib/NetCoreShared.wxs
+1
-1
@@ -14,7 +14,7 @@
14
Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
15
Value="InstallLocation"
16
Result="value"
17
- Win64="no" />
17
+ Bitness="always32" />
18
</Fragment>
19
<?endforeach?>
20
</Wix>
src/wixlib/NetFx2.wxs
+1
-1
@@ -38,7 +38,7 @@
38
<!-- Location of .NET Framework 2.0 (64-bit) redistributable install root directory -->
39
<Fragment>
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" />
43
</RegistrySearch>
44
</Property>
src/wixlib/NetFx3.5.wxs
+1
-1
@@ -50,7 +50,7 @@
50
<!-- Location of .NET Framework 3.5 (64-bit) redistributable install root directory -->
51
<Fragment>
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" />
55
</RegistrySearch>
56
</Property>
src/wixlib/NetFx3.wxs
+1
-1
@@ -39,7 +39,7 @@
39
<!-- Location of .NET Framework 3.0 (64-bit) redistributable install root directory -->
40
<Fragment>
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" />
44
</RegistrySearch>
45
</Property>
src/wixlib/NetFx4.wxs
+2
-2
@@ -214,7 +214,7 @@
214
<!-- Location of .NET Framework 4.0 client (64-bit) redistributable install root directory -->
215
<Fragment>
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>
219
</Fragment>
220
@@ -242,7 +242,7 @@
242
<!-- Location of .NET Framework 4.0 full (64-bit) redistributable install root directory -->
243
<Fragment>
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>
247
</Fragment>
248