Skip to content

Commit

Permalink
WiX3-Release v1.24.0.0
Browse files Browse the repository at this point in the history
- Issue #1392: Is it possible to inherit wxl files using managed UI?
- Issue #1389: Multi language installer intermediate .msi not found error
- Issue #1387: Cannot update to latest Caliburn.Micro
- Issue #1384: When the bootstrapper.Build API uses the same name as the project, then misleading compile warnings are issued
- Issue #1382: Package (all child elements of Chain) need to have the After field added
- Issue #1383: Package (all child elements of Chain) need to have the SuppressSignatureVerification field added
- Issue #1381: ExePackage needs to have the Protocol field implemented
- Issue #1379: A way (Or create an example) of how to create a standalone fragment and insert into Projects / chains / etc
- Issue #1377: WixSharp.wix.bin nuget references a url which is no longer available
- Issue #1372: Creating a FileAssociation with Icon and Advertised = false does not work
- Validation of the CPU architecture for the custom BA assembly.
- Updated default `BootstrapperCore.config` content
- Updated WixBootstrapper_UI sample to demonstrate how to use the WinForm-based custom BA (#1386)
- Added support for ManagedUI to foll back on the stock WXL if one was not supplied by the user for non-English languages
- Added WXL and theme files to be used in WixSharp.wix.bin package.
- Added support for ManagedUI to fall back on the stock WXL if one was not supplied by the user for non-English languages
- Improved multi-language sample
- Updated project templates to comment out webref package for bootstrapper template
- Added `WixStandardBootstrapperApplication.AddPayload`
  • Loading branch information
oleg-shilo committed Dec 4, 2023
1 parent 07e6efa commit 1d76810
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 24 deletions.
38 changes: 32 additions & 6 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>1.23.1.0</version>
<version>1.24.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,15 +16,41 @@ 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>WiX3-Release v1.23.1.0
- Issue #1373: [Bug] Need a clearer reason for the following Build exception: "System.NullReferenceException: Object reference not set to an instance of an object."
- Fixed packaging problem with `Microsoft.Deployment.WindowsInstaller` assembly not being copied in the target output dir. </releaseNotes>
<releaseNotes>WiX3-Release v1.24.0.0
- Issue #1392: Is it possible to inherit wxl files using managed UI?
- Issue #1389: Multi language installer intermediate .msi not found error
- Issue #1387: Cannot update to latest Caliburn.Micro
- Issue #1384: When the bootstrapper.Build API uses the same name as the project, then misleading compile warnings are issued
- Issue #1382: Package (all child elements of Chain) need to have the After field added
- Issue #1383: Package (all child elements of Chain) need to have the SuppressSignatureVerification field added
- Issue #1381: ExePackage needs to have the Protocol field implemented
- Issue #1379: A way (Or create an example) of how to create a standalone fragment and insert into Projects / chains / etc
- Issue #1377: WixSharp.wix.bin nuget references a url which is no longer available
- Issue #1372: Creating a FileAssociation with Icon and Advertised = false does not work
- Validation of the CPU architecture for the custom BA assembly.
- Updated default `BootstrapperCore.config` content
- Updated WixBootstrapper_UI sample to demonstrate how to use the WinForm-based custom BA (#1386)
- Added support for ManagedUI to foll back on the stock WXL if one was not supplied by the user for non-English languages
- Added WXL and theme files to be used in WixSharp.wix.bin package.
- Added support for ManagedUI to fall back on the stock WXL if one was not supplied by the user for non-English languages
- Improved multi-language sample
- Updated project templates to comment out webref package for bootstrapper template
- Added `WixStandardBootstrapperApplication.AddPayload`


</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.bin" version="1.23.1.0" />
<dependency id="Caliburn.Micro" version="3.2.0" />
<group targetFramework=".NETFramework4.5.1">
<dependency id="WixSharp.bin" version="1.24.0.0" />
<dependency id="Caliburn.Micro" version="3.2.0" />
</group>
<group targetFramework=".NETFramework4.6.2">
<dependency id="WixSharp.bin" version="1.24.0.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</group>
</dependencies>
<references>
<reference file="WixSharp.UI.WPF.dll" />
Expand Down
28 changes: 24 additions & 4 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/08/nuspec.xsd">
<metadata>
<id>WixSharp.bin</id>
<version>1.23.1.0</version>
<version>1.24.0.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,9 +16,29 @@
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>WiX3-Release v1.23.1.0
- Issue #1373: [Bug] Need a clearer reason for the following Build exception: "System.NullReferenceException: Object reference not set to an instance of an object."
- Fixed packaging problem with `Microsoft.Deployment.WindowsInstaller` assembly not being copied in the target output dir. </releaseNotes>
<releaseNotes>WiX3-Release v1.24.0.0
- Issue #1392: Is it possible to inherit wxl files using managed UI?
- Issue #1389: Multi language installer intermediate .msi not found error
- Issue #1387: Cannot update to latest Caliburn.Micro
- Issue #1384: When the bootstrapper.Build API uses the same name as the project, then misleading compile warnings are issued
- Issue #1382: Package (all child elements of Chain) need to have the After field added
- Issue #1383: Package (all child elements of Chain) need to have the SuppressSignatureVerification field added
- Issue #1381: ExePackage needs to have the Protocol field implemented
- Issue #1379: A way (Or create an example) of how to create a standalone fragment and insert into Projects / chains / etc
- Issue #1377: WixSharp.wix.bin nuget references a url which is no longer available
- Issue #1372: Creating a FileAssociation with Icon and Advertised = false does not work
- Validation of the CPU architecture for the custom BA assembly.
- Updated default `BootstrapperCore.config` content
- Updated WixBootstrapper_UI sample to demonstrate how to use the WinForm-based custom BA (#1386)
- Added support for ManagedUI to foll back on the stock WXL if one was not supplied by the user for non-English languages
- Added WXL and theme files to be used in WixSharp.wix.bin package.
- Added support for ManagedUI to fall back on the stock WXL if one was not supplied by the user for non-English languages
- Improved multi-language sample
- Updated project templates to comment out webref package for bootstrapper template
- Added `WixStandardBootstrapperApplication.AddPayload`


</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
Expand Down
30 changes: 25 additions & 5 deletions Source/NuGet/WixSharp/WixSharp.lab.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.Lab</id>
<version>1.23.1.0</version>
<version>1.24.0.0</version>
<title>Wix# (WixSharp) - Experimantal features</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -14,9 +14,29 @@
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)</description>
<summary>Wix# binaries containing experimental features (e.g. native WiX UI support).</summary>
<releaseNotes>WiX3-Release v1.23.1.0
- Issue #1373: [Bug] Need a clearer reason for the following Build exception: "System.NullReferenceException: Object reference not set to an instance of an object."
- Fixed packaging problem with `Microsoft.Deployment.WindowsInstaller` assembly not being copied in the target output dir. </releaseNotes>
<releaseNotes>WiX3-Release v1.24.0.0
- Issue #1392: Is it possible to inherit wxl files using managed UI?
- Issue #1389: Multi language installer intermediate .msi not found error
- Issue #1387: Cannot update to latest Caliburn.Micro
- Issue #1384: When the bootstrapper.Build API uses the same name as the project, then misleading compile warnings are issued
- Issue #1382: Package (all child elements of Chain) need to have the After field added
- Issue #1383: Package (all child elements of Chain) need to have the SuppressSignatureVerification field added
- Issue #1381: ExePackage needs to have the Protocol field implemented
- Issue #1379: A way (Or create an example) of how to create a standalone fragment and insert into Projects / chains / etc
- Issue #1377: WixSharp.wix.bin nuget references a url which is no longer available
- Issue #1372: Creating a FileAssociation with Icon and Advertised = false does not work
- Validation of the CPU architecture for the custom BA assembly.
- Updated default `BootstrapperCore.config` content
- Updated WixBootstrapper_UI sample to demonstrate how to use the WinForm-based custom BA (#1386)
- Added support for ManagedUI to foll back on the stock WXL if one was not supplied by the user for non-English languages
- Added WXL and theme files to be used in WixSharp.wix.bin package.
- Added support for ManagedUI to fall back on the stock WXL if one was not supplied by the user for non-English languages
- Improved multi-language sample
- Updated project templates to comment out webref package for bootstrapper template
- Added `WixStandardBootstrapperApplication.AddPayload`


</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# Scripting msi install setup</tags>
Expand All @@ -25,7 +45,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
<frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
</frameworkAssemblies>
<dependencies>
<dependency id="WixSharp.bin" version="1.23.1.0" />
<dependency id="WixSharp.bin" version="1.24.0.0" />
</dependencies>
</metadata>
<files>
Expand Down
30 changes: 25 additions & 5 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>1.23.1.0</version>
<version>1.24.0.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,14 +18,34 @@ 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>WiX3-Release v1.23.1.0
- Issue #1373: [Bug] Need a clearer reason for the following Build exception: "System.NullReferenceException: Object reference not set to an instance of an object."
- Fixed packaging problem with `Microsoft.Deployment.WindowsInstaller` assembly not being copied in the target output dir. </releaseNotes>
<releaseNotes>WiX3-Release v1.24.0.0
- Issue #1392: Is it possible to inherit wxl files using managed UI?
- Issue #1389: Multi language installer intermediate .msi not found error
- Issue #1387: Cannot update to latest Caliburn.Micro
- Issue #1384: When the bootstrapper.Build API uses the same name as the project, then misleading compile warnings are issued
- Issue #1382: Package (all child elements of Chain) need to have the After field added
- Issue #1383: Package (all child elements of Chain) need to have the SuppressSignatureVerification field added
- Issue #1381: ExePackage needs to have the Protocol field implemented
- Issue #1379: A way (Or create an example) of how to create a standalone fragment and insert into Projects / chains / etc
- Issue #1377: WixSharp.wix.bin nuget references a url which is no longer available
- Issue #1372: Creating a FileAssociation with Icon and Advertised = false does not work
- Validation of the CPU architecture for the custom BA assembly.
- Updated default `BootstrapperCore.config` content
- Updated WixBootstrapper_UI sample to demonstrate how to use the WinForm-based custom BA (#1386)
- Added support for ManagedUI to foll back on the stock WXL if one was not supplied by the user for non-English languages
- Added WXL and theme files to be used in WixSharp.wix.bin package.
- Added support for ManagedUI to fall back on the stock WXL if one was not supplied by the user for non-English languages
- Improved multi-language sample
- Updated project templates to comment out webref package for bootstrapper template
- Added `WixStandardBootstrapperApplication.AddPayload`


</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.bin" version="1.23.1.0" />
<dependency id="WixSharp.bin" version="1.24.0.0" />
</dependencies>
</metadata>
<files>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<NoWarn>
</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -47,6 +48,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -45,6 +45,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -43,6 +44,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Deployment.WindowsInstaller">
Expand Down
6 changes: 5 additions & 1 deletion Source/src/WixSharp.UI/ManagedBA/SilentBA.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
using System.Diagnostics;

#if WIX4
using WixToolset.Bootstrapper;
Expand All @@ -22,6 +22,9 @@ namespace WixSharp.Bootstrapper
/// <para><see cref="T:WixSharp.Bootstrapper.SilentManagedBA"/> automatically handles <see cref="BootstrapperApplication"/> events and
/// detects the current package/product state (present vs. absent). The package state detection is based on the <see cref="T:WixSharp.Bootstrapper.SilentBootstrapperApplication.PrimaryPackageId"/>.
/// If this member is no t then the Id of the lats package in the Bundle will be used instead.</para>
/// <para>Note, the stock SilentManagedBA may have runtime hosting failure due to the fact that its assembly is compiled for AnyCPU.
/// While it is a valid hosting option that may or may not work with a specific WiX distro, you may find that you may need to take
/// this simple class and compile it into a separate x86 assembly. </para>
/// </summary>
/// <example>
/// <code>
Expand All @@ -38,6 +41,7 @@ namespace WixSharp.Bootstrapper
///
/// bootstrapper.Build();
/// </code>
///
/// </example>
public class SilentBootstrapperApplication : ManagedBootstrapperApplication, IWixSharpManagedBootstrapperApplication
{
Expand Down
2 changes: 1 addition & 1 deletion Source/src/WixSharp.UI/WixSharp.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion Source/src/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ echo off
set msbuild=C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe

"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.sln
"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.NET4.5.1.sln
"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.Lab.sln
"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.NET4.5.1.sln


pause

0 comments on commit 1d76810

Please sign in to comment.