Release v2.3.0.0

- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants - #1574: Cannot build .net 8 example project (NET-Core) - #1546: dotnet tool install --global wix - Need for all users - #1585: Dotnet tool should not be relied on for wixsharp. Added error logging on `dotnet` or `wix` not found. - Added error log for failure to find WiX extension. Triggered by #1574, #1589 - Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578) - #7591: added WiX5 Custom BA sample (`<wixsharp>\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`) - added missing SilentBA for `WixSharp.Core` - fixed problem with `SetShellSize` not setting the top level window size
oleg-shilo · Jul 13, 2024 · 9b5553a · 9b5553a
1 parent 8220960
commit 9b5553a
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 31 deletions.
diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.WPF</id>
-    <version>2.2.0.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,13 +16,21 @@ 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.2.0.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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.2.0.0" />
+      <dependency id="WixSharp.bin" version="2.3.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,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp.bin</id>
-    <version>2.2.0.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,8 +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.2.0.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp</id>
-    <version>2.2.0.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,13 +18,21 @@ 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.2.0.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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.2.0.0" />
+      <dependency id="WixSharp.bin" version="2.3.0.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp-wix4.WPF</id>
-    <version>2.2.1.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,13 +16,21 @@ 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.2.1.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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.2.1.0" />
+      <dependency id="WixSharp_wix4.bin" version="2.3.0.0" />
       <dependency id="Caliburn.Micro" version="4.0.212" />
     </dependencies>
     <references>

diff --git a/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec b/Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp_wix4.bin</id>
-    <version>2.2.1.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,8 +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.2.1.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp_wix4</id>
-    <version>2.2.1.0</version>
+    <version>2.3.0.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,13 +18,21 @@ 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.2.1.0
-</releaseNotes>
+    <releaseNotes>Release v2.3.0.0
+- #1580 Shortcut "Target" produces unexpected results for many supported WiX environment constants
+- #1574: Cannot build .net 8 example project (NET-Core)
+- #1546: dotnet tool install --global wix - Need for all users
+- #1585:  Dotnet tool should not be relied on for wixsharp.   Added error logging on `dotnet` or `wix` not found.
+- Added error log for failure to find WiX extension. Triggered by #1574, #1589
+- Improved the documentation for `AutoElements` and `Compiler.AutoGeneration` (triggered by #1578)
+- #7591: added WiX5 Custom BA sample (`&lt;wixsharp&gt;\Source\src\WixSharp.Samples\Wix# Samples\Bootstrapper\WiX5-Spike\WixToolset.WixBA`)
+- added missing SilentBA for `WixSharp.Core`
+- fixed problem with `SetShellSize` not setting the top level window size</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.2.1.0" />
+      <dependency id="WixSharp_wix4.bin" version="2.3.0.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/bin/package.cs b/Source/bin/package.cs
@@ -31,11 +31,11 @@ static void Main()
                 .LastOrDefault();
 
             Console.WriteLine($"Last Release: {lastRelease}");
+            Console.WriteLine("Edit Release Notes and close the editor to continue packaging!");
 
             File.AppendAllLines(releaseNotes, new[] { $"Release v{version}" });
             run("git", $"log --pretty=format:'%s' v{lastRelease}..HEAD", line => File.AppendAllLines(releaseNotes, new[] { line }));
-            Task.Run(() => run("notepad", releaseNotes));
-            Thread.Sleep(1000);
+            run("notepad", releaseNotes);
         }
 
         Console.WriteLine("---");

diff --git a/Source/src/3.package.cmd b/Source/src/3.package.cmd
@@ -1,5 +1,9 @@
 echo off
 
 css ..\bin\package.cs
+css ..\NuGet\WixSharp\UpdatePackage.cs
 
+cd ..\NuGet\WixSharp
+build.WiX4.cmd
+cd ..\..\src
 pause
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.2.0</PackageVersion>
+    <PackageVersion>2.3.0</PackageVersion>
     <Title>WixSharp (.NET Core)</Title>
     <Description>.NET Core edition of WixSharp package</Description>
     <Copyright>Oleg Shilo</Copyright>
@@ -199,7 +199,7 @@
     <Compile Include="..\..\WixSharp\WixProject.cs" Link="WixProject.cs" />
     <Compile Include="..\..\WixSharp\WixQuietExec.cs" Link="WixQuietExec.cs" />
     <Compile Include="..\..\WixSharp\XmlFile.cs" Link="XmlFile.cs" />
-
+    <Compile Include="..\..\WixSharp\Utilities\WixTools.cs" Link="Utilities\WixTools.cs" />
     <Compile Include="..\..\WixSharp\Utilities\Utils.cs" Link="Utils.cs" />
     <Compile Include="..\..\WixSharp\Utilities\XmlMapping.cs" Link="XmlMapping.cs" />
     <Compile Include="..\..\WixSharp\Utilities\XmlAttribute.cs" Link="XmlAttribute.cs" />

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.2.0</PackageVersion>
+    <PackageVersion>2.3.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.MsiEventHost/sn.pfx b/Source/src/WixSharp.MsiEventHost/sn.pfx
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Driver/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Driver/setup.cs
@@ -14,6 +14,8 @@ class Script
 {
     static void Main()
     {
+        WixTools.SetWixVersion(Environment.CurrentDirectory, "4.0.2");
+
         // As of 22 Jul 2023
         // `Driver` support in WiX4 is somewhat incomplete.
         // The sample can build but it may fail during the install.

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs
@@ -68,7 +68,7 @@ static public void Main()
 
         project.WixSourceGenerated += Compiler_WixSourceGenerated;
 
-        project.BuildMsiCmd();
+        project.BuildMsi();
     }
 
     private static void Compiler_WixSourceGenerated(XDocument document)

diff --git a/Source/src/WixSharp/Compiler.cs b/Source/src/WixSharp/Compiler.cs
@@ -702,7 +702,7 @@ static string GenerateWixCommand(WixProject project, string wxsFile)
                                        {
                                            Compiler.OutputWriteLine($"Error: Cannot find WiX extension '{dll}'. " +
                                                $"WixSharp attempted to install the extension but did not succeed. Please install the " +
-                                               $"extension manually with: `wix.exe extension add -g {dll}");
+                                               $"extension manually with: `wix.exe extension add -g {dll}`");
                                        }
 
                                        return $"-ext \"{dllPath}\"";

diff --git 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.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]