From e697f71971eeab96fc6ea6c0ad966a863547aeda Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 11 Feb 2021 15:29:36 -0800
Subject: Replace Win64 attribute with Bitness attribute

---
 global.json                  | 2 +-
 src/wixlib/NetCoreShared.wxs | 2 +-
 src/wixlib/NetFx2.wxs        | 2 +-
 src/wixlib/NetFx3.5.wxs      | 2 +-
 src/wixlib/NetFx3.wxs        | 2 +-
 src/wixlib/NetFx4.wxs        | 4 ++--
 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>
 
-- 
cgit v1.2.3-55-g6feb