diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec index 60fc25b4..c1372091 100644 --- a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec @@ -2,7 +2,7 @@ WixSharp.WPF - 1.22.0.0 + 1.22.1.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,21 +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 v1.22.0 -- Updated WiX binaries to v3.14.0.6526 -- Updated samples to reflect WiX v3.14.0.6526 -- Updated WixSharp.wix.bin.nuspec -- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu… -- Extra u-tests for #270 -- Issue #1300: Weird space sin FeaturesDialog title -- Issue #1301: Make more elements translatable -- RC preparation -- Issues #1304: Improve the usability of Project.WildCardDedup + Release v1.22.1.0 +- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper +- Issue #1317: Bootstrapper bundle has bugs on wxs files generation. +- Issue #1310: Problem during dynamic localization + Copyright (C) 2008-2023 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 af6ffe29..098c889a 100644 --- a/Source/NuGet/WixSharp/WixSharp.bin.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.bin.nuspec @@ -2,7 +2,7 @@ WixSharp.bin - 1.22.0.0 + 1.22.1.0 Wix# (WixSharp) - Binaries Oleg Shilo Oleg Shilo @@ -16,16 +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 v1.22.0 -- Updated WiX binaries to v3.14.0.6526 -- Updated samples to reflect WiX v3.14.0.6526 -- Updated WixSharp.wix.bin.nuspec -- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu… -- Extra u-tests for #270 -- Issue #1300: Weird space sin FeaturesDialog title -- Issue #1301: Make more elements translatable -- RC preparation -- Issues #1304: Improve the usability of Project.WildCardDedup + Release v1.22.1.0 +- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper +- Issue #1317: Bootstrapper bundle has bugs on wxs files generation. +- Issue #1310: Problem during dynamic localization + Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix diff --git a/Source/NuGet/WixSharp/WixSharp.lab.nuspec b/Source/NuGet/WixSharp/WixSharp.lab.nuspec index 19da5e6b..7111d8c3 100644 --- a/Source/NuGet/WixSharp/WixSharp.lab.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.lab.nuspec @@ -2,7 +2,7 @@ WixSharp.Lab - 1.22.0.0 + 1.22.1.0 Wix# (WixSharp) - Experimantal features Oleg Shilo Oleg Shilo @@ -14,16 +14,11 @@ The package contains the sample code for building a simple MSI with the CLR WinForm dialog inserted into UI sequence between InsallDirDlg and VerifyReadyDlg native MSI dialogs. 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# binaries containing experimental features (e.g. native WiX UI support). - Release v1.22.0 -- Updated WiX binaries to v3.14.0.6526 -- Updated samples to reflect WiX v3.14.0.6526 -- Updated WixSharp.wix.bin.nuspec -- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu… -- Extra u-tests for #270 -- Issue #1300: Weird space sin FeaturesDialog title -- Issue #1301: Make more elements translatable -- RC preparation -- Issues #1304: Improve the usability of Project.WildCardDedup + Release v1.22.1.0 +- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper +- Issue #1317: Bootstrapper bundle has bugs on wxs files generation. +- Issue #1310: Problem during dynamic localization + Copyright (C) 2008-2023 Oleg Shilo en-AU C# Scripting msi install setup @@ -32,7 +27,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2 - + diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec index e0617217..a4341202 100644 --- a/Source/NuGet/WixSharp/WixSharp.nuspec +++ b/Source/NuGet/WixSharp/WixSharp.nuspec @@ -2,7 +2,7 @@ WixSharp - 1.22.0.0 + 1.22.1.0 Wix# (WixSharp) - managed interface for WiX Oleg Shilo Oleg Shilo @@ -18,21 +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 v1.22.0 -- Updated WiX binaries to v3.14.0.6526 -- Updated samples to reflect WiX v3.14.0.6526 -- Updated WixSharp.wix.bin.nuspec -- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu… -- Extra u-tests for #270 -- Issue #1300: Weird space sin FeaturesDialog title -- Issue #1301: Make more elements translatable -- RC preparation -- Issues #1304: Improve the usability of Project.WildCardDedup + Release v1.22.1.0 +- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper +- Issue #1317: Bootstrapper bundle has bugs on wxs files generation. +- Issue #1310: Problem during dynamic localization + Copyright (C) 2008-2023 Oleg Shilo en-AU C# scripting msi install setup wix - + diff --git a/Source/NuGet/WixSharp/build.cmd b/Source/NuGet/WixSharp/build.cmd index 4b7c6182..631198ef 100644 --- a/Source/NuGet/WixSharp/build.cmd +++ b/Source/NuGet/WixSharp/build.cmd @@ -2,5 +2,5 @@ nuget pack WixSharp.bin.nuspec nuget pack WixSharp.lab.nuspec nuget pack WixSharp.WPF.nuspec nuget pack WixSharp.nuspec -nuget pack WixSharp.wix.bin.nuspec +rem nuget pack WixSharp.wix.bin.nuspec pause \ No newline at end of file diff --git a/Source/NuGet/WixSharp/readme.md b/Source/NuGet/WixSharp/readme.md index 90774482..f1baffdc 100644 --- a/Source/NuGet/WixSharp/readme.md +++ b/Source/NuGet/WixSharp/readme.md @@ -1,4 +1,4 @@ -In order to builk the packages executhe the following steps: +In order to build the packages execute the following steps: - Update the files to be included in the package ``` css updatepackage diff --git a/Source/bin/package.readme b/Source/bin/package.readme index e5113f64..801b9648 100644 --- a/Source/bin/package.readme +++ b/Source/bin/package.readme @@ -2,5 +2,5 @@ 2.1 Execute src\build.cmd (Builds all solutions) 2.2 Execute src\aggregate - +3. Follow NuGet\WixSharp\readme.md diff --git a/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs index 2a0681cc..4c4025f0 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs +++ b/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs @@ -2,6 +2,7 @@ //css_ref Wix_bin\SDK\Microsoft.Deployment.WindowsInstaller.dll; //css_ref System.Core.dll; //css_ref System.Xml.dll; +using Microsoft.Deployment.WindowsInstaller; using System; using System.Configuration; using System.Diagnostics; @@ -10,7 +11,6 @@ using System.Windows.Forms; using System.Xml.Linq; using System.Xml.XPath; -using Microsoft.Deployment.WindowsInstaller; using WixSharp; using WixSharp.CommonTasks; using IO = System.IO; diff --git a/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi b/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi index 24999019..fe1cabf6 100644 Binary files a/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi and b/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi differ diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi index 1f5e65dd..fb3517b2 100644 Binary files a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi and b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi differ diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj index 8f481686..d310637f 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj +++ b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj @@ -109,8 +109,12 @@ - - + IF EXIST "$(ProjectDir)ManagedSetup.msi" ( + echo "ManagedSetup.msi already exists..." +) ELSE ( + "$(ProjectDir)..\..\..\cscs.exe" /l /d "$(ProjectDir)ManagedSetup.msi.cs" +) + copy "$(TargetPath)" "$(ProjectDir)ManagedSetup.exe" diff --git a/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd b/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd index 7d8ac784..03ffd0da 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd +++ b/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd @@ -1,2 +1,2 @@ ..\..\cscs.exe setup.cs -pause +rem pause diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.xml b/Source/src/WixSharp.Samples/WixSharp.UI.xml index c2071734..56428934 100644 --- a/Source/src/WixSharp.Samples/WixSharp.UI.xml +++ b/Source/src/WixSharp.Samples/WixSharp.UI.xml @@ -1184,7 +1184,8 @@ Initializes from WiX localization data (*.wxl). The WXL file bytes. - + if set to true merge with existing content instead of replacing. + The localization XML data is in invalid format. diff --git a/Source/src/WixSharp/Compiler.Bootstrapper.cs b/Source/src/WixSharp/Compiler.Bootstrapper.cs index a9f15a54..233ec0b8 100644 --- a/Source/src/WixSharp/Compiler.Bootstrapper.cs +++ b/Source/src/WixSharp/Compiler.Bootstrapper.cs @@ -301,9 +301,9 @@ public static string BuildWxs(Bundle project) var wixNamespace = Compiler.IsWix4 ? wix4Namespace : wix3Namespace; var doc = XDocument.Parse( - @" + @" " + $" - "); + "); doc.Root.Add(project.ToXml()); diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs index 86323bf2..68f73be1 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("1.22.0.0")] -[assembly: AssemblyFileVersion("1.22.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.22.1.0")] +[assembly: AssemblyFileVersion("1.22.1.0")] \ No newline at end of file