Release v1.11.0.0

* Added registry values aggregator (`RegKey`): ``` new RegKey(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product", new RegValue("Message", "Hello"), new RegValue("Count", 777)), ``` * Issue #699: Wix Error for ServiceInstaller if at least one ServiceConfig parameter is not specified * Improvements to DigitalSignature to allow loading cert by sha1hash * Implemented custom message dialog instead (of the default MessageBox.Show) for displaying error message (if any detected) during the MSI session. * Issue #688: Adding prompt to CloseApplication prevents installer from completing. * Issue #683. Close MSI Interop handles when getting data from MSI * Issue #672: outdir and BuildMsiCmd fails because the outdir is not created * Issue #670: msi is always creating root folder, even if feature is disabled
oleg-shilo · Aug 11, 2019 · e0c6bdf · e0c6bdf
1 parent 0ad1cc4
commit e0c6bdf
Show file tree

Hide file tree

Showing 16 changed files with 120 additions and 62 deletions.
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.10.0.0</version>
+    <version>1.11.0.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,23 +16,20 @@ 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.10.0.0
-- Issue #658: Question: how to close running application or wait until user close application manually
-- Issue #656: ExeFileShortcut changing folder name
-- Issue #649: How to add permissions to regkey
-- Issue #647: Interrupt CA execution #647; 
-- Implemented `Session.IsCanceled`
-- Added `File.OnProcess` and `DirFiles.OnProcess` to provide custom handling on processing wildcards:
+    <releaseNotes>Release v1.11.0.0
+* Added registry values aggregator (`RegKey`):
   ```
-  new Files(@"..\Release Folder\test\*.exe")
-  {
-      OnProcess = file =&gt;
-      {
-          file.OverwriteOnInstall = true;
-      }
-  }, . . .
+  new RegKey(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product",
+      new RegValue("Message", "Hello"),
+      new RegValue("Count", 777)),
   ```
-
+* Issue #699: Wix Error for ServiceInstaller if at least one ServiceConfig parameter is not specified
+* Improvements to DigitalSignature to allow loading cert by sha1hash
+* Implemented custom message dialog instead (of the default MessageBox.Show) for displaying error message (if any detected) during the MSI session.
+* Issue #688: Adding prompt to CloseApplication prevents installer from completing.
+* Issue #683. Close MSI Interop handles when getting data from MSI
+* Issue #672: outdir and BuildMsiCmd fails because the outdir is not created
+* Issue #670: msi is always creating root folder, even if feature is disabled
 </releaseNotes>
     <copyright>Copyright (C) 2004-2018 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.10.0.0</version>
+    <version>1.11.0.0</version>
     <title>Wix# (WixSharp) - Experimantal features</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -14,23 +14,20 @@
 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.10.0.0
-- Issue #658: Question: how to close running application or wait until user close application manually
-- Issue #656: ExeFileShortcut changing folder name
-- Issue #649: How to add permissions to regkey
-- Issue #647: Interrupt CA execution #647; 
-- Implemented `Session.IsCanceled`
-- Added `File.OnProcess` and `DirFiles.OnProcess` to provide custom handling on processing wildcards:
+    <releaseNotes>Release v1.11.0.0
+* Added registry values aggregator (`RegKey`):
   ```
-  new Files(@"..\Release Folder\test\*.exe")
-  {
-      OnProcess = file =&gt;
-      {
-          file.OverwriteOnInstall = true;
-      }
-  }, . . .
+  new RegKey(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product",
+      new RegValue("Message", "Hello"),
+      new RegValue("Count", 777)),
   ```
-
+* Issue #699: Wix Error for ServiceInstaller if at least one ServiceConfig parameter is not specified
+* Improvements to DigitalSignature to allow loading cert by sha1hash
+* Implemented custom message dialog instead (of the default MessageBox.Show) for displaying error message (if any detected) during the MSI session.
+* Issue #688: Adding prompt to CloseApplication prevents installer from completing.
+* Issue #683. Close MSI Interop handles when getting data from MSI
+* Issue #672: outdir and BuildMsiCmd fails because the outdir is not created
+* Issue #670: msi is always creating root folder, even if feature is disabled
 </releaseNotes>
     <copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
     <language>en-AU</language>
@@ -40,7 +37,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.10.0.0" />
+      <dependency id="WixSharp.bin" version="1.11.0.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.10.0.0</version>
+    <version>1.11.0.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,29 +18,26 @@ 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.10.0.0
-- Issue #658: Question: how to close running application or wait until user close application manually
-- Issue #656: ExeFileShortcut changing folder name
-- Issue #649: How to add permissions to regkey
-- Issue #647: Interrupt CA execution #647; 
-- Implemented `Session.IsCanceled`
-- Added `File.OnProcess` and `DirFiles.OnProcess` to provide custom handling on processing wildcards:
+    <releaseNotes>Release v1.11.0.0
+* Added registry values aggregator (`RegKey`):
   ```
-  new Files(@"..\Release Folder\test\*.exe")
-  {
-      OnProcess = file =&gt;
-      {
-          file.OverwriteOnInstall = true;
-      }
-  }, . . .
+  new RegKey(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product",
+      new RegValue("Message", "Hello"),
+      new RegValue("Count", 777)),
   ```
-
+* Issue #699: Wix Error for ServiceInstaller if at least one ServiceConfig parameter is not specified
+* Improvements to DigitalSignature to allow loading cert by sha1hash
+* Implemented custom message dialog instead (of the default MessageBox.Show) for displaying error message (if any detected) during the MSI session.
+* Issue #688: Adding prompt to CloseApplication prevents installer from completing.
+* Issue #683. Close MSI Interop handles when getting data from MSI
+* Issue #672: outdir and BuildMsiCmd fails because the outdir is not created
+* Issue #670: msi is always creating root folder, even if feature is disabled
 </releaseNotes>
     <copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.10.0.0" />
+      <dependency id="WixSharp.bin" version="1.11.0.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/.../src/WixSharp.Samples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/Embedded/setup.exe b/.../src/WixSharp.Samples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/Embedded/setup.exe
diff --git a/...amples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/CustomAction.dll b/...amples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/CustomAction.dll
diff --git a/...ples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/DispalyMessage.dll b/...ples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/DispalyMessage.dll
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi b/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/InjectXML/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/InjectXML/setup.cs
@@ -51,15 +51,15 @@ static public void Main()
         project.Media.Clear(); // clear default media as we will add it via MediaTemplate
         project.WixSourceGenerated += document =>
         {
-            document.Root.Select("Product")
-                         .AddElement("MediaTemplate", "CabinetTemplate=cab{0}.cab; CompressionLevel=mszip");
+            document.Select("Wix/Product")
+                    .AddElement("MediaTemplate", "CabinetTemplate=cab{0}.cab; CompressionLevel=mszip");
         };
 
         // global build event
         Compiler.WixSourceGenerated += document =>
             {
-                document.Root.Select("Product/Package")
-                             .SetAttributeValue("Platform", "x64");
+                document.Select("Wix/Product/Package")
+                        .SetAttributeValue("Platform", "x64");
 
                 document.FindAll("Component")
                         .ForEach(e => e.SetAttributeValue("Win64", "yes"));

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.UI.xml b/Source/src/WixSharp.Samples/WixSharp.UI.xml
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
@@ -345,24 +345,25 @@
             Thus bootstrapper will execute <c>PrimaryFile</c> without launching <c>PrerequisiteFile</c> first.</param>
             <returns>Path to the built bootstrapper file. Returns <c>null</c> if bootstrapper cannot be built.</returns>
         </member>
-        <member name="M:WixSharp.CommonTasks.Tasks.DigitalySign(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,WixSharp.SignOutputLevel)">
+        <member name="M:WixSharp.CommonTasks.Tasks.DigitalySign(System.String,System.String,System.String,System.String,System.String,System.String,WixSharp.StoreType,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)">
              <summary>
              Applies digital signature to a file (e.g. msi, exe, dll) with MS <c>SignTool.exe</c> utility.
              Please use <see cref="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapper(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,WixSharp.SignOutputLevel)"/> for signing a bootstrapper.
              </summary>
              <param name="fileToSign">The file to sign.</param>
-             <param name="pfxFile">Specify the signing certificate in a file. If this file is a PFX with a password, the password may be supplied
+             <param name="certificateId">Specify the signing certificate in a file common name or sha1 hash. If this file is a PFX with a password, the password may be supplied
              with the <c>password</c> parameter.</param>
              <param name="timeURL">The timestamp server's URL. If this option is not present (pass to null), the signed file will not be timestamped.
              A warning is generated if timestamping fails.</param>
              <param name="password">The password to use when opening the PFX file. Should be <c>null</c> if no password required.</param>
              <param name="optionalArguments">Extra arguments to pass to the <c>SignTool.exe</c> utility.</param>
              <param name="wellKnownLocations">The optional ';' separated list of directories where SignTool.exe can be located.
              If this parameter is not specified WixSharp will try to locate the SignTool in the built-in well-known locations (system PATH)</param>
-             <param name="useCertificateStore">A flag indicating if the value of <c>pfxFile</c> is a name of the subject of the signing certificate
+             <param name="certificateStore">Where to load the certificate from.
              from the certificate store (as opposite to the certificate file). This value can be a substring of the entire subject name.</param>
              <param name="dualSign">A flag indicating if the file should be signed with both SHA1 and SHA256.</param>
              <param name="outputLevel">A flag indicating the output level</param>
+             <param name="hashAlgorithm">the hash algorithm to use</param>
              <returns>Exit code of the <c>SignTool.exe</c> process.</returns>
 
              <example>The following is an example of signing <c>Setup.msi</c> file.
@@ -561,6 +562,13 @@
             <param name="item">The item.</param>
             <returns></returns>
         </member>
+        <member name="M:WixSharp.CommonTasks.Tasks.AddRegKey(WixSharp.Project,WixSharp.RegKey)">
+            <summary>
+            Adds the registry key to the Project.
+            </summary>
+            <param name="project">The project.</param>
+            <param name="key">The key.</param>
+        </member>
         <member name="M:WixSharp.CommonTasks.Tasks.AddRegValues(WixSharp.Project,WixSharp.RegValue[])">
             <summary>
             Adds the registry values to the Project.
@@ -2828,7 +2836,7 @@
             <code>
             var project =
                 new Project("My Product",
-                    new CustomActionRef("WixCloseApplications", When.Before, Step.CostFinalize, new Condition("VersionNT > 400"),
+                    new CustomActionRef("WixCloseApplications", When.Before, Step.CostFinalize, new Condition("VersionNT > 400")),
                     new CloseApplication("MyApp.exe", true, false)),
                     ...
             Compiler.BuildMsi(project);
@@ -3249,6 +3257,16 @@
             with the <see cref="P:WixSharp.DigitalSignature.Password"/> property.
             </summary>
         </member>
+        <member name="P:WixSharp.DigitalSignature.CertificateId">
+            <summary>
+            The identifier used to locate the certificate
+            </summary>
+        </member>
+        <member name="P:WixSharp.DigitalSignature.HashAlgorithm">
+            <summary>
+            Selects the hash algorithm to apply. Default sha1
+            </summary>
+        </member>
         <member name="P:WixSharp.DigitalSignature.TimeUrl">
             <summary>The timestamp server's URL. If this option is not present (pass to null), the signed file will not be timestamped.
             A warning is generated if timestamping fails.
@@ -3284,6 +3302,11 @@
             from the certificate store (as opposite to the certificate file). This value can be a substring of the entire subject name.
             </summary>
         </member>
+        <member name="P:WixSharp.DigitalSignature.CertificateStore">
+            <summary>
+            Where to read the certificate from.
+            </summary>
+        </member>
         <member name="P:WixSharp.DigitalSignature.OutputLevel">
             <summary>
             A flag indicating the output level of the <c>SignTool.exe</c> utility.
@@ -6597,6 +6620,36 @@
             </summary>
             <param name="context">The context.</param>
         </member>
+        <member name="T:WixSharp.RegKey">
+            <summary>
+            Aggregate class for multiple <see cref="T:WixSharp.RegValue"/> with the same root key
+            </summary>
+        </member>
+        <member name="F:WixSharp.RegKey.Root">
+            <summary>
+            The registry hive name.
+            </summary>
+        </member>
+        <member name="F:WixSharp.RegKey.Key">
+            <summary>
+            The registry key name.
+            </summary>
+        </member>
+        <member name="F:WixSharp.RegKey.Win64">
+            <summary>
+            Facilitates the installation of packages that include both 32-bit and 64-bit components.
+            Set this attribute to 'yes' to mark the corresponding RegValue as a 64-bit component.
+            </summary>
+        </member>
+        <member name="M:WixSharp.RegKey.#ctor(WixSharp.Feature,WixSharp.RegistryHive,System.String,WixSharp.RegValue[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:WixSharp.RegKey"/> class with properties initialized with specified parameters.
+            </summary>
+            <param name="feature"><see cref="T:WixSharp.Feature"></see> the registry value should be included in.</param>
+            <param name="root">The registry hive name.</param>
+            <param name="key">The registry key name.</param>
+            <param name="values">The registry entry values.</param>
+        </member>
         <member name="T:WixSharp.RemoveRegistryValue">
             <summary>
             Used to remove a registry value during installation.
@@ -13347,7 +13400,7 @@
         </member>
         <member name="F:WixSharp.Dir.lastDir">
             <summary>
-            The last child <see cref="T:WixSharp.Dir"/> that was created by <see cref="!:Dir.ProcessTargetPath(string)"/>.
+            The last child <see cref="T:WixSharp.Dir"/> that was created by <see cref="M:WixSharp.Dir.ProcessTargetPath(System.String,WixSharp.Feature)"/>.
             </summary>
         </member>
         <member name="M:WixSharp.Dir.#ctor">
@@ -13473,6 +13526,7 @@
             Processes the target path by splitting path creating nested <see cref="T:WixSharp.Dir"/>s on-fly.
             </summary>
             <param name="targetPath">The target path.</param>
+            <param name="feature">The feature associated with the <see cref="T:WixSharp.Dir"/>.</param>
             <returns></returns>
         </member>
         <member name="T:WixSharp.InstallDir">
@@ -16176,6 +16230,13 @@
             Initializes a new instance of the <see cref="T:WixSharp.RegValue"/> class.
             </summary>
         </member>
+        <member name="M:WixSharp.RegValue.#ctor(System.String,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:WixSharp.RegValue"/> class with properties initialized with specified parameters.
+            </summary>
+            <param name="name">The registry entry name.</param>
+            <param name="value">The registry entry value.</param>
+        </member>
         <member name="M:WixSharp.RegValue.#ctor(System.String,System.String,System.Object)">
             <summary>
             Initializes a new instance of the <see cref="T:WixSharp.RegValue"/> class with properties initialized with specified parameters.

diff --git a/Source/src/WixSharp/Dir.cs b/Source/src/WixSharp/Dir.cs
@@ -76,7 +76,7 @@ namespace WixSharp
     public class Dir : WixEntity
     {
         /// <summary>
-        /// The last child <see cref="Dir"/> that was created by <see cref="Dir.ProcessTargetPath(string)"/>.
+        /// The last child <see cref="Dir"/> that was created by <see cref="Dir.ProcessTargetPath(string, Feature)"/>.
         /// </summary>
         protected Dir lastDir;
 
@@ -338,6 +338,7 @@ internal get
         /// Processes the target path by splitting path creating nested <see cref="Dir"/>s on-fly.
         /// </summary>
         /// <param name="targetPath">The target path.</param>
+        /// <param name="feature">The feature associated with the <see cref="Dir"/>.</param>
         /// <returns></returns>
         protected Dir ProcessTargetPath(string targetPath, Feature feature)
         {

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.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
+[assembly: AssemblyVersion("1.11.0.0")]
+[assembly: AssemblyFileVersion("1.11.0.0")]