Skip to content

Commit a84d369

Browse files
committed
Release v1.6.0.0
---- * Migration of WixSharp types to IGenericEntity model: * Rework Certificate using IGenericEntity * Rework SqlDatabase, SqlString and SqlScript using IGenericEntity * Rework DriverInstaller using IGenericEntity * Rework FirewallException using IGenericEntity * Rework EnvironmentVariable using IGenericEntity * Rework FirewallException using IGenericEntity * Rework User using IGenericEntity * Rework IniFile using IGenericEntity * Added support for new WiX types: * CloseAppplication * RemoveRegistryKey * Defect fixes: * Issue #258: WixSharp doesn't remove temporary files if custom output name is specified * Issue #251: Passing UseCertificateStore parameter from DigitalSignatureBootstrapper * Issue #247: Handling null TimeUrl * Issue #251: Passing UseCertificateStore parameter from DigitalSignatureBootstrapper through to DigitallySign * Issue #233: FileSearch * Issue #230: CustomAction Condition extension * Issue #226: Project.HashedTargetPathIdAlgorithm generates invalid ids * Various improvements and minor fixes: * Fixed the problem with EnvironmentVariable not having XML parent when it is hosted by the component-less WiX (e.g. ConsumingMergeModule sample). * CustomAction.UsesProperties & .RollbackArgs space trimming * Trim all spaces around properties (name and value) before passing to msi * CommonTasks.InstallService fix & new overload * Fixed installService args location, added overload that accepts username and password * Added `WixObject.MapComponentToFeatures` to assist with implementation of IGenericEntity based WiX objects. * fix "CustomActionRef.When" property handling in compile. * change to use just WixSharp.When.ToString() * fix CustomActionRef will add "Before" attribute in Custom Element even if set When.After * Added extension methods for - `Project.Add(IGenericEntity[])` - `File.Add(IGenericEntity[])` - `Dir.Add(IGenericEntity[])` * AppVeyor integration (https://ci.appveyor.com/project/oleg-shilo/wixsharp)
1 parent 81f327f commit a84d369

5 files changed

Lines changed: 13 additions & 7 deletions

File tree

Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ static public void Main(string[] args)
3232
project.SetVersionFrom("MyApp_file");
3333
project.Language = "en-US";
3434

35-
project.PreserveTempFiles =
36-
project.PreserveDbgFiles = false;
37-
3835
project.WixSourceGenerated += Compiler_WixSourceGenerated;
3936

40-
project.BuildMsi("ttt");
41-
// project.BuildMsi();
37+
project.BuildMsi();
4238
}
4339

4440
static void Compiler_WixSourceGenerated(XDocument document)
0 Bytes
Binary file not shown.
-2 KB
Binary file not shown.

Source/src/WixSharp/Extensions.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,11 +1639,21 @@ public static XElement FindFirst(this XContainer element, string elementName)
16391639
return element.Descendants().Where(x => x.Name.LocalName == elementName).FirstOrDefault();
16401640
}
16411641

1642+
/// <summary>
1643+
/// Selects the first descendant "Component" element and returns its parent XElement.
1644+
/// </summary>
1645+
/// <param name="element">The element to be searched.</param>
1646+
/// <returns>Parent XElement of the first component.</returns>
16421647
public static XElement FindFirstComponentParent(this XContainer element)
16431648
{
16441649
return element.FindFirst("Component")?.Parent;
16451650
}
16461651

1652+
/// <summary>
1653+
/// Selects the first descendant "Directory" element that has no other sub-directories (child "Directory" XElements).
1654+
/// </summary>
1655+
/// <param name="element">The element to be searched.</param>
1656+
/// <returns>Directory XElement.</returns>
16471657
public static XElement FindLastDirectory(this XContainer element)
16481658
{
16491659
return element.Descendants("Directory")

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.5.0.0")]
11-
[assembly: AssemblyFileVersion("1.5.0.0")]
10+
[assembly: AssemblyVersion("1.6.0.0")]
11+
[assembly: AssemblyFileVersion("1.6.0.0")]

0 commit comments

Comments
 (0)