Skip to content

Commit

Permalink
Release v1.6.0.0
Browse files Browse the repository at this point in the history
----
* 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)
  • Loading branch information
oleg-shilo committed Jan 12, 2018
1 parent 81f327f commit a84d369
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ static public void Main(string[] args)
project.SetVersionFrom("MyApp_file");
project.Language = "en-US";

project.PreserveTempFiles =
project.PreserveDbgFiles = false;

project.WixSourceGenerated += Compiler_WixSourceGenerated;

project.BuildMsi("ttt");
// project.BuildMsi();
project.BuildMsi();
}

static void Compiler_WixSourceGenerated(XDocument document)
Expand Down
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.
10 changes: 10 additions & 0 deletions Source/src/WixSharp/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1639,11 +1639,21 @@ public static XElement FindFirst(this XContainer element, string elementName)
return element.Descendants().Where(x => x.Name.LocalName == elementName).FirstOrDefault();
}

/// <summary>
/// Selects the first descendant "Component" element and returns its parent XElement.
/// </summary>
/// <param name="element">The element to be searched.</param>
/// <returns>Parent XElement of the first component.</returns>
public static XElement FindFirstComponentParent(this XContainer element)
{
return element.FindFirst("Component")?.Parent;
}

/// <summary>
/// Selects the first descendant "Directory" element that has no other sub-directories (child "Directory" XElements).
/// </summary>
/// <param name="element">The element to be searched.</param>
/// <returns>Directory XElement.</returns>
public static XElement FindLastDirectory(this XContainer element)
{
return element.Descendants("Directory")
Expand Down
4 changes: 2 additions & 2 deletions Source/src/WixSharp/Properties/AssemblyInfo.version.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]

0 comments on commit a84d369

Please sign in to comment.