Use PerUserProgramFilesFolder for default INSTALLFOLDER in a per-user packagerobmen/peruser-installfolder

Fixes 8101

5 files changed, 54 insertions, 17 deletions

diff --git a/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs b/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
index b433b039..5c50ecb8 100644
--- a/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
@@ -11,7 +11,8 @@ namespace WixToolset.Core.Link
     internal class AddDefaultSymbolsCommand
     {
         public static readonly string WixStandardInstallFolder = "INSTALLFOLDER";
-        public static readonly string WixStandardInstallFolderParent = "ProgramFiles6432Folder";
+        public static readonly string WixStandardPerMachineInstallFolderParent = "ProgramFiles6432Folder";
+        public static readonly string WixStandardPerUserInstallFolderParent = "PerUserProgramFilesFolder";
         public static readonly string WixStandardInstallFolderReference = "Directory:INSTALLFOLDER";
 
         public AddDefaultSymbolsCommand(FindEntrySectionAndLoadSymbolsCommand find, IList<IntermediateSection> sections)
@@ -26,28 +27,31 @@ namespace WixToolset.Core.Link
 
         public void Execute()
         {
-            if (this.Find.EntrySection.Type != SectionType.Package)
+            if (this.Find.EntrySection.Type != SectionType.Package || this.Find.EntrySection.Symbols.Count == 0)
             {
                 // Only packages...for now.
                 return;
             }
 
+            var packageSymbol = this.Find.EntrySection.Symbols.OfType<WixPackageSymbol>().First();
+
             // If a directory with id INSTALLFOLDER hasn't been authored, provide a default one.
             if (!this.Find.SymbolsByName.ContainsKey(WixStandardInstallFolderReference))
             {
                 var sourceLineNumber = new SourceLineNumber("DefaultInstallFolder");
+                var parentDirectoryRef = packageSymbol.PerUser ? WixStandardPerUserInstallFolderParent : WixStandardPerMachineInstallFolderParent;
 
                 this.AddSymbolsToNewSection(WixStandardInstallFolder,
                     new DirectorySymbol(sourceLineNumber, new Identifier(AccessModifier.Global, WixStandardInstallFolder))
                     {
-                        ParentDirectoryRef = WixStandardInstallFolderParent,
+                        ParentDirectoryRef = parentDirectoryRef,
                         Name = "!(bind.Property.Manufacturer) !(bind.Property.ProductName)",
                         SourceName = ".",
                     },
                     new WixSimpleReferenceSymbol(sourceLineNumber, new Identifier(AccessModifier.Global, WixStandardInstallFolder))
                     {
                         Table = "Directory",
-                        PrimaryKeys = WixStandardInstallFolderParent,
+                        PrimaryKeys = parentDirectoryRef,
                     }
                 );
             }
@@ -58,10 +62,7 @@ namespace WixToolset.Core.Link
             var symbols = this.Sections.SelectMany(section => section.Symbols);
             if (!symbols.OfType<UpgradeSymbol>().Any(us => !us.OnlyDetect))
             {
-                var packageSymbol = this.Find.EntrySection.Symbols.OfType<WixPackageSymbol>().FirstOrDefault();
-
-                if (packageSymbol?.UpgradeStrategy == WixPackageUpgradeStrategy.MajorUpgrade
-                    && !String.IsNullOrEmpty(packageSymbol?.UpgradeCode))
+                if (packageSymbol.MajorUpgradeStrategy && !String.IsNullOrEmpty(packageSymbol?.UpgradeCode))
                 {
                     this.AddDefaultMajorUpgrade(packageSymbol);
                 }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
index 7f019692..4781a115 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
@@ -14,15 +14,15 @@ namespace WixToolsetTest.CoreIntegration
     public class DirectoryFixture
     {
         [Fact]
-        public void CanGetDefaultInstallFolder()
+        public void CanGetDefaultPerMachineInstallFolder()
         {
-            var folder = TestData.Get(@"TestData\SingleFile");
+            var folder = TestData.Get("TestData", "SingleFile");
 
             using (var fs = new DisposableFileSystem())
             {
                 var baseFolder = fs.GetFolder();
                 var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+                var msiPath = Path.Combine(baseFolder, "bin", "test.msi");
 
                 var result = WixRunner.Execute(new[]
                 {
@@ -37,7 +37,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 result.AssertSuccess();
 
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
+                var intermediate = Intermediate.Load(Path.Combine(baseFolder, "bin", "test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
@@ -52,6 +52,42 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanGetDefaultPerUserInstallFolder()
+        {
+            var folder = TestData.Get("TestData", "AllUsers");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, "bin", "test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "PerUser.wxs"),
+                    "-bindpath", folder,
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                var intermediate = Intermediate.Load(Path.Combine(baseFolder, "bin", "test.wixpdb"));
+                var section = intermediate.Sections.Single();
+
+                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "INSTALLFOLDER:PerUserProgramFilesFolder:Example Corporation MsiPackage",
+                    "LocalAppDataFolder:TARGETDIR:LocalApp",
+                    "PerUserProgramFilesFolder:LocalAppDataFolder:Programs",
+                    "TARGETDIR::SourceDir",
+                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
+            }
+        }
+
+        [Fact]
         public void CanGet32bitProgramFiles6432Folder()
         {
             var folder = TestData.Get(@"TestData");
@@ -60,7 +96,7 @@ namespace WixToolsetTest.CoreIntegration
             {
                 var baseFolder = fs.GetFolder();
                 var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+                var msiPath = Path.Combine(baseFolder, "bin", "test.msi");
 
                 var result = WixRunner.Execute(new[]
                 {
@@ -74,7 +110,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 result.AssertSuccess();
 
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
+                var intermediate = Intermediate.Load(Path.Combine(baseFolder, "bin", "test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs
index 3f19277b..ee243815 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs
@@ -7,7 +7,7 @@
     <MajorUpgrade DowngradeErrorMessage="Downgrade not allowed" />
 
     <Feature Id="ProductFeature" Title="Feature title">
-        <Component Directory="DesktopFolder">
+        <Component>
             <File Source="PerUser.wxs" />
         </Component>
     </Feature>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs
index 12ba9c59..cc8f7bcd 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs
@@ -7,7 +7,7 @@
     <MajorUpgrade DowngradeErrorMessage="Downgrade not allowed" />
 
     <Feature Id="ProductFeature" Title="Feature title">
-        <Component Directory="DesktopFolder">
+        <Component>
             <File Source="PerUser.wxs" />
         </Component>
     </Feature>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs
index 293cf1fa..19c2cb6e 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs
@@ -7,7 +7,7 @@
     <MajorUpgrade DowngradeErrorMessage="Downgrade not allowed" />
 
     <Feature Id="ProductFeature" Title="Feature title">
-        <Component Directory="DesktopFolder">
+        <Component>
             <File Source="PerUser.wxs" />
         </Component>
     </Feature>