Release v1.18.1.0

* Added full UI for uninstalling from control panel. The feature can be enabled via `project.EnableUninstallFullUI(...)` * Nsis Bootstrapper - Added support for Nsis Bootstrapper compression. - Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs) * Issue #1025: Add generated children of TypeLib to element * Issue #1014: Modify MS Build task to include configuration and platform parameters * Added support for `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`. * Issue #1023: Copy File Not working; Fixed misspelled field name * Introduce logging options for UninstallFullUI feature * Issue #1005: Request: Arm64 support * Issue #1001: Fix null reference exception if SDK is located inside the wixlocation… * Issue #999: Multiple windows services to single .exe * Issue #995: IgnoreWildCardEmptyDirectories with 1.17.0 causes Wxs generation to never finish with multiple top-level dirs * Fixed: Respect TargetFileName on OverwriteOnInstall option
oleg-shilo · Aug 14, 2021 · 33ae7c6 · 33ae7c6
1 parent 12a5210
commit 33ae7c6
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 49 deletions.
diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.WPF</id>
-    <version>1.18.0.0</version>
+    <version>1.18.1.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,24 +16,28 @@ The package contains Wix# binaries only.
 In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# (WixSharp) - Binaries</summary>
-    <releaseNotes>Release v1.18.0.0
+    <releaseNotes>Release v1.18.1.0
 
 * Added full UI for uninstalling from control panel. The feature can be enabled via `project.EnableUninstallFullUI(...)`
-* Added support for Nsis Bootstrapper compression.
-  Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Nsis Bootstrapper
+  - Added support for Nsis Bootstrapper compression.
+  - Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Issue #1025: Add generated children of TypeLib to element
+* Issue #1014: Modify MS Build task to include configuration and platform parameters
+* Added support for `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`.
+* Issue #1023: Copy File Not working; Fixed misspelled field name
 * Introduce logging options for UninstallFullUI feature
 * Issue #1005: Request: Arm64 support
 * Issue #1001: Fix null reference exception if SDK is located inside the wixlocation…
 * Issue #999: Multiple windows services to single .exe
 * Issue #995: IgnoreWildCardEmptyDirectories with 1.17.0 causes Wxs generation to never finish with multiple top-level dirs
-* Addressed U-Test failures for Issue #999 dev
-* Respect TargetFileName on OverwriteOnInstall option
+* Fixed: Respect TargetFileName on OverwriteOnInstall option
 </releaseNotes>
     <copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.18.0.0" />
+      <dependency id="WixSharp.bin" version="1.18.1.0" />
       <dependency id="Caliburn.Micro" version="3.2.0" />
     </dependencies>
     <references>

diff --git a/Source/NuGet/WixSharp/WixSharp.bin.nuspec b/Source/NuGet/WixSharp/WixSharp.bin.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp.bin</id>
-    <version>1.18.0.0</version>
+    <version>1.18.1.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,18 +16,22 @@ The package contains Wix# binaries only.
 In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# (WixSharp) - Binaries</summary>
-    <releaseNotes>Release v1.18.0.0
+    <releaseNotes>Release v1.18.1.0
 
 * Added full UI for uninstalling from control panel. The feature can be enabled via `project.EnableUninstallFullUI(...)`
-* Added support for Nsis Bootstrapper compression.
-  Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Nsis Bootstrapper
+  - Added support for Nsis Bootstrapper compression.
+  - Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Issue #1025: Add generated children of TypeLib to element
+* Issue #1014: Modify MS Build task to include configuration and platform parameters
+* Added support for `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`.
+* Issue #1023: Copy File Not working; Fixed misspelled field name
 * Introduce logging options for UninstallFullUI feature
 * Issue #1005: Request: Arm64 support
 * Issue #1001: Fix null reference exception if SDK is located inside the wixlocation…
 * Issue #999: Multiple windows services to single .exe
 * Issue #995: IgnoreWildCardEmptyDirectories with 1.17.0 causes Wxs generation to never finish with multiple top-level dirs
-* Addressed U-Test failures for Issue #999 dev
-* Respect TargetFileName on OverwriteOnInstall option
+* Fixed: Respect TargetFileName on OverwriteOnInstall option
 </releaseNotes>
     <copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
     <language>en-AU</language>

diff --git a/Source/NuGet/WixSharp/WixSharp.lab.nuspec b/Source/NuGet/WixSharp/WixSharp.lab.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.Lab</id>
-    <version>1.18.0.0</version>
+    <version>1.18.1.0</version>
     <title>Wix# (WixSharp) - Experimantal features</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -14,18 +14,22 @@
 The package contains the sample code for building a simple MSI with the CLR WinForm dialog inserted into UI sequence between InsallDirDlg and VerifyReadyDlg native MSI dialogs. In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# binaries containing experimental features (e.g. native WiX UI support).</summary>
-    <releaseNotes>Release v1.18.0.0
+    <releaseNotes>Release v1.18.1.0
 
 * Added full UI for uninstalling from control panel. The feature can be enabled via `project.EnableUninstallFullUI(...)`
-* Added support for Nsis Bootstrapper compression.
-  Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Nsis Bootstrapper
+  - Added support for Nsis Bootstrapper compression.
+  - Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Issue #1025: Add generated children of TypeLib to element
+* Issue #1014: Modify MS Build task to include configuration and platform parameters
+* Added support for `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`.
+* Issue #1023: Copy File Not working; Fixed misspelled field name
 * Introduce logging options for UninstallFullUI feature
 * Issue #1005: Request: Arm64 support
 * Issue #1001: Fix null reference exception if SDK is located inside the wixlocation…
 * Issue #999: Multiple windows services to single .exe
 * Issue #995: IgnoreWildCardEmptyDirectories with 1.17.0 causes Wxs generation to never finish with multiple top-level dirs
-* Addressed U-Test failures for Issue #999 dev
-* Respect TargetFileName on OverwriteOnInstall option
+* Fixed: Respect TargetFileName on OverwriteOnInstall option
 </releaseNotes>
     <copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
     <language>en-AU</language>
@@ -35,7 +39,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
       <frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
     </frameworkAssemblies>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.18.0.0" />
+      <dependency id="WixSharp.bin" version="1.18.1.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp</id>
-    <version>1.18.0.0</version>
+    <version>1.18.1.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,24 +18,28 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
 In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# (WixSharp) - Binaries</summary>
-    <releaseNotes>Release v1.18.0.0
+    <releaseNotes>Release v1.18.1.0
 
 * Added full UI for uninstalling from control panel. The feature can be enabled via `project.EnableUninstallFullUI(...)`
-* Added support for Nsis Bootstrapper compression.
-  Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Nsis Bootstrapper
+  - Added support for Nsis Bootstrapper compression.
+  - Added sample `BuildScriptWithCompressor` (Samples/Bootstrapper/NsisBootstrapper/setup.cs)
+* Issue #1025: Add generated children of TypeLib to element
+* Issue #1014: Modify MS Build task to include configuration and platform parameters
+* Added support for `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`.
+* Issue #1023: Copy File Not working; Fixed misspelled field name
 * Introduce logging options for UninstallFullUI feature
 * Issue #1005: Request: Arm64 support
 * Issue #1001: Fix null reference exception if SDK is located inside the wixlocation…
 * Issue #999: Multiple windows services to single .exe
 * Issue #995: IgnoreWildCardEmptyDirectories with 1.17.0 causes Wxs generation to never finish with multiple top-level dirs
-* Addressed U-Test failures for Issue #999 dev
-* Respect TargetFileName on OverwriteOnInstall option
+* Fixed: Respect TargetFileName on OverwriteOnInstall option
 </releaseNotes>
     <copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.18.0.0" />
+      <dependency id="WixSharp.bin" version="1.18.1.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Bootstrapper/WixBootstrapper/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Bootstrapper/WixBootstrapper/setup.cs
@@ -79,8 +79,12 @@ static public void Main()
 
         bootstrapper.Application.LicensePath = "licence.html";  //HyperlinkLicense app with embedded license file
         bootstrapper.Application.LicensePath = "licence.rtf"; //RtfLicense app with embedded license file
-        // bootstrapper.Application.LicensePath = "http://opensource.org/licenses/MIT"; //HyperlinkLicense app with online license file
-        // bootstrapper.Application.LicensePath = null; //HyperlinkLicense app with no license
+                                                              // bootstrapper.Application.LicensePath = "http://opensource.org/licenses/MIT"; //HyperlinkLicense app with online license file
+                                                              // bootstrapper.Application.LicensePath = null; //HyperlinkLicense app with no license
+
+        // if you want to use `WixStandardBootstrapperApplication.HyperlinkSidebarLicense`
+        // you need to clear bootstrapper.Application.LicensePath and uncomment the next line
+        // bootstrapper.Application.LogoSideFile = "logo.png";
 
         bootstrapper.Application.AttributesDefinition = "ShowVersion=yes; ShowFilesInUse=yes";
         bootstrapper.Include(WixExtension.Util);

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/CustomUI.Sequence/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/CustomUI.Sequence/setup.cs
@@ -106,20 +106,16 @@ static void ManagedUIShell_OnCurrentDialogChanged(IManagedDialog obj)
 
     static void CheckCompatibility(SetupEventArgs e)
     {
-        // MsiRuntime runtime = e.ManagedUI.Shell.MsiRuntime();
-        // foreach (string text in runtime.UIText.Keys.ToArray())
-        //     runtime.UIText[text] = runtime.UIText[text].ToUpper();
-        //MessageBox.Show("Hello World! (CLR: v" + Environment.Version + ")", "Embedded Managed UI (" + ((IntPtr.Size == 8) ? "x64" : "x86") + ")");
-
         if (e.IsInstalling)
         {
             var conflictingProductCode = "{1D6432B4-E24D-405E-A4AB-D7E6D088C111}";
 
             if (AppSearch.IsProductInstalled(conflictingProductCode))
             {
-                string msg = string.Format("Installed '{0}' is incompatible with this product.\n" +
-                                           "Setup will be aborted.",
-                                           AppSearch.GetProductName(conflictingProductCode) ?? conflictingProductCode);
+                string msg = "Installed '{0}' is incompatible with this product.\n" +
+                                "Setup will be aborted."
+                                .FormatWith(AppSearch.GetProductName(conflictingProductCode) ?? conflictingProductCode);
+
                 MessageBox.Show(msg, "Setup");
                 e.Result = ActionResult.UserExit;
             }

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/SetupEvents/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/SetupEvents/setup.cs
@@ -14,7 +14,7 @@
 using WixSharp;
 using WixSharp.CommonTasks;
 
-public class Script
+public static class Script
 {
     static public void Main()
     {
@@ -73,12 +73,26 @@ static public void Main()
                 Tasks.StartService("some_service", throwOnError: false);
         };
 
+        // project.UnelevateAfterInstallEvent(); // just for demo purposes
+
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b");
-        // project.PreserveTempFiles = true;
+        project.PreserveTempFiles = true;
 
         Compiler.BuildMsi(project);
     }
 
+    static ManagedProject UnelevateAfterInstallEvent(this ManagedProject project)
+    {
+        project.WixSourceGenerated +=
+            doc =>
+            {
+                doc.FindAll("CustomAction")
+                   .Single(x => x.HasAttribute("Id", "WixSharp_AfterInstall_Action"))
+                   .SetAttribute("Execute", "immediate");
+            };
+        return project;
+    }
+
     static void Project_UIInitialized(SetupEventArgs e)
     {
         // just an example of restarting the setup UI elevated. Old fashioned but... convenient and reliable.

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Release Folder/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Release Folder/setup.cs
@@ -46,6 +46,7 @@ static void SimpleScenario2()
 
         new ExeFileShortcut("Uninstall My Product", "[System64Folder]msiexec.exe", "/x [ProductCode]")));
 
+        project.PreserveTempFiles = true;
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1561ba25889b");
 
         project.BuildMsi();

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/WinService/With_WiX/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/WinService/With_WiX/setup.cs
@@ -37,7 +37,7 @@ static public void Main()
                                      RebootMessage = "Failure actions do not specify reboot",
                                      DependsOn = new[]
                                      {
-                                         new ServiceDependency("Dnscache"),
+                                         new ServiceDependency("[Dnscache]"),
                                          new ServiceDependency("Dhcp"),
                                      },
                                  }),

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
@@ -3679,11 +3679,12 @@
             <param name="context"></param>
         </member>
         <member name="T:WixSharp.CopyFile">
-             <summary>
-
-             </summary>
-             <seealso cref="T:WixSharp.WixEntity" />
-             <seealso cref="T:WixSharp.IGenericEntity" />
+            <summary>
+            This class implements 'CopyFile' WiX element.
+            <para>This feature has been contributed as the result of "CopyFile element not implemented #801"</para>
+            </summary>
+            <seealso cref="T:WixSharp.WixEntity" />
+            <seealso cref="T:WixSharp.IGenericEntity" />
         </member>
         <member name="M:WixSharp.CopyFile.#ctor(WixSharp.Id)">
             <summary>
@@ -3736,9 +3737,9 @@
             Set this value to a property that will have a value that resolves to the full path of the destination directory. The property does not have to exist in the installer database at creation time; it could be created at installation time by a custom action, on the command line, etc. This attribute cannot be specified in conjunction with DestinationDirectory.
             </summary>
         </member>
-        <member name="F:WixSharp.CopyFile.Field">
+        <member name="F:WixSharp.CopyFile.FileId">
             <summary>
-            The field 	This attribute cannot be specified if the element is nested under a File element. Set this attribute's value to the identifier of a file from a different component to copy it based on the install state of the parent component.
+            This attribute cannot be specified if the element is nested under a File element. Set this attribute's value to the identifier of a file from a different component to copy it based on the install state of the parent component.
             </summary>
         </member>
         <member name="F:WixSharp.CopyFile.SourceDirectory">

diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs
@@ -7,5 +7,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.18.0.0")]
-[assembly: AssemblyFileVersion("1.18.0.0")]
+[assembly: AssemblyVersion("1.18.1.0")]
+[assembly: AssemblyFileVersion("1.18.1.0")]