Skip to content

Commit

Permalink
Release v1.14.6.0
Browse files Browse the repository at this point in the history
* Issue #866: Improvements to digital signatures. Support for signing using SHA1, SHA256, or both
* Issue #835: Confusing error: "API restriction: The assembly '' has already loaded from a different location. It cannot be loaded from a new location within the same appdomain."
* NuGet `WixSharp` package v.14.4.1: improved integration with VS templates - no need for project reload on the first run.
* Issue #856:  INSTALL_DIR should be INSTALLDIR
* Issue #591 (extended): Code signing timestamping fails if old Windows SDK is installed
* Issue #810: Localization; Added signing at teh end of `BuildMultilanguageMsi`
  • Loading branch information
lbs-contributor committed Jun 18, 2020
1 parent e1f5048 commit 08238ad
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
Binary file modified Source/src/WixSharp.Samples/WixSharp.Lab.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.Msi.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.UI.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.dll
Binary file not shown.
23 changes: 14 additions & 9 deletions Source/src/WixSharp.Samples/WixSharp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,10 @@
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,WixSharp.StoreType,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)">
<member name="M:WixSharp.CommonTasks.Tasks.DigitalySign(System.String,System.String,System.String,System.String,System.String,System.String,WixSharp.StoreType,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.
Please use <see cref="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapper(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)"/> for signing a bootstrapper.
</summary>
<param name="fileToSign">The file to sign.</param>
<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
Expand All @@ -361,9 +361,10 @@
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="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>
<param name="hashAlgorithm">the hash algorithm to use. SHA1, SHA256, or both. NOTE: MSIs only allow
a single signature. If SHA1 | SHA256 is requested, the MSI will be signed with SHA1 only.
</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.
Expand All @@ -378,7 +379,7 @@
</code>
</example>
</member>
<member name="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapper(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,WixSharp.SignOutputLevel)">
<member name="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapper(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)">
<summary>
Applies digital signature to a bootstrapper and the bootstrapper engine with MS <c>SignTool.exe</c> utility.
<a href="http://wixtoolset.org/documentation/manual/v3/overview/insignia.html">See more about bootstrapper engine signing</a>
Expand All @@ -394,8 +395,10 @@
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
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. SHA1, SHA256, or both. NOTE: MSIs only allow
a single signature. If SHA1 | SHA256 is requested, the MSI will be signed with SHA1 only.
</param>
<returns>Exit code of the <c>SignTool.exe</c> process.</returns>

<example>The following is an example of signing <c>SetupBootstrapper.exe</c> file.
Expand All @@ -409,11 +412,11 @@
</code>
</example>
</member>
<member name="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapperEngine(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,WixSharp.SignOutputLevel)">
<member name="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapperEngine(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)">
<summary>
Applies digital signature to a bootstrapper engine with MS <c>SignTool.exe</c> utility.
Note : this method doesn't sign the bootstrapper file but the engine only.
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 both (bootstrapper and bootstrapper engine) instead.
Please use <see cref="M:WixSharp.CommonTasks.Tasks.DigitalySignBootstrapper(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,WixSharp.SignOutputLevel,WixSharp.HashAlgorithmType)"/> for signing both (bootstrapper and bootstrapper engine) instead.
<a href="http://wixtoolset.org/documentation/manual/v3/overview/insignia.html">See more about Bootstrapper engine signing</a>
</summary>
<param name="bootstrapperFileToSign">The Bootstrapper file to sign.</param>
Expand All @@ -427,8 +430,10 @@
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
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. SHA1, SHA256, or both. NOTE: MSIs only allow
a single signature. If SHA1 | SHA256 is requested, the MSI will be signed with SHA1 only.
</param>
<returns>Exit code of the <c>SignTool.exe</c> process.</returns>

<example>The following is an example of signing <c>SetupBootstrapper.exe</c> file engine.
Expand Down

0 comments on commit 08238ad

Please sign in to comment.