Add support for perMachineOrUser

Resolves 9175

6 files changed, 52 insertions, 4 deletions

diff --git a/src/api/wix/WixToolset.Data/Symbols/WixPackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixPackageSymbol.cs
index 9601ec7a..82a98cc0 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixPackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixPackageSymbol.cs
@@ -54,6 +54,7 @@ namespace WixToolset.Data.Symbols
         PerMachine,
         PerUser,
         PerUserOrMachine,
+        PerMachineOrUser,
     }
 
     public enum WixPackageUpgradeStrategy
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 90b07776..8699ca2c 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -3056,9 +3056,16 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                                         {
                                             xAllUsers?.Remove();
                                         }
-                                        else if (xAllUsers?.Attribute("Value")?.Value == "2" && xMsiInstallerPerUser?.Attribute("Value")?.Value == "1")
+                                        else if (xAllUsers?.Attribute("Value")?.Value == "2")
                                         {
-                                            this.DecompilerHelper.RootElement.SetAttributeValue("Scope", "perUserOrMachine");
+                                            if (xMsiInstallerPerUser?.Attribute("Value")?.Value == "1")
+                                            {
+                                                this.DecompilerHelper.RootElement.SetAttributeValue("Scope", "perUserOrMachine");
+                                            }
+                                            else
+                                            {
+                                                this.DecompilerHelper.RootElement.SetAttributeValue("Scope", "perMachineOrUser");
+                                            }
 
                                             xAllUsers?.Remove();
                                             xMsiInstallerPerUser?.Remove();
diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs
index 466c87a3..e0af9695 100644
--- a/src/wix/WixToolset.Core/Compiler_Package.cs
+++ b/src/wix/WixToolset.Core/Compiler_Package.cs
@@ -93,6 +93,9 @@ namespace WixToolset.Core
                             case "perMachine":
                                 // handled below after we create the section.
                                 break;
+                            case "perMachineOrUser":
+                                scope = WixPackageScope.PerMachineOrUser;
+                                break;
                             case "perUser":
                                 scope = WixPackageScope.PerUser;
                                 sourceBits |= 8;
@@ -101,7 +104,7 @@ namespace WixToolset.Core
                                 scope = WixPackageScope.PerUserOrMachine;
                                 break;
                             default:
-                                this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, installScope, "perMachine", "perUser", "perUserOrMachine"));
+                                this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, installScope, "perMachine", "perMachineOrUser", "perUser", "perUserOrMachine"));
                                 break;
                             }
                         break;
@@ -210,6 +213,10 @@ namespace WixToolset.Core
                     this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "2", false, false, false, false);
                     this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "MSIINSTALLPERUSER"), "1", false, false, false, false);
                 }
+                else if (scope == WixPackageScope.PerMachineOrUser)
+                {
+                    this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "2", false, false, false, false);
+                }
                 else if (scope == WixPackageScope.PerMachine)
                 {
                     this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "1", false, false, false, false);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/AllUsersFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/AllUsersFixture.cs
index 0c1fd9e0..75c9a272 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/AllUsersFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/AllUsersFixture.cs
@@ -23,6 +23,18 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanCheckPerMachineOrUserMsi()
+        {
+            var propertyRows = BuildAndQueryPropertyTable("PerMachineOrUser.wxs");
+
+            WixAssert.CompareLineByLine(new[]
+            {
+                "_SummaryInformation:WordCount\t2",
+                "Property:ALLUSERS\t2"
+            }, propertyRows);
+        }
+
+        [Fact]
         public void CanCheckPerUserMsi()
         {
             var propertyRows = BuildAndQueryPropertyTable("PerUser.wxs");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachineOrUser.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachineOrUser.wxs
new file mode 100644
index 00000000..c0137747
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachineOrUser.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="WixToolsetTest.TestPackage"
+           Version="1"
+           Name="PerMachine Or User Msi"
+           Manufacturer="Example Corporation"
+           Scope="perMachineOrUser">
+
+    <File Source="PerMachineOrUser.wxs" />
+  </Package>
+</Wix>
diff --git a/src/xsd/wix.xsd b/src/xsd/wix.xsd
index 17111a00..cc0bc1dc 100644
--- a/src/xsd/wix.xsd
+++ b/src/xsd/wix.xsd
@@ -14187,6 +14187,16 @@
           </xs:documentation>
         </xs:annotation>
       </xs:enumeration>
+      <xs:enumeration value="perMachineOrUser">
+        <xs:annotation>
+          <xs:documentation>
+            _New in WiX v7: WiX v7 adds this option to the Package Scope attribute._
+            Set this value to declare that the package is [dual-purpose that can install per-machine or per-user](https://learn.microsoft.com/en-us/windows/win32/msi/single-package-authoring)
+            and defaults to installing per-machine.
+            Sets the ALLUSERS property to 2.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
       <xs:enumeration value="perUser">
         <xs:annotation>
           <xs:documentation>
@@ -14198,7 +14208,8 @@
       <xs:enumeration value="perUserOrMachine">
         <xs:annotation>
           <xs:documentation>
-            Set this value to declare that the package is [dual-purpose that can install per-user or per-machine](https://learn.microsoft.com/en-us/windows/win32/msi/single-package-authoring).
+            Set this value to declare that the package is [dual-purpose that can install per-user or per-machine](https://learn.microsoft.com/en-us/windows/win32/msi/single-package-authoring)
+            and defaults to installing per-user.
             Sets the ALLUSERS property to 2 and MSIINSTALLPERUSER property to 1.
           </xs:documentation>
         </xs:annotation>