Skip to content

Commit

Permalink
Release v1.9.4
Browse files Browse the repository at this point in the history 
* VS project templates - added packages.config files
* Added Condition-s for .NET Frameworks 4.7.1 and 4.7.2
* Issue #569: Updating WixSharp leads to malfuncion of SetEvVar
* Added support for `UI.Error` WiX element
* Issue #552: Question: Install 2 windows services in same installer
* Issue #541: Installing 2 Services in the same installer results in …
* Samples update
* Issue #560: Semantic difference between UninstallCondition and IsUninstalling
* Issue #564: Correct variable name of SequentialGuid initialization.
* Issue #562: Typo in Compiler.cs comments
* Issue #561: Typo in WixProject.cs
* Added missing namespace in custom dialog template, fixed comment.
* Added explicit `WixEntity.ComponentId` property
* Issue #551: Cannot include extra .wxs as part of a bundle
* Issue #542: ServiceInstaller.StartOn/StopOn/RemoveOn - Documentation bug
* Issue #544: Failed while processing WebSites; added support for `IISVirtualDir.AttributesDefinition`
  • Loading branch information
@lbs-contributor
lbs-contributor committed Jan 19, 2019
1 parent 74ec55f commit a7dde72
Show file tree
Hide file tree
Showing 14 changed files with 215 additions and 94 deletions.
2 changes: 1 addition & 1 deletion Source/NuGet/WixSharp/WixSharp.bin.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>WixSharp.bin</id>
<version>1.9.3.0</version>
<version>1.9.4.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand Down
4 changes: 2 additions & 2 deletions Source/NuGet/WixSharp/WixSharp.lab.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp.Lab</id>
<version>1.9.3.0</version>
<version>1.9.4.0</version>
<title>Wix# (WixSharp) - Experimantal features</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -23,7 +23,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
<frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
</frameworkAssemblies>
<dependencies>
<dependency id="WixSharp.bin" version="1.9.3.0" />
<dependency id="WixSharp.bin" version="1.9.4.0" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions Source/NuGet/WixSharp/WixSharp.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp</id>
<version>1.9.3.0</version>
<version>1.9.4.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -23,7 +23,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="1.9.3.0" />
<dependency id="WixSharp.bin" version="1.9.4.0" />
</dependencies>
</metadata>
<files>
Expand Down
Binary file modified Source/src/WixSharp.Samples/WixSharp.Lab.dll
View file
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.Msi.dll
View file
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.UI.dll
View file
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.dll
View file
Binary file not shown.
111 changes: 102 additions & 9 deletions Source/src/WixSharp.Samples/WixSharp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3408,7 +3408,7 @@
<code>
var project = new Project();
...
Compiler.BuildWxsCmd(project);
Compiler.BuildMsiCmd(project);
</code>
</description>
</item>
Expand Down Expand Up @@ -3798,6 +3798,37 @@
<param name="pattern">The wildcard pattern to convert.</param>
<returns>A regex equivalent of the given wildcard.</returns>
</member>
<member name="T:WixSharp.Error">
<summary>
Implements `Error` element that can be used to define and customize runtime error messages.
</summary>
<seealso cref="T:WixSharp.WixEntity" />
<seealso cref="T:WixSharp.IGenericEntity" />
</member>
<member name="M:WixSharp.Error.#ctor(System.String,System.String)">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.Error"/> class.
</summary>
<param name="id">The identifier.</param>
<param name="message">The message.</param>
</member>
<member name="P:WixSharp.Error.Id">
<summary>
Number of the error for which a message is being provided.
</summary>
</member>
<member name="P:WixSharp.Error.Message">
<summary>
Error message.
</summary>
</member>
<member name="M:WixSharp.Error.Process(WixSharp.ProcessingContext)">
<summary>
Adds itself as an XML content into the WiX source being generated from the <see cref="T:WixSharp.Project"/>.
See 'Wix#/samples/Extensions' sample for the details on how to implement this interface correctly.
</summary>
<param name="context">The context.</param>
</member>
<member name="T:WixSharp.FileSearch">
<summary>
Searches for file and assigns to full path value of parent Property
Expand Down Expand Up @@ -6644,6 +6675,11 @@
for 'both', the service will be stopped in both cases.
</summary>
</member>
<member name="M:WixSharp.SvcEvent.#ctor">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.SvcEvent"/> class.
</summary>
</member>
<member name="F:WixSharp.SvcEvent.Wait">
<summary>
The flag indicating if after triggering the service action the setup should wait until te action is completed.
Expand Down Expand Up @@ -9670,14 +9706,12 @@
</member>
<member name="F:WixSharp.WixProject.LightOptions">
<summary>
WiX linker <c>Light.exe</c> options (e.g. -sice:ICE30).
<para>The default value is "-sw1076 -sw1079" (disable warning 1076 and 1079). </para>
WiX linker <c>Light.exe</c> options (e.g. "-sice:ICE30 -sw1076" (disable warning 1076 and ICE warning 30).
</summary>
</member>
<member name="F:WixSharp.WixProject.CandleOptions">
<summary>
WiX compiler <c>Candle.exe</c> options.
<para>The default value is "-sw1076" (disable warning 1026).</para>
WiX compiler <c>Candle.exe</c> options (e.g. "-sw1076" to disable warning 1026).
</summary>
</member>
<member name="E:WixSharp.WixProject.WixSourceGenerated">
Expand Down Expand Up @@ -12509,12 +12543,12 @@
String representation of the <c>UILevel &lt; 4</c> condition of the WiX <c>Condition</c>.
</summary>
</member>
<member name="F:WixSharp.Condition.BeingRemoved">
<member name="F:WixSharp.Condition.BeingUninstalled">
<summary>
String representation of the <c>REMOVE="ALL"</c> condition of the WiX <c>Condition</c>.
</summary>
</member>
<member name="F:WixSharp.Condition.UninstallCondition">
<member name="F:WixSharp.Condition.BeingUninstalledAndNotBeingUpgraded">
<summary>
Software is being removed and no newer version is being installed.
</summary>
Expand Down Expand Up @@ -12564,6 +12598,16 @@
The .NET4.7 installed. This condition is to be used in Project.SetNetFxPrerequisite.
</summary>
</member>
<member name="F:WixSharp.Condition.Net471_Installed">
<summary>
The .NET4.7.1 installed. This condition is to be used in Project.SetNetFxPrerequisite.
</summary>
</member>
<member name="F:WixSharp.Condition.Net472_Installed">
<summary>
The .NET4.7.2 installed. This condition is to be used in Project.SetNetFxPrerequisite.
</summary>
</member>
<member name="F:WixSharp.Condition.Net30_SP_Installed">
<summary>
The .NET3.0 SP installed. This condition is to be used in Project.SetNetFxPrerequisite.
Expand Down Expand Up @@ -13034,6 +13078,14 @@
</code>
</summary>
</member>
<member name="M:WixSharp.XmlMapping.ToXElement(WixSharp.WixObject)">
<summary>
Serializes the <see cref="T:WixSharp.WixObject"/> into XML based on the members marked with
<see cref="T:WixSharp.XmlAttribute"/> and <see cref="P:WixSharp.WixObject.Attributes"/>.
</summary>
<param name="obj"></param>
<returns></returns>
</member>
<member name="M:WixSharp.XmlMapping.ToXElement(WixSharp.WixObject,System.Xml.Linq.XName)">
<summary>
Serializes the <see cref="T:WixSharp.WixObject"/> into XML based on the members marked with
Expand All @@ -13043,6 +13095,15 @@
<param name="elementName"></param>
<returns></returns>
</member>
<member name="M:WixSharp.XmlMapping.ToXElement(WixSharp.WixObject,WixSharp.WixExtension)">
<summary>
Serializes the <see cref="T:WixSharp.WixObject"/> into XML based on the members marked with
<see cref="T:WixSharp.XmlAttribute"/> and <see cref="P:WixSharp.WixObject.Attributes"/>.
</summary>
<param name="obj">The obj.</param>
<param name="extension">The extension.</param>
<returns></returns>
</member>
<member name="M:WixSharp.XmlMapping.ToXElement(WixSharp.WixObject,WixSharp.WixExtension,System.String)">
<summary>
Serializes the <see cref="T:WixSharp.WixObject"/> into XML based on the members marked with
Expand Down Expand Up @@ -13080,6 +13141,30 @@
The attribute indicating the type member being mapped to XML element. Used by Wix# compiler to emit XML base on CLR types.
</summary>
</member>
<member name="M:WixSharp.XmlAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.XmlAttribute"/> class.
</summary>
</member>
<member name="M:WixSharp.XmlAttribute.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.XmlAttribute"/> class.
</summary>
<param name="name">The name.</param>
</member>
<member name="M:WixSharp.XmlAttribute.#ctor(System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.XmlAttribute"/> class.
</summary>
<param name="isCData">if set to <c>true</c> [is c data].</param>
</member>
<member name="M:WixSharp.XmlAttribute.#ctor(System.String,System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.XmlAttribute"/> class.
</summary>
<param name="name">The name.</param>
<param name="isCData">if set to <c>true</c> [is c data].</param>
</member>
<member name="P:WixSharp.XmlAttribute.Name">
<summary>
Gets or sets the name of the mapped XML element.
Expand Down Expand Up @@ -17151,13 +17236,13 @@
<summary>
Initializes a new instance of the <see cref="T:WixSharp.WixGuid.SequentialGuid"/> class.
</summary>
<param name="previousGuid">The previous GUID.</param>
<param name="initialGuid">The initial GUID.</param>
</member>
<member name="M:WixSharp.WixGuid.SequentialGuid.#ctor(System.Nullable{System.Guid})">
<summary>
Initializes a new instance of the <see cref="T:WixSharp.WixGuid.SequentialGuid"/> class.
</summary>
<param name="previousGuid">The previous GUID.</param>
<param name="initialGuid">The previous GUID.</param>
</member>
<member name="M:WixSharp.WixGuid.SequentialGuid.op_Implicit(WixSharp.WixGuid.SequentialGuid)~System.Guid">
<summary>
Expand Down Expand Up @@ -17368,6 +17453,14 @@
Base class for all Wix# types representing WiX XML elements (entities)
</summary>
</member>
<member name="P:WixSharp.WixEntity.ComponentId">
<summary>
Gets or sets the id of the Component element that is to contain XML equivalent of the <see cref="T:WixSharp.WixEntity"/>.
</summary>
<value>
The component identifier.
</value>
</member>
<member name="F:WixSharp.WixEntity.Name">
<summary>
Name of the <see cref="T:WixSharp.WixEntity"/>.
Expand Down
59 changes: 30 additions & 29 deletions Source/src/WixSharp/AutoElements.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ public static class AutoElements
/// <para>If set to <c>Automatic</c> then the compiler will enable this feature only if any empty directory
/// is detected in the project definition.</para>
/// </summary>
[Obsolete(message: "This property will is defaulted to `Enabled`. Due to the fact that `Automatic` " +
"brings some ambiguity while no longer yielding any benefits", error: false)]
[Obsolete(message: "This property is defaulted to `CompilerSupportState.Enabled`. Due to the fact that " +
"`CompilerSupportState.Automatic` brings some ambiguity while no longer yielding any benefits",
error: false)]
public static CompilerSupportState SupportEmptyDirectories = CompilerSupportState.Enabled;

/// <summary>
Expand Down Expand Up @@ -171,8 +172,8 @@ static void InsertRemoveFolder(XElement xDir, XElement xComponent, string when =
.Any();
if (!alreadyPresent)
xComponent.Add(new XElement("RemoveFolder",
new XAttribute("Id", xDir.Attribute("Id").Value),
new XAttribute("On", when)));
new XAttribute("Id", xDir.Attribute("Id").Value),
new XAttribute("On", when)));
}
}

Expand All @@ -181,8 +182,8 @@ internal static XElement InsertUserProfileRemoveFolder(this XElement xComponent)
var xDir = xComponent.Parent("Directory");
if (!xDir.Descendants("RemoveFolder").Any() && !xDir.IsUserProfileRoot())
xComponent.Add(new XElement("RemoveFolder",
new XAttribute("Id", xDir.Attribute("Id").Value),
new XAttribute("On", "uninstall")));
new XAttribute("Id", xDir.Attribute("Id").Value),
new XAttribute("On", "uninstall")));

return xComponent;
}
Expand Down Expand Up @@ -245,13 +246,13 @@ internal static XElement InsertUserProfileRegValue(this XElement xComponent)
xComponent.ClearKeyPath();

xComponent.Add(
new XElement("RegistryKey",
new XAttribute("Root", "HKCU"),
new XAttribute("Key", @"Software\WixSharp\Used"),
new XElement("RegistryValue",
new XAttribute("Value", "0"),
new XAttribute("Type", "string"),
new XAttribute("KeyPath", "yes"))));
new XElement("RegistryKey",
new XAttribute("Root", "HKCU"),
new XAttribute("Key", @"Software\WixSharp\Used"),
new XElement("RegistryValue",
new XAttribute("Value", "0"),
new XAttribute("Type", "string"),
new XAttribute("KeyPath", "yes"))));
return xComponent;
}

Expand Down Expand Up @@ -321,7 +322,7 @@ static XElement CreateComponentFor(this XDocument doc, XElement xDir)
{
string compId = xDir.Attribute("Id").Value;
XElement xComponent = xDir.AddElement(
new XElement("Component",
new XElement("Component",
new XAttribute("Id", compId),
new XAttribute("Guid", WixGuid.NewGuid(compId))));

Expand All @@ -335,15 +336,15 @@ static XElement CreateComponentFor(this XDocument doc, XElement xDir)
private static string[] GetUserProfileFolders()
{
return new[]
{
"ProgramMenuFolder",
"AppDataFolder",
"LocalAppDataFolder",
"TempFolder",
"PersonalFolder",
"DesktopFolder",
"StartupFolder"
};
{
"ProgramMenuFolder",
"AppDataFolder",
"LocalAppDataFolder",
"TempFolder",
"PersonalFolder",
"DesktopFolder",
"StartupFolder"
};
}

static bool InUserProfile(this XElement xDir)
Expand Down Expand Up @@ -651,19 +652,19 @@ internal static void InjectAutoElementsHandler(XDocument doc, Project project)
string customAction = $"Set_DirAbsolutePath{absPathCount}";

product.Add(new XElement("CustomAction",
new XAttribute("Id", customAction),
new XAttribute("Property", actualDirName),
new XAttribute("Value", absolutePath)));
new XAttribute("Id", customAction),
new XAttribute("Property", actualDirName),
new XAttribute("Value", absolutePath)));

product.SelectOrCreate("InstallExecuteSequence").Add(
new XElement("Custom", $"(NOT Installed) AND (UILevel < 5) AND ({actualDirName} = ABSOLUTEPATH{absPathCount})",
new XAttribute("Action", customAction),
new XAttribute("Before", "AppSearch")));

product.SelectOrCreate("InstallUISequence").Add(
new XElement("Custom", $"(NOT Installed) AND (UILevel = 5) AND ({actualDirName} = ABSOLUTEPATH{absPathCount})",
new XAttribute("Action", customAction),
new XAttribute("Before", "AppSearch")));
new XElement("Custom", $"(NOT Installed) AND (UILevel = 5) AND ({actualDirName} = ABSOLUTEPATH{absPathCount})",
new XAttribute("Action", customAction),
new XAttribute("Before", "AppSearch")));

if (absPathCount == null)
absPathCount = 0;
Expand Down
Loading

0 comments on commit a7dde72

Please sign in to comment.