diff --git a/Source/src/WixSharp.Samples/Support/testpad/setup.cs b/Source/src/WixSharp.Samples/Support/testpad/setup.cs index b84edc20..80d75fe1 100644 --- 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 index 546caace..ab21a931 100644 Binary files a/Source/src/WixSharp.Samples/WixSharp.Lab.dll and b/Source/src/WixSharp.Samples/WixSharp.Lab.dll differ diff --git a/Source/src/WixSharp.Samples/WixSharp.Msi.dll b/Source/src/WixSharp.Samples/WixSharp.Msi.dll index e7c067d8..50b42718 100644 Binary files a/Source/src/WixSharp.Samples/WixSharp.Msi.dll and b/Source/src/WixSharp.Samples/WixSharp.Msi.dll differ diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.dll b/Source/src/WixSharp.Samples/WixSharp.UI.dll index 9b68ee9a..87921382 100644 Binary files a/Source/src/WixSharp.Samples/WixSharp.UI.dll and b/Source/src/WixSharp.Samples/WixSharp.UI.dll differ diff --git a/Source/src/WixSharp.Samples/WixSharp.dll b/Source/src/WixSharp.Samples/WixSharp.dll index eb6c543f..6a9cfe2f 100644 Binary files a/Source/src/WixSharp.Samples/WixSharp.dll and b/Source/src/WixSharp.Samples/WixSharp.dll differ diff --git a/Source/src/WixSharp.Samples/WixSharp.xml b/Source/src/WixSharp.Samples/WixSharp.xml index 7deaf6a2..5e110fe2 100644 --- a/Source/src/WixSharp.Samples/WixSharp.xml +++ b/Source/src/WixSharp.Samples/WixSharp.xml @@ -16178,7 +16178,7 @@ - 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. @@ -16557,6 +16557,26 @@ Prevents the feature from displaying in the user interface. + + + Bootstrapper variable () type. + + + + + The string type + + + + + The numeric type + + + + + The version type + + Defines WiX QtExecCmdLineAction CustomAction. diff --git a/Source/src/WixSharp/Enums.cs b/Source/src/WixSharp/Enums.cs index a205770f..22b3a278 100644 --- a/Source/src/WixSharp/Enums.cs +++ b/Source/src/WixSharp/Enums.cs @@ -277,7 +277,7 @@ public enum InstallPrivileges } /// - /// 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. /// public enum InstallScope { @@ -687,10 +687,24 @@ public enum FeatureDisplay hidden } + /// + /// Bootstrapper variable () type. + /// public enum VariableType { + /// + /// The string type + /// @string, + + /// + /// The numeric type + /// numeric, + + /// + /// The version type + /// version } } \ No newline at end of file