From 9b5553a50acca32de67a143e2d2eb82c5b4addfe Mon Sep 17 00:00:00 2001 From: Oleg Shilo Date: Sat, 13 Jul 2024 13:48:40 +1000 Subject: [PATCH] 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 (`\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 --- Source/NuGet/WixSharp/WixSharp.WPF.nuspec | 16 ++++++++++++---- Source/NuGet/WixSharp/WixSharp.bin.nuspec | 14 +++++++++++--- Source/NuGet/WixSharp/WixSharp.nuspec | 16 ++++++++++++---- .../NuGet/WixSharp/WixSharp_wix4.WPF.nuspec | 16 ++++++++++++---- .../NuGet/WixSharp/WixSharp_wix4.bin.nuspec | 14 +++++++++++--- Source/NuGet/WixSharp/WixSharp_wix4.nuspec | 16 ++++++++++++---- Source/bin/package.cs | 4 ++-- Source/src/3.package.cmd | 4 ++++ .../WixSharp.Core/WixSharp.Core.csproj | 4 ++-- .../WixSharp.Msi.Core.csproj | 2 +- Source/src/WixSharp.MsiEventHost/sn.pfx | Bin 1764 -> 1764 bytes .../Wix# Samples/Driver/setup.cs | 2 ++ .../Wix# Samples/Install Files/setup.cs | 2 +- Source/src/WixSharp/Compiler.cs | 2 +- .../Properties/AssemblyInfo.version.cs | 4 ++-- 15 files changed, 85 insertions(+), 31 deletions(-) diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec index dd589285..24087296 100644 --- a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec @@ -2,7 +2,7 @@ WixSharp.WPF - 2.2.0.0 + 2.3.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -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) Wix# (WixSharp) - Binaries - Release v2.2.0.0 - + 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 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 c91b82a9..c834a3e7 100644 --- a/Source/NuGet/WixSharp/WixSharp.bin.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.bin.nuspec @@ -2,7 +2,7 @@ WixSharp.bin - 2.2.0.0 + 2.3.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -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) Wix# (WixSharp) - Binaries - Release v2.2.0.0 - + 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 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 7a9ecb89..0fc23d5d 100644 --- a/Source/NuGet/WixSharp/WixSharp.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.nuspec @@ -2,7 +2,7 @@ WixSharp - 2.2.0.0 + 2.3.0.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -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) Wix# (WixSharp) - Binaries - Release v2.2.0.0 - + 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 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 745725df..fc1968ca 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.2.1.0 + 2.3.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -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 Wix# (WixSharp) - Binaries - Release v2.2.1.0 - + 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 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 0bb43fa2..6a9b2ded 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.2.1.0 + 2.3.0.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -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 Wix# (WixSharp) - Binaries - Release v2.2.1.0 - + 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 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 2609dadf..8f1f4507 100644 --- a/Source/NuGet/WixSharp/WixSharp_wix4.nuspec +++ b/Source/NuGet/WixSharp/WixSharp_wix4.nuspec @@ -2,7 +2,7 @@ WixSharp_wix4 - 2.2.1.0 + 2.3.0.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -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 Wix# (WixSharp) - Binaries - Release v2.2.1.0 - + 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 Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/bin/package.cs b/Source/bin/package.cs index fc7558e0..55143252 100644 --- 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 index c46d525a..0cd49899 100644 --- 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 index 410ebcb4..400f306d 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.2.0 + 2.3.0 WixSharp (.NET Core) .NET Core edition of WixSharp package Oleg Shilo @@ -199,7 +199,7 @@ - + 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 21d94a10..8855b08e 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.2.0 + 2.3.0 WixSharp (.NET Core) .NET Core edition of WixSharp.Msi package Oleg Shilo diff --git a/Source/src/WixSharp.MsiEventHost/sn.pfx b/Source/src/WixSharp.MsiEventHost/sn.pfx index 3d8c0fac2806df75d9bf8c7730c7b888ff414db6..59f0d99e9880c5400918830c8aead872b7f9e571 100644 GIT binary patch delta 1487 zcmV;=1u**L4de}wXn#n5!UNGVZl3}I2haq90+5XGCDaXtM4(VQBK}`Mb9u@f4x+}5 zr$dsv8jGD#AxUCc@bd+`z;1&?nTL6tR8JbaBcgk_V- zAHHzvYU83wH`u3}pLzv^x=^)*5=ooju#D@tH2k3b3?c$#PJj2>B`|S0(wME_!Paw# zn%HMYydrYO8STx;4W6-{T2=sVkogcLpvJX|H@J%ln=I+UkzLtEa81V zU{7<+T^g~Ziy_1-?2B^gC{-ZAG_#t^um&w`xK5PQePYVSgv(?r(?ucU#4+{BRNxW|~Zo zd?|@x_ZnrF_Vk<&h+W8L9JkDJbomFt_UoTqaT)q0WnGOG>q|g_ofR|qku)>PUGMua zwSbGjG>tbs<*u)V9*`Ek5W}mu-W;gnFKKgTg7+~j(L-M&8+pyWV36!fUc;SBGiflE z&mt|3;(r}$!0R@|-9h5=&#^6p#Ot|i-C-`s;O^f@$#q4N8NxAo%RZj+*bHrUW|KST zPRMOyr%ck5%Rc)$$1w_6aBe)El){;;o{>;qzRtbcF@rJL@2CL>Y`nkxF}o?L-mgE^ z=PGbB4$a5;VrfG<8EnrE-?G)+uAG;UhuRkGKP8kg>TPflMT@RoWQ3wuOTa1$HoKTr zdfbo5InmS+-&s$hW}MuU2m>rfMgTVeIRH5TGXORKLI6VmEdV(HMF2SfL;x)SGyp{a zGypdMEdV(HGypjOL;x)SGypOHGXOOJL;yGdLjX1aK>$VoHvmSHdjp(*-$N?+XlGy| z0s;rnfPw;m5Y%Rj-?3HuidU%$lTI<@r{~YqL?m)OJtDNYMt_-pC{~{eIt4daH?cHJ z((io*MMo-`EItNO6#;TRy8isRuF=$UNCQGQmFH%99=>+tO}Q;6ca?H6lYvbrF~I=* z(E{oF)h>2*5oFk2%~$h(CYcA%4%$MbwI*n|nfhGrDWK`VNuK4dJoTUe3MZ?6YIhDs z>H>x0643=Uz~l&w0(AqN0uSx|~3wq!KmEQy%7s}&S~LJ&@_@-v|%v}^2% zrSr-WZ4a2FkKntu4OrPVk|rOnocjI*mptT61%M*RP-kVqw|1i`j6Z?a8ZkfAel&fk zYRNYvcss=$$|u6w4W5TReFR2i2!naQJ}$^F zgckp&;?Y{fO4ZDNUze!lgi**#QZm!i&#-;dH@uEw9d7B1H_8T$vzH{{08x6<2_1t| zG4BqT)ku@z;Cx(3tc)6YfH_m8HKKX6426P4o*MC9N;jf}bPD>7!o zvMES;M;fGShZyO&u|Q6=%@+CNUOxV_n7v=%PDYDdT@@wkVqN+PN?P!5aP1QbxH1bb`%X^nKST?vg&00^V<7h3`X2hc*rr$zt( delta 1487 zcmV;=1u**L4de}wXn(J|cA;Ye7MTJ92haq90+2mMGVJlzM*}YeJ&#i!HPGQNS9i-5 za`5)o?sf$jQDe*`F8UT;qd0Rh8HU%5s52=n`Q?Wm?>x@zXbz!jPg-9z{S4!~&Wpm) z7s_oM&LcbGuVmj$jPSerph6jJ5Bl#3?}W4d;Pi?m`izB`qJMyD;+!g-yfa}u-zM2a zcNf-TDM|Yn*eq_p$j#~xq7QQFc^P!ByWZHu7x=Rj21i~uYcN6a;^+gAx;-KE!S;&L z*Dz|T+|9&hlk=?g{?FLn)k@_Ko{U9n=KDTpOk_aggOEVd zXtkj!A~X3ELn#?W$d*Gz<7eJ)G}=Zq5Qc5eYi=b`5xc2Pevq0{$! z=Bb_jeu1d*b#Bsj(%`T;!~kFnz>NsMyOKN*j(w%k41fC{uDb$oPM=7PqC8%^L{gXw zr#tW888YcI2z?pHq%t@38=3+8%`>6}b$;ts?S)T7cp5q})~>?A*p0P$b686xM_+zk zetQ&Z!}qR%S>3io6Dbehw3oWz|6pc`C&AX{8zR8-OQoE)x-O_X)~SLBmKodj7j&u0 zMAS^B-G3~4btwUg4-PIgYX9s)f)0AH4L!4*AK;3W3wGZq)f047&>AmDWpyH!+_cRU zVe8MU@{ifn7MIE0mU7iH7q+AFkn9g`3?UPJfCb`KjCaxK_KFkIX=%;5fIVBLlPk^wjJCC^_jhv~}Xr7m%??`0} zLav9#!j8v~*eNfAAMPWQ2m>rfFaS6JF#s?CMgT$pLI6VmEdWITGyp*WK>#fPGyp{a zF#tvYEdV(HLjX7cL;x)SL;ywrH~=vKL;y1YMgT?tG5|FIGXO)Adjp(*oDvJJKA z0s;rnfPw;m0k-eva|Rupil->`fY4a?9@qdMhJ!}BTx^2tKV(a`a22HL2A=3{S8q^q z%ITlZZ5*PY!KD}DvaCqEa^L&$3a+~B;jVyNzc>%_nu=7vWXW!(ROj93!b!f59E&UPTuV8I$ zV9TRNj+=*x&a^+vL|646aP`(3-l_8A2D|;@PBE(J-S)(iXj_8MazW1gjE|7w#H1xr zbl(hQ@8v({0I2A?tP-FF_d&}yl|FqM%gcAE+5x{vp2Z{{lqqqwQXUf?Dx7!E6@4_h zs)5a#euFB_e~#aOn=0K=1`$a}vHakK3d-pLRYR(+8 zePH!h7Rh83Y9Fd(s{Npn7%FxsfY~QCsf;Dz=c{+7WW!|+vn z@jwB+Rkw0dp;?W{1dm18Ulp17Y70JgickcUurNC?A20_71uG5%0vZGqsh^M9sJNdm pI13Jd+Y*;)bu2her~#4P{- diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Driver/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Driver/setup.cs index 9393dc37..2ff5274f 100644 --- 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 index b74601e0..f120c5b7 100644 --- 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 index df7b5f9a..b8251170 100644 --- 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 index 172cf0e8..3ffae39f 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.2.0.0")] -[assembly: AssemblyFileVersion("2.2.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.3.0.0")] +[assembly: AssemblyFileVersion("2.3.0.0")] \ No newline at end of file