Skip to content

Commit

Permalink
Release v1.3.0
Browse files Browse the repository at this point in the history
- Issue #7: Wix error when using multiple directories
- Issue #8: Arguments are not supported on FileShortcut
- Issue #9: Property SetupEventArgs.IsModifying has other behavior than method Extensions.IsModifying()
- Implemented burn compiler output to catch WixMbaPrereqVars conflicts and suggest the work around. (Related to CP issue#149)
- Update/fix for inadequate IsUpgrading analysis.
- Updated WiX binaries to WiX Toolset v3.10.3 (v3.10.3007.0)
- Added sample for adjusting the ManagedUI dialog sequence at runtime
- Added MspPackage work around sample
  • Loading branch information
oleg-shilo committed Jan 25, 2017
1 parent 40678a2 commit 0c44813
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.41.2")]
[assembly: AssemblyFileVersion("1.0.41.2")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.Msi.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.UI.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.dll
Binary file not shown.
23 changes: 20 additions & 3 deletions Source/src/WixSharp.Samples/WixSharp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,8 @@
<summary>
The suppress auto insertion of WixMbaPrereq* variables in the bundle definition (WixMbaPrereqPackageId and WixMbaPrereqLicenseUrl).
<para>BA is relying on two internal variables that reflect .NET version (and licence) that BA requires at runtime. If user defines
custom Wix# based BA the required variables are inserted automatically. Similarly to the standards WiX/Burn BA. However some other
bundle packages (new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
custom Wix# based BA the required variables are inserted automatically, similarly to the standards WiX/Burn BA. However some other
bundle packages (e.g. new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
To avoid this you can suppress variables auto-isertin and define them manually as needed.</para>
<example>The following is an example of suppressing auto-insertion:
<code>
Expand Down Expand Up @@ -4318,6 +4318,15 @@
</para>
</summary>
</member>
<member name="M:WixSharp.Extensions.IsUpgrading(Microsoft.Deployment.WindowsInstaller.Session)">
<summary>
Gets a value indicating whether the product is being upgraded.
<para>
This method will fail to retrieve the correct value if called from the deferred custom action and the session properties
that it depends on are not preserved with 'UsesProperties' or 'DefaultUsesProperties'.
</para>
</summary>
</member>
<member name="M:WixSharp.Extensions.IsModifying(Microsoft.Deployment.WindowsInstaller.Session)">
<summary>
Determines whether MSI is running in "modifying" mode.
Expand Down Expand Up @@ -4345,7 +4354,7 @@
Determines whether the feature is selected in the feature tree of the Features dialog
and will be installed.
<para>
This method will fail to retreive the correct value if called from the deferred custom action and the session properties
This method will fail to retrieve the correct value if called from the deferred custom action and the session properties
that it depends on are not preserved with 'UsesProperties' or 'DefaultUsesProperties'.
</para>
</summary>
Expand Down Expand Up @@ -7133,6 +7142,14 @@
<c>true</c> if modifying; otherwise, <c>false</c>.
</value>
</member>
<member name="P:WixSharp.SetupEventArgs.IsUpgrading">
<summary>
Gets a value indicating whether the installed product is being upgraded.
</summary>
<value>
<c>true</c> if modifying; otherwise, <c>false</c>.
</value>
</member>
<member name="P:WixSharp.SetupEventArgs.IsRepairing">
<summary>
Gets a value indicating whether the installed product is being repaired.
Expand Down
4 changes: 2 additions & 2 deletions Source/src/WixSharp.UI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.40.2")]
[assembly: AssemblyFileVersion("1.0.40.2")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
4 changes: 2 additions & 2 deletions Source/src/WixSharp/Bootstrapper/Bundle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ public Bundle(string name, params ChainItem[] items)
/// <summary>
/// The suppress auto insertion of WixMbaPrereq* variables in the bundle definition (WixMbaPrereqPackageId and WixMbaPrereqLicenseUrl).
/// <para>BA is relying on two internal variables that reflect .NET version (and licence) that BA requires at runtime. If user defines
/// custom Wix# based BA the required variables are inserted automatically. Similarly to the standards WiX/Burn BA. However some other
/// bundle packages (new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
/// custom Wix# based BA the required variables are inserted automatically, similarly to the standards WiX/Burn BA. However some other
/// bundle packages (e.g. new PackageGroupRef("NetFx40Web")) may also define these variables so some duplication/collision is possible.
/// To avoid this you can suppress variables auto-isertin and define them manually as needed.</para>
///<example>The following is an example of suppressing auto-insertion:
/// <code>
Expand Down
6 changes: 3 additions & 3 deletions Source/src/WixSharp/Compiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,14 @@ static void EnsureVSIntegration()
{
try
{
// /MBSBUILD:$(ProjectName)
var preffix = "/MBSBUILD:";
// /MSBUILD:$(ProjectName)
var preffix = "/MSBUILD:";

string arg = Environment.GetCommandLineArgs().Where(x => x.StartsWith(preffix)).LastOrDefault() ?? "";

if (arg.IsEmpty())
{
preffix = "/MSBUILD:"; //early versions of NuGet packages had this typo
preffix = "/MBSBUILD:"; //early versions of NuGet packages had this typo
arg = Environment.GetCommandLineArgs().Where(x => x.StartsWith(preffix)).LastOrDefault() ?? "";
}

Expand Down
4 changes: 2 additions & 2 deletions Source/src/WixSharp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]

0 comments on commit 0c44813

Please sign in to comment.