diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec index c4c1f516..ce60eab2 100644 --- a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec @@ -2,7 +2,7 @@ WixSharp.WPF - 2.4.4.0 + 2.5.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,18 +16,16 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development 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 d98425b6..24c2af73 100644 --- a/Source/NuGet/WixSharp/WixSharp.bin.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.bin.nuspec @@ -2,7 +2,7 @@ WixSharp.bin - 2.4.4.0 + 2.5.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,13 +16,11 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development Copyright (C) 2008-2022 Oleg Shilo en-AU C# scripting msi install setup wix diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec index 231d0367..507993c8 100644 --- a/Source/NuGet/WixSharp/WixSharp.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.nuspec @@ -2,7 +2,7 @@ WixSharp - 2.4.4.0 + 2.5.0.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -18,18 +18,16 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development 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 e683faee..4b952a07 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.4.0 + 2.5.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,18 +16,16 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development 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 56bff513..51016890 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.4.0 + 2.5.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,13 +16,11 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec index e555a417..0859a591 100644 --- a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec +++ b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec @@ -2,7 +2,7 @@ WixSharp_wix4 - 2.4.4.0 + 2.5.0.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -18,18 +18,16 @@ 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.4.0 -- #1732: If any of Extensions.GenericEntities, MIMETypes, or Verbs are set, all must be set -- #1733: Should be possible to attach a ProgId directly to a component, without a COM registration -- #1728: .net core: project.Platform is incompatible with project.WxsFiles.Add() -- #1725 Bootstrapper formatted variables -- #1681: Dialog images not shown in Wix4 with UI=WixUI_Common unless UIRef Id=WixUI_Common is added - + Release v2.5.0.0 +- #1736: Issue with Special Characters in WixSharp Bootstrapper Custom BA after Upgrading from Wix3 to Wix4 +- Improved positioning of the background images for WPF UI Dialogs +- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) +- Added a more convenient option to play dialogs in demo mode during development 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 f02b3532..ee97c8e6 100644 --- a/Source/NuGet/WixSharp/publish.cmd +++ b/Source/NuGet/WixSharp/publish.cmd @@ -1,4 +1,4 @@ -set ver=2.4.4 +set ver=2.5.0 echo !!!! Note: symbols are pushed automatically with nupkg dotnet nuget push WixSharp.Msi.Core.%ver%.nupkg -k %nugetkey% -s https://api.nuget.org/v3/index.json diff --git a/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj b/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj index 9076a7aa..7d0c71d7 100644 --- a/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj +++ b/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj @@ -18,7 +18,7 @@ - 2.4.4 + 2.5.0 WixSharp (.NET Core) .NET Core edition of WixSharp package Oleg Shilo 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 1cc61a6a..aa02cb7a 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 @@ -24,7 +24,7 @@ - 2.4.4 + 2.5.0 WixSharp (.NET Core) .NET Core edition of WixSharp.Msi package Oleg Shilo diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs index 977ae382..ba15d0fa 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs +++ b/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs @@ -17,8 +17,16 @@ static class Script { - static public void Main() + [STAThread] + static public void Main(string[] args) { + if (args.Contains("-test")) //for demo only + { + ManagedUI.DefaultWpf.PlayInstallDialogs(); + // ManagedUI.Default.PlayInstallDialogs(); + return; + } + File f; var project = @@ -47,8 +55,8 @@ static public void Main() project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b"); Compiler.EmitRelativePaths = false; // possible UIs - project.ManagedUI = ManagedUI.Default; - // project.ManagedUI = ManagedUI.DefaultWpf; + // project.ManagedUI = ManagedUI.Default; + project.ManagedUI = ManagedUI.DefaultWpf; // project.UI = WUI.WixUI_Mondo; // project.UI = WUI.WixUI_InstallDir; diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs index 5f4c9db9..63c51243 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.4.0")] -[assembly: AssemblyFileVersion("2.4.4.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.5.0.0")] +[assembly: AssemblyFileVersion("2.5.0.0")] \ No newline at end of file