Skip to content

Commit 85e865f

Browse files
oleg-shilooleg-shilo
committed
Release v1.6.4.0
----- v1.6.4.0 * Implemented localization of the Feature's description text (ManagedUI) * AutoEllipsis enabled for long Feature's label text * Issue #337: How to set ManagedAction execute before Appsearch Added `SetupEventArgs.ManagedUI.Shell.CustomErrorDescription` * Add dual signing of binaries. * Issue #333: FeaturesDialog drawing issues * Added sample for "Issuae #324: Capture Msi error in bootraper" * Added support for bootstrapper generic items (`Bundle.Items`): Triggered by #315 * Issue #270: Deduplication of files added with wildcards sample dedup * Added additional resolution algorithm for FileShortcut location, which now can be both dir id and dir path. Triggered by #307 * Issue #307: Fileshortcuts starting with an integer; Removed '_' inserted by the 'start digit in the name' check for composite Dir Ids (e.g. ProgramMenuFolder.1My_Product); * Issue #180: Multiple root level directories. Added `InstallDir` class * Added `FileShortcut` constructor that does nor require 'location' parameter. It automatically creates the shortcut in the parent `Dir`. Triggered by #307. * Package WixSharp.bin: added copying nbsbuilder.exe to output folder * NuGet package(s): Added <references> section to register only managed dlls. WixSharp.bin.targets file is added to copy unmanaged dll to the output folder. * Implementation XmlFile Element * Issue #304: Localization bootstrapper via theme file * Added optional generation of the XML id attribute for `Bootstrapper.Payload.Id` * Issue #303: ExternalTool method ConsoleRun(Action<string> onConsoleOut) pass invalid unicode strings to onConsoleOut * Added `ExternalTool,Encoding`. The default value is `Encoding.UTF8`.
1 parent 7ca09c4 commit 85e865f

10 files changed

Lines changed: 93 additions & 2 deletions

File tree

‎Source/src/WixSharp.Samples/WixSharp.Lab.dll‎

0 Bytes
Binary file not shown.

‎Source/src/WixSharp.Samples/WixSharp.Msi.dll‎

-2 KB
Binary file not shown.

‎Source/src/WixSharp.Samples/WixSharp.UI.dll‎

-5.5 KB
Binary file not shown.

‎Source/src/WixSharp.Samples/WixSharp.UI.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/src/WixSharp.Samples/WixSharp.dll‎

-22 KB
Binary file not shown.

‎Source/src/WixSharp.Samples/WixSharp.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,6 +2061,21 @@
20612061
</summary>
20622062
<seealso cref="T:WixSharp.WixEntity" />
20632063
</member>
2064+
<member name="P:WixSharp.Bootstrapper.Payload.Id">
2065+
<summary>
2066+
Gets or sets the <c>Id</c> value of the <see cref="T:WixSharp.WixEntity" />.
2067+
<para>This value is used as a <c>Id</c> for the corresponding WiX XML element.</para><para>If the <see cref="P:WixSharp.Bootstrapper.Payload.Id" /> value is not specified explicitly by the user the Wix# compiler
2068+
generates it automatically insuring its uniqueness.</para><remarks>
2069+
Note: The ID auto-generation is triggered on the first access (evaluation) and in order to make the id
2070+
allocation deterministic the compiler resets ID generator just before the build starts. However if you
2071+
accessing any auto-id before the Build*() is called you can it interferes with the ID auto generation and eventually
2072+
lead to the WiX ID duplications. To prevent this from happening either:"
2073+
<para> - Avoid evaluating the auto-generated IDs values before the call to Build*()</para><para> - Set the IDs (to be evaluated) explicitly</para><para> - Prevent resetting auto-ID generator by setting WixEntity.DoNotResetIdGenerator to true";</para></remarks>
2074+
</summary>
2075+
<value>
2076+
The id.
2077+
</value>
2078+
</member>
20642079
<member name="M:WixSharp.Bootstrapper.Payload.#ctor">
20652080
<summary>
20662081
Initializes a new instance of the <see cref="T:WixSharp.Bootstrapper.Payload"/> class.
@@ -10263,6 +10278,15 @@
1026310278
<c>true</c> if error was detected; otherwise, <c>false</c>.
1026410279
</value>
1026510280
</member>
10281+
<member name="P:WixSharp.IManagedUIShell.CustomErrorDescription">
10282+
<summary>
10283+
Gets or sets the custom error description to be displayed in the ExitDialog
10284+
in case of <see cref="P:WixSharp.IManagedUIShell.ErrorDetected"/> being set to <c>true</c>.
10285+
</summary>
10286+
<value>
10287+
The custom error description.
10288+
</value>
10289+
</member>
1026610290
<member name="P:WixSharp.IManagedUIShell.Dialogs">
1026710291
<summary>
1026810292
Gets the sequence of the UI dialogs specific for the current setup type (e.g. install vs. modify).
@@ -11320,6 +11344,27 @@
1132011344
</summary>
1132111345
<param name="value">The value of the WiX condition expression.</param>
1132211346
</member>
11347+
<member name="M:WixSharp.Condition.#ctor(System.String,System.String)">
11348+
<summary>
11349+
Initializes a new instance of the <see cref="T:WixSharp.Condition"/> class.
11350+
</summary>
11351+
<param name="name">The name.</param>
11352+
<param name="expectedValue">The expected value.</param>
11353+
</member>
11354+
<member name="M:WixSharp.Condition.#ctor(System.String,System.Boolean)">
11355+
<summary>
11356+
Initializes a new instance of the <see cref="T:WixSharp.Condition"/> class.
11357+
</summary>
11358+
<param name="name">The name.</param>
11359+
<param name="expectedValue">if set to <c>true</c> [expected value].</param>
11360+
</member>
11361+
<member name="M:WixSharp.Condition.#ctor(System.String,System.Int32)">
11362+
<summary>
11363+
Initializes a new instance of the <see cref="T:WixSharp.Condition"/> class.
11364+
</summary>
11365+
<param name="name">The name.</param>
11366+
<param name="expectedValue">The expected value.</param>
11367+
</member>
1132311368
<member name="M:WixSharp.Condition.ToString">
1132411369
<summary>
1132511370
Returns the WiX <c>Condition</c> as a string.

‎Source/src/WixSharp.UI/ManagedUI/UIShell.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@ public partial class UIShell : IUIContainer, IManagedUIShell
101101
/// </value>
102102
public bool ErrorDetected { get; set; }
103103

104+
/// <summary>
105+
/// Gets or sets the custom error description to be displayed in the ExitDialog
106+
/// in case of <see cref="P:WixSharp.IManagedUIShell.ErrorDetected" /> being set to <c>true</c>.
107+
/// </summary>
108+
/// <value>
109+
/// The custom error description.
110+
/// </value>
111+
public string CustomErrorDescription { get; set; }
112+
104113
/// <summary>
105114
/// Gets the MSI installation errors.
106115
/// </summary>

‎Source/src/WixSharp/Bootstrapper/BootstrapperApplication.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,19 @@ public virtual void AutoGenerateSources(string outDir)
268268
/// <seealso cref="WixSharp.WixEntity" />
269269
public class Payload : WixEntity
270270
{
271+
/// <summary>
272+
/// Gets or sets the <c>Id</c> value of the <see cref="WixEntity" />.
273+
/// <para>This value is used as a <c>Id</c> for the corresponding WiX XML element.</para><para>If the <see cref="Id" /> value is not specified explicitly by the user the Wix# compiler
274+
/// generates it automatically insuring its uniqueness.</para><remarks>
275+
/// Note: The ID auto-generation is triggered on the first access (evaluation) and in order to make the id
276+
/// allocation deterministic the compiler resets ID generator just before the build starts. However if you
277+
/// accessing any auto-id before the Build*() is called you can it interferes with the ID auto generation and eventually
278+
/// lead to the WiX ID duplications. To prevent this from happening either:"
279+
/// <para> - Avoid evaluating the auto-generated IDs values before the call to Build*()</para><para> - Set the IDs (to be evaluated) explicitly</para><para> - Prevent resetting auto-ID generator by setting WixEntity.DoNotResetIdGenerator to true";</para></remarks>
280+
/// </summary>
281+
/// <value>
282+
/// The id.
283+
/// </value>
271284
[Xml]
272285
public new string Id
273286
{

‎Source/src/WixSharp/Condition.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,31 @@ public Condition(string value)
7575
Value = value;
7676
}
7777

78+
/// <summary>
79+
/// Initializes a new instance of the <see cref="Condition"/> class.
80+
/// </summary>
81+
/// <param name="name">The name.</param>
82+
/// <param name="expectedValue">The expected value.</param>
7883
public Condition(string name, string expectedValue)
7984
{
8085
Value = $"{name}=\"{expectedValue}\"";
8186
}
8287

88+
/// <summary>
89+
/// Initializes a new instance of the <see cref="Condition"/> class.
90+
/// </summary>
91+
/// <param name="name">The name.</param>
92+
/// <param name="expectedValue">if set to <c>true</c> [expected value].</param>
8393
public Condition(string name, bool expectedValue)
8494
{
8595
Value = $"{name}=\"{expectedValue.ToYesNo()}\"";
8696
}
8797

98+
/// <summary>
99+
/// Initializes a new instance of the <see cref="Condition"/> class.
100+
/// </summary>
101+
/// <param name="name">The name.</param>
102+
/// <param name="expectedValue">The expected value.</param>
88103
public Condition(string name, int expectedValue)
89104
{
90105
Value = $"{name}=\"{expectedValue}\"";

‎Source/src/WixSharp/Properties/AssemblyInfo.version.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
// Build Number
88
// Revision
99
//
10-
[assembly: AssemblyVersion("1.6.3.2")]
11-
[assembly: AssemblyFileVersion("1.6.3.2")]
10+
[assembly: AssemblyVersion("1.6.4.0")]
11+
[assembly: AssemblyFileVersion("1.6.4.0")]

0 commit comments

Comments
 (0)