From c6e2213e818b869c44c1af7355fc06f45ebf1a1f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 11 Feb 2021 13:46:45 -0800
Subject: Replace Win64 attribute with Bitness attribute

Closes wixtoolset/#4707
---
 src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller')

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 29e15c91..c62e8153 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -3950,12 +3950,12 @@ namespace WixToolset.Core.WindowsInstaller
 
                 if (WindowsInstallerConstants.MsidbCustomActionType64BitScript == (type & WindowsInstallerConstants.MsidbCustomActionType64BitScript))
                 {
-                    xCustomAction.SetAttributeValue("Win64", "yes");
+                    xCustomAction.SetAttributeValue("Bitness", "always64");
                 }
                 else if (WindowsInstallerConstants.MsidbCustomActionTypeVBScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeVBScript) ||
                     WindowsInstallerConstants.MsidbCustomActionTypeJScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeJScript))
                 {
-                    xCustomAction.SetAttributeValue("Win64", "no");
+                    xCustomAction.SetAttributeValue("Bitness", "always32");
                 }
 
                 switch (type & WindowsInstallerConstants.MsidbCustomActionTypeExecuteBits)
@@ -4191,11 +4191,11 @@ namespace WixToolset.Core.WindowsInstaller
 
                 if (WindowsInstallerConstants.MsidbComponentAttributes64bit == (attributes & WindowsInstallerConstants.MsidbComponentAttributes64bit))
                 {
-                    xComponent.SetAttributeValue("Win64", "yes");
+                    xComponent.SetAttributeValue("Bitness", "always64");
                 }
                 else
                 {
-                    xComponent.SetAttributeValue("Win64", "no");
+                    xComponent.SetAttributeValue("Bitness", "always32");
                 }
 
                 if (WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection == (attributes & WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection))
@@ -6479,12 +6479,12 @@ namespace WixToolset.Core.WindowsInstaller
 
                     if (WindowsInstallerConstants.MsidbLocatorType64bit == (type & WindowsInstallerConstants.MsidbLocatorType64bit))
                     {
-                        xRegistrySearch.SetAttributeValue("Win64", "yes");
+                        xRegistrySearch.SetAttributeValue("Bitness", "always64");
                         type &= ~WindowsInstallerConstants.MsidbLocatorType64bit;
                     }
                     else
                     {
-                        xRegistrySearch.SetAttributeValue("Win64", "no");
+                        xRegistrySearch.SetAttributeValue("Bitness", "always32");
                     }
 
                     switch (type)
-- 
cgit v1.2.3-55-g6feb