Skip to content

Commit

Permalink
Wix4: Release v2.1.5.0
Browse files Browse the repository at this point in the history
NET Framework:
- #1473: Build error with WixToolset.UI.wixext
- Issue #1444: wix.exe not found if installed as local tool
- minor improvements triggered by #1469

NET Core (v2.1.3.0):
- added project templates
- improved error reporting during compilation.
- added full CustomUI sample (to be used as a template)
  • Loading branch information
oleg-shilo committed Apr 6, 2024
1 parent ddef596 commit 3ad069a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 63 deletions.
13 changes: 3 additions & 10 deletions Source/NuGet/WixSharp/WixSharp.WPF.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.WPF</id>
<version>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,20 +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>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="2.1.2.0" />
<dependency id="WixSharp.bin" version="2.1.6.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</dependencies>
<references>
Expand Down
11 changes: 2 additions & 9 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>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,14 +16,7 @@ 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>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
<language>en-AU</language>
Expand Down
13 changes: 3 additions & 10 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>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,20 +18,13 @@ 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>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="2.1.2.0" />
<dependency id="WixSharp.bin" version="2.1.6.0" />
</dependencies>
</metadata>
<files>
Expand Down
13 changes: 3 additions & 10 deletions Source/NuGet/WixSharp/WixSharp_wix4.WPF.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-wix4.WPF</id>
<version>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,20 +16,13 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp_wix4.bin" version="2.1.2.0" />
<dependency id="WixSharp_wix4.bin" version="2.1.6.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</dependencies>
<references>
Expand Down
11 changes: 2 additions & 9 deletions Source/NuGet/WixSharp/WixSharp_wix4.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_wix4.bin</id>
<version>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,14 +16,7 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
Expand Down
13 changes: 3 additions & 10 deletions Source/NuGet/WixSharp/WixSharp_wix4.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_wix4</id>
<version>2.1.2.0</version>
<version>2.1.6.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,20 +18,13 @@ 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: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


<releaseNotes>Release v2.1.6.0
</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp_wix4.bin" version="2.1.2.0" />
<dependency id="WixSharp_wix4.bin" version="2.1.6.0" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<IncludeSymbols>True</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<FileVersion>2.1.4</FileVersion>
<AssemblyVersion>2.1.4</AssemblyVersion>
<AssemblyVersion>2.1.5</AssemblyVersion>
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.1.4-hotfix</PackageVersion>
<PackageVersion>2.1.5</PackageVersion>
<Title>WixSharp (.NET Core)</Title>
<Description>.NET Core edition of WixSharp package</Description>
<Copyright>Oleg Shilo</Copyright>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.1.4</PackageVersion>
<PackageVersion>2.1.5</PackageVersion>
<Title>WixSharp (.NET Core)</Title>
<Description>.NET Core edition of WixSharp.Msi package</Description>
<Copyright>Oleg Shilo</Copyright>
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("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.4.0")]
[assembly: AssemblyVersion("2.1.5.0")]
[assembly: AssemblyFileVersion("2.1.5.0")]

0 comments on commit 3ad069a

Please sign in to comment.