Skip to content

Commit

Permalink
Release v1.9.6
Browse files Browse the repository at this point in the history
* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.
  • Loading branch information
lbs-contributor committed Apr 10, 2019
1 parent 4e5d448 commit 592a1a7
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 70 deletions.
28 changes: 7 additions & 21 deletions Source/NuGet/WixSharp/WixSharp.bin.nuspec
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.5.1</version>
<version>1.9.6.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,27 +16,13 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>Release v1.9.5
<releaseNotes>Release v1.9.6

* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
* Issue #608: Create Shortcut on Desktop to dotnet.exe
* Issue #551: Cannot include extra .wxs as part of a bundle
* Issue #610: Warning when building two bundles in one setup
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
* Issue #606: Platform.x64 not marking some folders win64="yes"
* Issue #599: Files creating empty folders on Destination (2)
* Issue #599: Files creating empty folders on Destination
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
* Issue #586: How to add bal:overridable for Variable with wix#
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
* Issue #585: Question: Warning about auto-generated IDs
* Issue #580: Wrong path to the AdminToolsFolder
* Add MsuPackage Element
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed


</releaseNotes>
* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
Expand Down
30 changes: 8 additions & 22 deletions Source/NuGet/WixSharp/WixSharp.lab.nuspec
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.5.1</version>
<version>1.9.6.0</version>
<title>Wix# (WixSharp) - Experimantal features</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -14,27 +14,13 @@
The package contains the sample code for building a simple MSI with the CLR WinForm dialog inserted into UI sequence between InsallDirDlg and VerifyReadyDlg native MSI dialogs. In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# binaries containing experimental features (e.g. native WiX UI support).</summary>
<releaseNotes>Release v1.9.5
<releaseNotes>Release v1.9.6

* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
* Issue #608: Create Shortcut on Desktop to dotnet.exe
* Issue #551: Cannot include extra .wxs as part of a bundle
* Issue #610: Warning when building two bundles in one setup
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
* Issue #606: Platform.x64 not marking some folders win64="yes"
* Issue #599: Files creating empty folders on Destination (2)
* Issue #599: Files creating empty folders on Destination
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
* Issue #586: How to add bal:overridable for Variable with wix#
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
* Issue #585: Question: Warning about auto-generated IDs
* Issue #580: Wrong path to the AdminToolsFolder
* Add MsuPackage Element
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed


</releaseNotes>
* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# Scripting msi install setup</tags>
Expand All @@ -43,7 +29,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.5.1" />
<dependency id="WixSharp.bin" version="1.9.6.0" />
</dependencies>
</metadata>
<files>
Expand Down
30 changes: 8 additions & 22 deletions Source/NuGet/WixSharp/WixSharp.nuspec
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.5.1</version>
<version>1.9.6.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,32 +18,18 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>Release v1.9.5
<releaseNotes>Release v1.9.6

* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
* Issue #608: Create Shortcut on Desktop to dotnet.exe
* Issue #551: Cannot include extra .wxs as part of a bundle
* Issue #610: Warning when building two bundles in one setup
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
* Issue #606: Platform.x64 not marking some folders win64="yes"
* Issue #599: Files creating empty folders on Destination (2)
* Issue #599: Files creating empty folders on Destination
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
* Issue #586: How to add bal:overridable for Variable with wix#
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
* Issue #585: Question: Warning about auto-generated IDs
* Issue #580: Wrong path to the AdminToolsFolder
* Add MsuPackage Element
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed


</releaseNotes>
* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="1.9.5.1" />
<dependency id="WixSharp.bin" version="1.9.6.0" />
</dependencies>
</metadata>
<files>
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.
Binary file modified Source/src/WixSharp.Samples/WixSharp.UI.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.dll
Binary file not shown.
49 changes: 46 additions & 3 deletions Source/src/WixSharp.Samples/WixSharp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,19 @@
If it appears minimized then activate it from the taskbar.".
</summary>
</member>
<member name="T:WixSharp.CommonTasks.Uac">
<summary>

</summary>
</member>
<member name="M:WixSharp.CommonTasks.Uac.IsEnabled">
<summary>
Determines whether this instance is enabled.
</summary>
<returns>
<c>true</c> if this instance is enabled; otherwise, <c>false</c>.
</returns>
</member>
<member name="T:WixSharp.Assembly">
<summary>
Defines assembly file to be installed.
Expand Down Expand Up @@ -2951,6 +2964,36 @@
<summary>
COM Class registration.
</summary>
<example>The following is an example of deploying and registering a COM server.
<code>
var project = new Project("MyProduct",
new Dir(@"%ProgramFiles%\My Company\My Product",
new File(@"Files\Bin\MyApp.exe",
new ComRegistration
{
Id = new Guid("6f330b47-2577-43ad-9095-1861ba25889b"),
Description = "MY DESCRIPTION",
ThreadingModel = ThreadingModel.apartment,
Context = "InprocServer32",
ProgIds = new[]
{
new ProgId
{
Id = "PROG.ID.1",
Description ="Version independent ProgID ",
ProgIds = new[]
{
new ProgId
{
Id = "prog.id",
Description="some description"
}
}
}
}
})));
</code>
</example>
<seealso cref="T:WixSharp.WixEntity" />
<seealso cref="T:WixSharp.IGenericEntity" />
</member>
Expand Down Expand Up @@ -13352,7 +13395,7 @@
<summary>
Initializes a new instance of the <see cref="T:WixSharp.Files"/> class with properties/fields initialized with specified parameters.
<para>You can control inclusion of empty folders (if picked by the wild card patter) by setting
<see cref="!:Compiler.AutoGeneration.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<see cref="F:WixSharp.AutoGenerationOptions.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<para>If more specific control is required you can always use a flat list of <c>Dirs</c> of the
Project.<see cref="P:WixSharp.Project.AllDirs"/> to remove the undesired folder from its parent collection.
</para>
Expand All @@ -13364,7 +13407,7 @@
<summary>
Initializes a new instance of the <see cref="T:WixSharp.Files"/> class with properties/fields initialized with specified parameters.
<para>You can control inclusion of empty folders (if picked by the wild card patter) by setting
<see cref="!:Compiler.AutoGeneration.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<see cref="F:WixSharp.AutoGenerationOptions.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<para>If more specific control is required you can always use a flat list of <c>Dirs</c> of the
Project.<see cref="P:WixSharp.Project.AllDirs"/> to remove the undesired folder from its parent collection.
</para>
Expand All @@ -13391,7 +13434,7 @@
<summary>
Initializes a new instance of the <see cref="T:WixSharp.Files"/> class with properties/fields initialized with specified parameters.
<para>You can control inclusion of empty folders (if picked by the wild card patter) by setting
<see cref="!:Compiler.AutoGeneration.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<see cref="F:WixSharp.AutoGenerationOptions.IgnoreWildCardEmptyDirectories"/> to <c>true</c>.</para>
<para>If more specific control is required you can always use a flat list of <c>Dirs</c> of the
Project.<see cref="P:WixSharp.Project.AllDirs"/> to remove the undesired folder from its parent collection.
</para>
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.9.5.0")]
[assembly: AssemblyFileVersion("1.9.5.0")]
[assembly: AssemblyVersion("1.9.6.0")]
[assembly: AssemblyFileVersion("1.9.6.0")]

0 comments on commit 592a1a7

Please sign in to comment.