Skip to content

Commit 4a12c9f

Browse files
oleg-shilooleg-shilo
committed
Release v1.4.6.2
---- * Issue #96: Using WxsFiles and OutDir causes build to fail * Added Conditions for .NET Frameworks 4.5.1, 4.5.2, 4.6, 4.6.1 and 4.6.2 * Fixed problem with `AddXmlInclude` when custom Project.OutDir is specified. Triggered but not related to Issue #96.
1 parent 33898df commit 4a12c9f

7 files changed

Lines changed: 94 additions & 43 deletions

File tree

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

0 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

512 Bytes
Binary file not shown.

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

Lines changed: 79 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,26 +1156,26 @@
11561156
<returns></returns>
11571157
</member>
11581158
<member name="T:WixSharp.Bootstrapper.Bundle">
1159-
<summary>
1160-
Class for defining a WiX standard Burn-based bootstrapper. By default the bootstrapper is using WiX default WiX bootstrapper UI.
1161-
</summary>
1162-
<example>The following is an example of defining a bootstrapper for two msi files and .NET Web setup.
1163-
<code>
1164-
var bootstrapper =
1165-
new Bundle("My Product",
1166-
new PackageGroupRef("NetFx40Web"),
1167-
new MsiPackage("productA.msi"),
1168-
new MsiPackage("productB.msi"));
1169-
1170-
bootstrapper.AboutUrl = "https://wixsharp.codeplex.com/";
1171-
bootstrapper.IconFile = "app_icon.ico";
1172-
bootstrapper.Version = new Version("1.0.0.0");
1173-
bootstrapper.UpgradeCode = new Guid("6f330b47-2577-43ad-9095-1861bb25889b");
1174-
bootstrapper.Application.LogoFile = "logo.png";
1159+
<summary>
1160+
Class for defining a WiX standard Burn-based bootstrapper. By default the bootstrapper is using WiX default WiX bootstrapper UI.
1161+
</summary>
1162+
<example>The following is an example of defining a bootstrapper for two msi files and .NET Web setup.
1163+
<code>
1164+
var bootstrapper =
1165+
new Bundle("My Product",
1166+
new PackageGroupRef("NetFx40Web"),
1167+
new MsiPackage("productA.msi"),
1168+
new MsiPackage("productB.msi"));
11751169

1176-
bootstrapper.Build();
1177-
</code>
1178-
</example>
1170+
bootstrapper.AboutUrl = "https://wixsharp.codeplex.com/";
1171+
bootstrapper.IconFile = "app_icon.ico";
1172+
bootstrapper.Version = new Version("1.0.0.0");
1173+
bootstrapper.UpgradeCode = new Guid("6f330b47-2577-43ad-9095-1861bb25889b");
1174+
bootstrapper.Application.LogoFile = "logo.png";
1175+
1176+
bootstrapper.Build();
1177+
</code>
1178+
</example>
11791179
</member>
11801180
<member name="M:WixSharp.Bootstrapper.Bundle.#ctor">
11811181
<summary>
@@ -1193,20 +1193,20 @@
11931193
<summary>
11941194
The disable rollbackSpecifies whether the bundle will attempt to rollback packages executed in the chain.
11951195
If "true" is specified then when a vital package fails to install only that package will rollback and the chain will stop with the error.
1196-
The default is "false" which indicates all packages executed during the chain will be rolldback to their previous state when a vital package fails.
1196+
The default is "false" which indicates all packages executed during the chain will be rollback to their previous state when a vital package fails.
11971197
</summary>
11981198
</member>
11991199
<member name="F:WixSharp.Bootstrapper.Bundle.DisableSystemRestore">
12001200
<summary>
1201-
Specifies whether the bundle will attempt to create a system restore point when executing the chain. If "true" is specified then a system restore
1202-
point will not be created. The default is "false" which indicates a system restore point will be created when the bundle is installed, uninstalled,
1201+
Specifies whether the bundle will attempt to create a system restore point when executing the chain. If "true" is specified then a system restore
1202+
point will not be created. The default is "false" which indicates a system restore point will be created when the bundle is installed, uninstalled,
12031203
repaired, modified, etc. If the system restore point cannot be created, the bundle will log the issue and continue.
12041204
</summary>
12051205
</member>
12061206
<member name="F:WixSharp.Bootstrapper.Bundle.ParallelCache">
12071207
<summary>
1208-
Specifies whether the bundle will start installing packages while other packages are still being cached.
1209-
If "true", packages will start executing when a rollback boundary is encountered. The default is "false"
1208+
Specifies whether the bundle will start installing packages while other packages are still being cached.
1209+
If "true", packages will start executing when a rollback boundary is encountered. The default is "false"
12101210
which dictates all packages must be cached before any packages will start to be installed.
12111211
</summary>
12121212
</member>
@@ -1236,14 +1236,14 @@
12361236
</member>
12371237
<member name="F:WixSharp.Bootstrapper.Bundle.DigitalSignature">
12381238
<summary>
1239-
Parameters of digitaly sign
1239+
Parameters of digitally sign
12401240
</summary>
12411241
</member>
12421242
<member name="F:WixSharp.Bootstrapper.Bundle.DisableRemove">
12431243
<summary>
12441244
Determines whether the bundle can be removed via the Programs and Features (also known as Add/Remove Programs). If the value is
12451245
"yes" then the "Uninstall" button will not be displayed. The default is "no" which ensures there is an "Uninstall" button to remove
1246-
the bundle. If the "DisableModify" attribute is also "yes" or "button" then the bundle will not be displayed in Progams and
1246+
the bundle. If the "DisableModify" attribute is also "yes" or "button" then the bundle will not be displayed in Programs and
12471247
Features and another mechanism (such as registering as a related bundle addon) must be used to ensure the bundle can be removed.
12481248
</summary>
12491249
</member>
@@ -1305,9 +1305,9 @@
13051305
<member name="F:WixSharp.Bootstrapper.Bundle.SuppressWixMbaPrereqVars">
13061306
<summary>
13071307
The suppress auto insertion of WixMbaPrereq* variables in the bundle definition (WixMbaPrereqPackageId and WixMbaPrereqLicenseUrl).
1308-
<para>BA is relying on two internal variables that reflect .NET version (and licence) that BA requires at runtime. If user defines
1309-
custom Wix# based BA the required variables are inserted automatically, similarly to the standards WiX/Burn BA. However some other
1310-
bundle packages (e.g. new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
1308+
<para>BA is relying on two internal variables that reflect .NET version (and license) that BA requires at runtime. If user defines
1309+
custom Wix# based BA the required variables are inserted automatically, similarly to the standards WiX/Burn BA. However some other
1310+
bundle packages (e.g. new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
13111311
To avoid this you can suppress variables auto-insertion and define them manually as needed.</para>
13121312
<example>The following is an example of suppressing auto-insertion:
13131313
<code>
@@ -1318,7 +1318,7 @@
13181318
Id = "MyProductPackageId",
13191319
DisplayInternalUI = true
13201320
});
1321-
1321+
13221322
bootstrapper.SuppressWixMbaPrereqVars = true;
13231323
</code>
13241324
</example>
@@ -1347,11 +1347,11 @@
13471347
</member>
13481348
<member name="F:WixSharp.Bootstrapper.Bundle.StringVariablesDefinition">
13491349
<summary>
1350-
The Bundle string variables.
1350+
The Bundle string variables.
13511351
</summary>
13521352
<para>The variables are defined as a named values map.</para>
1353-
<para>If you need to access the variable value from the Package
1354-
you will need to add the MsiProperty mapped to this variable.
1353+
<para>If you need to access the variable value from the Package
1354+
you will need to add the MsiProperty mapped to this variable.
13551355
</para>
13561356
<example>
13571357
<code>
@@ -4360,7 +4360,7 @@
43604360
</member>
43614361
<member name="M:WixSharp.Extensions.SamePathAs(System.String,System.String)">
43624362
<summary>
4363-
Returns true if bothe values represent the same path.
4363+
Returns true if both values represent the same path.
43644364
</summary>
43654365
<param name="pathA">The path a.</param>
43664366
<param name="pathB">The path b.</param>
@@ -4369,7 +4369,7 @@
43694369
<member name="M:WixSharp.Extensions.GetLocation(System.Reflection.Assembly)">
43704370
<summary>
43714371
Gets the location of the assembly.
4372-
<p>Can discover the original location of the asssembly being loaded from memory in case of a CS-Script assembly.
4372+
<p>Can discover the original location of the assembly being loaded from memory in case of a CS-Script assembly.
43734373
</p>
43744374
</summary>
43754375
<param name="assembly">The assembly.</param>
@@ -4383,6 +4383,14 @@
43834383
<param name="newDir">The new directory.</param>
43844384
<returns></returns>
43854385
</member>
4386+
<member name="M:WixSharp.Extensions.PathCombine(System.String,System.String)">
4387+
<summary>
4388+
Combines path parts. Encapsulates <see cref="M:System.IO.Path.Combine(System.String,System.String)"/>
4389+
</summary>
4390+
<param name="path1">The path1.</param>
4391+
<param name="path2">The path2.</param>
4392+
<returns></returns>
4393+
</member>
43864394
<member name="M:WixSharp.Extensions.PathChangeFileName(System.String,System.String)">
43874395
<summary>
43884396
The change the file name of the file path.
@@ -4406,6 +4414,13 @@
44064414
</summary>
44074415
<param name="path">The path.</param>
44084416
</member>
4417+
<member name="M:WixSharp.Extensions.ToAbsolutePath(System.String)">
4418+
<summary>
4419+
Converts string value representing path into an absolute path. If string is null or empty it is treated as the CurrentDirectory equivalent.
4420+
</summary>
4421+
<param name="path">The path.</param>
4422+
<returns></returns>
4423+
</member>
44094424
<member name="M:WixSharp.Extensions.PathGetFileName(System.String)">
44104425
<summary>
44114426
Identical to <see cref="M:System.IO.Path.GetFileName(System.String)"/>. It is useful for Wix# consuming code as it allows avoiding
@@ -4520,17 +4535,17 @@
45204535
</member>
45214536
<member name="M:WixSharp.Extensions.UnEscapeEnvars(System.String)">
45224537
<summary>
4523-
Unescape '\%' characters in the tokens representing environment variables (e.g. "%ProgramFiles%\My Product").
4524-
<para>Required for avoiding collisions between environment variables and WiX constants. For example to prevent
4538+
Unescape '\%' characters in the tokens representing environment variables (e.g. "%ProgramFiles%\My Product").
4539+
<para>Required for avoiding collisions between environment variables and WiX constants. For example to prevent
45254540
"%ProgramFiles%\My Product" being later converted into "ProgramFilesFolder\My Product"</para>
45264541
</summary>
45274542
<param name="text"></param>
45284543
<returns></returns>
45294544
</member>
45304545
<member name="M:WixSharp.Extensions.EscapeEnvars(System.String)">
45314546
<summary>
4532-
Escape '%' characters in the tokens representing environment variables (e.g. "%ProgramFiles%\My Product").
4533-
<para>Required for avoiding collisions between environment variables and WiX constants. For example to prevent
4547+
Escape '%' characters in the tokens representing environment variables (e.g. "%ProgramFiles%\My Product").
4548+
<para>Required for avoiding collisions between environment variables and WiX constants. For example to prevent
45344549
"%ProgramFiles%\My Product" being later converted into "ProgramFilesFolder\My Product"</para>
45354550
</summary>
45364551
<param name="text"></param>
@@ -8336,6 +8351,31 @@
83368351
The .NET4.5 installed. This condition is to be used in Project.SetNetFxPrerequisite.
83378352
</summary>
83388353
</member>
8354+
<member name="F:WixSharp.Condition.Net451_Installed">
8355+
<summary>
8356+
The .NET4.5.1 installed. This condition is to be used in Project.SetNetFxPrerequisite.
8357+
</summary>
8358+
</member>
8359+
<member name="F:WixSharp.Condition.Net452_Installed">
8360+
<summary>
8361+
The .NET4.5.2 installed. This condition is to be used in Project.SetNetFxPrerequisite.
8362+
</summary>
8363+
</member>
8364+
<member name="F:WixSharp.Condition.Net46_Installed">
8365+
<summary>
8366+
The .NET4.6 installed. This condition is to be used in Project.SetNetFxPrerequisite.
8367+
</summary>
8368+
</member>
8369+
<member name="F:WixSharp.Condition.Net461_Installed">
8370+
<summary>
8371+
The .NET4.6.1 installed. This condition is to be used in Project.SetNetFxPrerequisite.
8372+
</summary>
8373+
</member>
8374+
<member name="F:WixSharp.Condition.Net462_Installed">
8375+
<summary>
8376+
The .NET4.6.2 installed. This condition is to be used in Project.SetNetFxPrerequisite.
8377+
</summary>
8378+
</member>
83398379
<member name="F:WixSharp.Condition.Net30_SP_Installed">
83408380
<summary>
83418381
The .NET3.0 SP installed. This condition is to be used in Project.SetNetFxPrerequisite.

‎Source/src/WixSharp/Extensions.cs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ public static bool SameAs(this string strA, string strB, bool ignoreCase = false
810810
}
811811

812812
/// <summary>
813-
/// Returns true if bothe values represent the same path.
813+
/// Returns true if both values represent the same path.
814814
/// </summary>
815815
/// <param name="pathA">The path a.</param>
816816
/// <param name="pathB">The path b.</param>
@@ -825,7 +825,7 @@ public static bool SamePathAs(this string pathA, string pathB)
825825

826826
/// <summary>
827827
/// Gets the location of the assembly.
828-
/// <p>Can discover the original location of the asssembly being loaded from memory in case of a CS-Script assembly.
828+
/// <p>Can discover the original location of the assembly being loaded from memory in case of a CS-Script assembly.
829829
/// </p>
830830
/// </summary>
831831
/// <param name="assembly">The assembly.</param>
@@ -861,6 +861,12 @@ public static string PathChangeDirectory(this string path, string newDir)
861861
return IO.Path.Combine(newDir, IO.Path.GetFileName(path));
862862
}
863863

864+
/// <summary>
865+
/// Combines path parts. Encapsulates <see cref="System.IO.Path.Combine"/>
866+
/// </summary>
867+
/// <param name="path1">The path1.</param>
868+
/// <param name="path2">The path2.</param>
869+
/// <returns></returns>
864870
public static string PathCombine(this string path1, string path2)
865871
{
866872
return IO.Path.Combine(path1, path2);
@@ -898,6 +904,11 @@ public static string PathGetDirName(this string path)
898904
return IO.Path.GetDirectoryName(path);
899905
}
900906

907+
/// <summary>
908+
/// Converts string value representing path into an absolute path. If string is null or empty it is treated as the CurrentDirectory equivalent.
909+
/// </summary>
910+
/// <param name="path">The path.</param>
911+
/// <returns></returns>
901912
public static string ToAbsolutePath(this string path)
902913
{
903914
return IO.Path.GetFullPath(path.IsEmpty() ? Environment.CurrentDirectory : path);

‎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.4.6.0")]
11-
[assembly: AssemblyFileVersion("1.4.6.0")]
10+
[assembly: AssemblyVersion("1.4.6.2")]
11+
[assembly: AssemblyFileVersion("1.4.6.2")]

0 commit comments

Comments
 (0)