Skip to content

Commit

Permalink
Release v2.5.0.0
Browse files Browse the repository at this point in the history
- #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
  • Loading branch information
oleg-shilo committed Feb 1, 2025
1 parent ec24541 commit 2aca610
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 60 deletions.
16 changes: 7 additions & 9 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</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.4.4.0" />
<dependency id="WixSharp.bin" version="2.5.0.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</dependencies>
<references>
Expand Down
14 changes: 6 additions & 8 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</releaseNotes>
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
Expand Down
16 changes: 7 additions & 9 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</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.4.4.0" />
<dependency id="WixSharp.bin" version="2.5.0.0" />
</dependencies>
</metadata>
<files>
Expand Down
16 changes: 7 additions & 9 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</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.4.4.0" />
<dependency id="WixSharp_wix4.bin" version="2.5.0.0" />
</dependencies>
<references>
<reference file="WixSharp.UI.WPF.dll" />
Expand Down
14 changes: 6 additions & 8 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
Expand Down
16 changes: 7 additions & 9 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.4.4.0</version>
<version>2.5.0.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -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</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>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
</releaseNotes>
<releaseNotes>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</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.4.4.0" />
<dependency id="WixSharp_wix4.bin" version="2.5.0.0" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion Source/NuGet/WixSharp/publish.cmd
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.4.4</PackageVersion>
<PackageVersion>2.5.0</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.4.4</PackageVersion>
<PackageVersion>2.5.0</PackageVersion>
<Title>WixSharp (.NET Core)</Title>
<Description>.NET Core edition of WixSharp.Msi package</Description>
<Copyright>Oleg Shilo</Copyright>
Expand Down
14 changes: 11 additions & 3 deletions Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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;

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.4.4.0")]
[assembly: AssemblyFileVersion("2.4.4.0")]
[assembly: AssemblyVersion("2.5.0.0")]
[assembly: AssemblyFileVersion("2.5.0.0")]

0 comments on commit 2aca610

Please sign in to comment.