Release v2.6.0.0

- #1739: Detection of upgrading in events - Integrating ShellFileDialogs.dll with modern folder selection dialog - #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute - #1750: Renaming VS templates
oleg-shilo · Feb 21, 2025 · bb2448d · bb2448d
1 parent 21316db
commit bb2448d
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 42 deletions.
diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.WPF</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - Binaries</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - Binaries (targeting WiX3)</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -16,13 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</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.5.1.0" />
+      <dependency id="WixSharp.bin" version="2.6.0.0" />
       <dependency id="Caliburn.Micro" version="4.0.212" />
     </dependencies>
     <references>

diff --git a/Source/NuGet/WixSharp/WixSharp.bin.nuspec b/Source/NuGet/WixSharp/WixSharp.bin.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp.bin</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - Binaries</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - Binaries (targeting WiX3)</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <license type="expression">MIT</license>
@@ -16,8 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</releaseNotes>
     <copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>

diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - managed interface for WiX</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - managed interface for WiX3</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <projectUrl>https://github.com/oleg-shilo/wixsharp</projectUrl>
@@ -18,13 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</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.5.1.0" />
+      <dependency id="WixSharp.bin" version="2.6.0.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp-wix4.WPF</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - Binaries</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - Binaries (targeting WiX4 and later)</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -16,13 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</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.5.1.0" />
+      <dependency id="WixSharp_wix4.bin" version="2.6.0.0" />
     </dependencies>
     <references>
       <reference file="WixSharp.UI.WPF.dll" />

diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp_wix4.bin</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - Binaries</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - Binaries (targeting WiX4 and later)</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <license type="expression">MIT</license>
@@ -16,8 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</releaseNotes>
     <copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>

diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec
@@ -2,8 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp_wix4</id>
-    <version>2.5.1.0</version>
-    <title>Wix# (WixSharp) - managed interface for WiX</title>
+    <version>2.6.0.0</version>
+    <title>Wix# (WixSharp) - managed interface for WiX4 and later</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
     <projectUrl>https://github.com/oleg-shilo/wixsharp</projectUrl>
@@ -18,13 +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.5.1.0
-- #1735: ExeFileShortcut no longer works after update from wix3 to wix4</releaseNotes>
+    <releaseNotes>Release v2.6.0.0
+- #1739: Detection of upgrading in events
+- Integrating ShellFileDialogs.dll with modern folder selection dialog
+- #1752: WiX5 | Action.ProgressText | Error due to invalid Attribute
+- #1750: Renaming VS templates</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.5.1.0" />
+      <dependency id="WixSharp_wix4.bin" version="2.6.0.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/build.WiX4.cmd b/Source/NuGet/WixSharp/build.WiX4.cmd
diff --git a/Source/NuGet/WixSharp/build.cmd b/Source/NuGet/WixSharp/build.cmd
@@ -1,6 +1,4 @@
-nuget pack WixSharp.bin.nuspec
-nuget pack WixSharp.lab.nuspec
-nuget pack WixSharp.WPF.nuspec
-nuget pack WixSharp.nuspec
-rem nuget pack WixSharp.wix.bin.nuspec
+nuget pack WixSharp_wix4.bin.nuspec
+nuget pack WixSharp_wix4.WPF.nuspec
+nuget pack WixSharp_wix4.nuspec
 pause
diff --git a/Source/NuGet/WixSharp/build_wix3.cmd b/Source/NuGet/WixSharp/build_wix3.cmd
@@ -0,0 +1,6 @@
+nuget pack WixSharp.bin.nuspec
+nuget pack WixSharp.lab.nuspec
+nuget pack WixSharp.WPF.nuspec
+nuget pack WixSharp.nuspec
+rem nuget pack WixSharp.wix.bin.nuspec
+pause
diff --git a/Source/NuGet/WixSharp/publish.cmd b/Source/NuGet/WixSharp/publish.cmd
@@ -1,4 +1,4 @@
-set ver=2.5.1
+set ver=2.6.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/NuGet/WixSharp/readme.md b/Source/NuGet/WixSharp/readme.md
@@ -5,6 +5,6 @@ In order to build the packages execute the following steps:
   ```
   Make sure you have CS-Script installed (e.g. from https://community.chocolatey.org/packages/cs-script)
 
-- Execute build.WiX4.cmd
+- Execute build.cmd
 
 That's it.🅾️
diff --git a/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj b/Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj
@@ -18,7 +18,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-    <PackageVersion>2.5.1</PackageVersion>
+    <PackageVersion>2.6.0</PackageVersion>
         <Title>WixSharp (.NET Core)</Title>
         <Description>.NET Core edition of WixSharp package</Description>
         <Copyright>Oleg Shilo</Copyright>

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
@@ -24,7 +24,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-    <PackageVersion>2.5.1</PackageVersion>
+    <PackageVersion>2.6.0</PackageVersion>
         <Title>WixSharp (.NET Core)</Title>
         <Description>.NET Core edition of WixSharp.Msi package</Description>
         <Copyright>Oleg Shilo</Copyright>

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs
@@ -53,7 +53,7 @@ void build(string version)
 
                 project.AfterInstall += (e) =>
                 {
-                    if (e.Session.MyIsUpgradingInstalledVersion())
+                    if (e.Session.IsUpgradingInstalledVersion())
                     {
                         var isUpgrading = e.Session.IsUpgradingInstalledVersion();
                         MessageBox.Show(isUpgrading.ToString(), "");