Release v1.6.2.0

----- * All samples updated to comply with the latest ID allocation algorithm * Implemented proper Bootstrapper Variables * Renamed `Bundle.StringVariablesDefinition` -> `Bundle.Variables` * Issue #295: In x64 projects, only add Win64=yes to components that haven't already explicitly specified this attribute. Fixes #295 * Issue #294: Bootstrapper.PreserveDbgFiles not work. * Issue #290: Error LGHT0094 : Unresolved reference to symbol 'File:Registrator.exe' * NativeBootstrapper source code has been placed under source control now. * Issue #282: Built-in installer placeholders are displayed as format strings with [N] brackets * Issue #280: A Shortcut's generated ID is different from what it is explicitly set to * Issue #276: HashedTargetPathIdAlgorithm emmits duplicated IDs for Cyrilic file names * Issue #265: Exception using RegFile class with REGEDIT4 version reg file * Issue #267: Set ARPINSTALLLOCATION custom action in wrong place * Issue #264: Project.SetVersionFrom() and Project.Version * Issue #268: Files starting with a number cause error - Every identifier must begin with either a letter or an underscore. * Condition class: add logical operators &, |, NOT * Condition class: added Net47_Installed condition * `Project.HashedTargetPathIdAlgorithm` is enabled now by default. Triggered by #204.
oleg-shilo · Feb 15, 2018 · 1eb9ddc · 1eb9ddc
1 parent 8b6923c
commit 1eb9ddc
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 3 deletions.
diff --git a/Source/src/WixSharp.Samples/Support/testpad/setup.cs b/Source/src/WixSharp.Samples/Support/testpad/setup.cs
@@ -26,6 +26,37 @@ static void prepare_dirs(string root)
     }
 
     static public void Main(string[] args)
+    {
+        Compiler.AutoGeneration.LegacyDefaultIdAlgorithm = true;
+
+        var serverFeature = new Feature("Server");
+        var completeFeature = new Feature("Complete Deployment");
+        completeFeature.Add(serverFeature);
+
+        Dir logDir;
+        Project project = new Project("TaxPacc",
+                new LaunchCondition("CUSTOM_UI=\"true\" OR REMOVE=\"ALL\"", "Please run setup.exe instead."),
+                new Dir(@"%ProgramFiles%\TaxPacc",
+                    new File(completeFeature, "setup.cs")),
+
+                // logDir = new Dir(@"%CommonAppDataFolder%\TaxPacc\Server",
+                //     new DirPermission("serviceaccountusername", "serviceaccountdomain", GenericPermission.All)));
+
+                logDir = new Dir(@"%CommonAppDataFolder%\TaxPacc\Server",
+                    new DirPermission("serviceaccountusername", "serviceaccountdomain", GenericPermission.All)
+                    {
+                        // Features = new[] { completeFeature, serverFeature }
+                    }
+                ));
+
+        logDir.AddFeatures(completeFeature, serverFeature);
+        logDir.Permissions.ForEach(p => p.Features = logDir.Features);
+
+        project.PreserveTempFiles = true;
+        project.BuildMsi();
+    }
+
+    static public void Main1(string[] args)
     {
         var project = new ManagedProject("IsUninstallTest",
                             new Dir(@"%ProgramFiles%\UninstallTest",
@@ -74,7 +105,7 @@ static public void Main2(string[] args)
         project.BuildMsi();
     }
 
-    static public void Main1(string[] args)
+    static public void Main3(string[] args)
     {
         var application = new Feature("Application") { Name = "Application", Description = "Application" };
         var drivers = new Feature("Drivers") { Name = "Drivers", Description = "Drivers", AttributesDefinition = $"Display = {FeatureDisplay.expand}" };

diff --git a/Source/src/WixSharp.Samples/WixSharp.Lab.dll b/Source/src/WixSharp.Samples/WixSharp.Lab.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.Msi.dll b/Source/src/WixSharp.Samples/WixSharp.Msi.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.dll b/Source/src/WixSharp.Samples/WixSharp.UI.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.dll b/Source/src/WixSharp.Samples/WixSharp.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.xml b/Source/src/WixSharp.Samples/WixSharp.xml
@@ -16178,7 +16178,7 @@
         </member>
         <member name="T:WixSharp.InstallScope">
             <summary>
-            Use this attribute to specify the priviliges required to install the package on Windows Vista and above. 
+            Use this attribute to specify the priviliges required to install the package on Windows Vista and above.
             </summary>
         </member>
         <member name="F:WixSharp.InstallScope.perMachine">
@@ -16557,6 +16557,26 @@
              Prevents the feature from displaying in the user interface.
             </summary>
         </member>
+        <member name="T:WixSharp.VariableType">
+            <summary>
+            Bootstrapper variable (<see cref="T:WixSharp.Bootstrapper.Variable"/>) type.
+            </summary>
+        </member>
+        <member name="F:WixSharp.VariableType.string">
+            <summary>
+            The string type
+            </summary>
+        </member>
+        <member name="F:WixSharp.VariableType.numeric">
+            <summary>
+            The numeric type
+            </summary>
+        </member>
+        <member name="F:WixSharp.VariableType.version">
+            <summary>
+            The version type
+            </summary>
+        </member>
         <member name="T:WixSharp.WixQuietExecAction">
              <summary>
              Defines WiX <c>QtExecCmdLineAction</c> CustomAction.

diff --git a/Source/src/WixSharp/Enums.cs b/Source/src/WixSharp/Enums.cs
@@ -277,7 +277,7 @@ public enum InstallPrivileges
     }
 
     /// <summary>
-    /// Use this attribute to specify the priviliges required to install the package on Windows Vista and above. 
+    /// Use this attribute to specify the priviliges required to install the package on Windows Vista and above.
     /// </summary>
     public enum InstallScope
     {
@@ -687,10 +687,24 @@ public enum FeatureDisplay
         hidden
     }
 
+    /// <summary>
+    /// Bootstrapper variable (<see cref="WixSharp.Bootstrapper.Variable"/>) type.
+    /// </summary>
     public enum VariableType
     {
+        /// <summary>
+        /// The string type
+        /// </summary>
         @string,
+
+        /// <summary>
+        /// The numeric type
+        /// </summary>
         numeric,
+
+        /// <summary>
+        /// The version type
+        /// </summary>
         version
     }
 }