From b454c8557110cd2ffd705d8e09d24034bdff2cf8 Mon Sep 17 00:00:00 2001 From: Oleg Shilo Date: Tue, 3 Dec 2024 22:14:55 +1100 Subject: [PATCH] Release v2.4.3.0 - #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" - #1675: Bundle ExePackage 'Cache' parameter - Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. - Issue #1667: AddDefaultNamespaces removing processing instructions - Updated skip dialog example --- Source/NuGet/WixSharp/WixSharp.WPF.nuspec | 15 +- Source/NuGet/WixSharp/WixSharp.bin.nuspec | 13 +- Source/NuGet/WixSharp/WixSharp.nuspec | 15 +- .../NuGet/WixSharp/WixSharp_wix4.WPF.nuspec | 15 +- .../NuGet/WixSharp/WixSharp_wix4.bin.nuspec | 13 +- Source/NuGet/WixSharp/WixSharp_wix4.nuspec | 15 +- Source/NuGet/WixSharp/publish.cmd | 2 +- Source/src/NET-Core/WixSharp.Core/SilentBA.cs | 18 + .../WixSharp.Core/WixSharp.Core.csproj | 483 +++++++++--------- .../WixSharp.Msi.Core.csproj | 109 ++-- .../Properties/AssemblyInfo.version.cs | 4 +- 11 files changed, 364 insertions(+), 338 deletions(-) diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec index 60d108d8..0d27f355 100644 --- a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec @@ -2,7 +2,7 @@ WixSharp.WPF - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,17 +16,18 @@ 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) Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2021 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/NuGet/WixSharp/WixSharp.bin.nuspec b/Source/NuGet/WixSharp/WixSharp.bin.nuspec index bf14f32b..18610692 100644 --- a/Source/NuGet/WixSharp/WixSharp.bin.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.bin.nuspec @@ -2,7 +2,7 @@ WixSharp.bin - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,11 +16,12 @@ 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) Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2022 Oleg Shilo en-AU diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec index be243db2..44e60a6f 100644 --- a/Source/NuGet/WixSharp/WixSharp.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.nuspec @@ -2,7 +2,7 @@ WixSharp - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -18,17 +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) Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2022 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec index 364c6a33..3f4470dc 100644 --- a/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec +++ b/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec @@ -2,7 +2,7 @@ WixSharp-wix4.WPF - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,17 +16,18 @@ 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 Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec index d0417942..f3955cf8 100644 --- a/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec +++ b/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec @@ -2,7 +2,7 @@ WixSharp_wix4.bin - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,11 +16,12 @@ 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 Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2023 Oleg Shilo en-AU diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec index 03a335c9..a9d07ddf 100644 --- a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec +++ b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec @@ -2,7 +2,7 @@ WixSharp_wix4 - 2.4.2.0 + 2.4.3.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -18,17 +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: `dotnet tool install --global wix` The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0 Wix# (WixSharp) - Binaries - Release v2.4.2.0 -- Added `Compiler.PreferredComponentGuidConsistency` to allow consistent generation of the component GUIDs between all versions of the same product. -- Fixed ExitDialog (form) layout problem -- Fix error WIX0400: The ProgressText element contains illegal inner text when setting CustomAction ProgressText or RollbackProgressText - + Release v2.4.3.0 +- #1673: Error on using template "WixSharp Managed Setup - Custom Dialog (Wix 3)" +- #1675: Bundle ExePackage 'Cache' parameter +- Added prevention of the WiX5 tools for the Custom BA bootstrapper template. Downgrading it to WiX4 tools. +- Issue #1667: AddDefaultNamespaces removing processing instructions +- Updated skip dialog example Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/NuGet/WixSharp/publish.cmd b/Source/NuGet/WixSharp/publish.cmd index cd5b3020..42aafa92 100644 --- a/Source/NuGet/WixSharp/publish.cmd +++ b/Source/NuGet/WixSharp/publish.cmd @@ -1,4 +1,4 @@ -set ver=2.4.2 +set ver=2.4.3 dotnet nuget push WixSharp.Msi.Core.%ver%.nupkg -k %nugetkey% -s https://api.nuget.org/v3/index.json dotnet nuget push WixSharp.Core.%ver%.nupkg -k %nugetkey% -s https://api.nuget.org/v3/index.json diff --git a/Source/src/NET-Core/WixSharp.Core/SilentBA.cs b/Source/src/NET-Core/WixSharp.Core/SilentBA.cs index 84478f26..c13429bb 100644 --- a/Source/src/NET-Core/WixSharp.Core/SilentBA.cs +++ b/Source/src/NET-Core/WixSharp.Core/SilentBA.cs @@ -16,6 +16,9 @@ namespace WixSharp.Bootstrapper { + /// + /// + /// public class WixBAFactory : BaseBootstrapperApplicationFactory { /// @@ -106,12 +109,27 @@ public override void AutoGenerateSources(string outDir) /// public class SilentManagedBA : BootstrapperApplication { + /// + /// Initializes a new instance of the class. + /// + /// The engine. + /// The command. public SilentManagedBA(IEngine engine, IBootstrapperCommand command) : base(engine) { this.Command = command; } + /// + /// Gets the engine. + /// + /// + /// The engine. + /// public IEngine Engine => base.engine; + + /// + /// The command + /// public IBootstrapperCommand Command; AutoResetEvent done = new AutoResetEvent(false); diff --git a/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj b/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj index 5756fb53..aeb46bc6 100644 --- a/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj +++ b/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj @@ -1,248 +1,249 @@ - - Library - net8.0-windows - enable - true - false - - WixSharp - True - ..\..\WixSharp\WixSharpStrongName.snk - True - True - snupkg - 2.2.0 - 2.2.0 - - - - 2.4.2 - WixSharp (.NET Core) - .NET Core edition of WixSharp package - Oleg Shilo - https://github.com/oleg-shilo/wixsharp - wixsharp_logo.png - README.md - https://github.com/oleg-shilo/wixsharp - git - MSI, WiX, WIxSharp, C# - True - MIT - - - - $(DefineConstants); CSS_PROJECT; NETCORE; - 1701;1702; CA1416; CS0108 - - - - $(DefineConstants); CSS_PROJECT; NETCORE; - 1701;1702; CA1416; CS0108 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - \ - - - True - \ - - - - - - - - - - - $(BuildCommand) -IncludeReferencedProjects + Library + net8.0-windows + enable + true + false + + WixSharp + True + ..\..\WixSharp\WixSharpStrongName.snk + True + True + snupkg + 2.2.0 + 2.2.0 - - - - + + 2.4.3 + WixSharp (.NET Core) + .NET Core edition of WixSharp package + Oleg Shilo + https://github.com/oleg-shilo/wixsharp + wixsharp_logo.png + README.md + https://github.com/oleg-shilo/wixsharp + git + MSI, WiX, WIxSharp, C# + True + MIT + True + + + + $(DefineConstants); CSS_PROJECT; NETCORE; + 1701;1702; CA1416; CS0108 + + + + $(DefineConstants); CSS_PROJECT; NETCORE; + 1701;1702; CA1416; CS0108 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + \ + + + True + \ + + + + + + + + + + + + $(BuildCommand) -IncludeReferencedProjects + + + + + + diff --git a/Source/src/NET-Core/WixSharp.Msi.Core/WixSharp.Msi.Core.csproj b/Source/src/NET-Core/WixSharp.Msi.Core/WixSharp.Msi.Core.csproj index 6206432a..6f6b0c8c 100644 --- a/Source/src/NET-Core/WixSharp.Msi.Core/WixSharp.Msi.Core.csproj +++ b/Source/src/NET-Core/WixSharp.Msi.Core/WixSharp.Msi.Core.csproj @@ -1,62 +1,63 @@ - - Library - net8.0-windows - enable - true - false - - $(NoWarn);SYSLIB0003 - + + Library + net8.0-windows + enable + true + false + + $(NoWarn);SYSLIB0003 + - - - $(DefineConstants);CSS_PROJECT;WIXSHARP_MSI - True - ..\..\WixSharp.Msi\WixSharp.Msi\WixSharpStrongName.snk - True - True - snupkg - - - $(DefineConstants);CSS_PROJECT;WIXSHARP_MSI;NETCORE - + + + $(DefineConstants);CSS_PROJECT;WIXSHARP_MSI + True + ..\..\WixSharp.Msi\WixSharp.Msi\WixSharpStrongName.snk + True + True + snupkg + + + $(DefineConstants);CSS_PROJECT;WIXSHARP_MSI;NETCORE + - - 2.4.2 - WixSharp (.NET Core) - .NET Core edition of WixSharp.Msi package - Oleg Shilo - https://github.com/oleg-shilo/wixsharp - wixsharp_logo.png - README.md - https://github.com/oleg-shilo/wixsharp - git - MSI, WiX, WIxSharp, C# - MIT - True - + + 2.4.3 + WixSharp (.NET Core) + .NET Core edition of WixSharp.Msi package + Oleg Shilo + https://github.com/oleg-shilo/wixsharp + wixsharp_logo.png + README.md + https://github.com/oleg-shilo/wixsharp + git + MSI, WiX, WIxSharp, C# + MIT + True + True + - - - - - - - - - + + + + + + + + + - - - True - \ - - - True - \ - - + + + True + \ + + + True + \ + + diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs index f88d4e8e..c24b405e 100644 --- a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs +++ b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs @@ -7,5 +7,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.4.2.0")] -[assembly: AssemblyFileVersion("2.4.2.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.3.0")] +[assembly: AssemblyFileVersion("2.4.3.0")] \ No newline at end of file