Skip to content

Commit

Permalink
Release v1.9.7
Browse files Browse the repository at this point in the history
- Issue #638: Implement REINSTALLMODE feature
```C#
project.ReinstallMode = "amus";
```
  • Loading branch information
lbs-contributor committed May 14, 2019
1 parent 135ef49 commit 1e22829
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 28 deletions.
10 changes: 2 additions & 8 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/10/nuspec.xsd">
<metadata>
<id>WixSharp.bin</id>
<version>1.9.6.0</version>
<version>1.9.7.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,13 +16,7 @@ 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 v1.9.6

* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<releaseNotes></releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
Expand Down
12 changes: 3 additions & 9 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.9.6.0</version>
<version>1.9.7.0</version>
<title>Wix# (WixSharp) - Experimantal features</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -14,13 +14,7 @@
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>Release v1.9.6

* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<releaseNotes></releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# Scripting msi install setup</tags>
Expand All @@ -29,7 +23,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.9.6.0" />
<dependency id="WixSharp.bin" version="1.9.7.0" />
</dependencies>
</metadata>
<files>
Expand Down
12 changes: 3 additions & 9 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.9.6.0</version>
<version>1.9.7.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,18 +18,12 @@ 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 v1.9.6

* Added COM registration support
* Issue #621: W0W6432Node/COM Registration
* Issue 608: Create Shortcut on Desktop to dotnet.exe
* Addressed candle warning on `AutoElements.UACWarning = ""`
* Completely removed all traces of `SetEnvVar.dll`. Part of #620 fix.</releaseNotes>
<releaseNotes></releaseNotes>
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="1.9.6.0" />
<dependency id="WixSharp.bin" version="1.9.7.0" />
</dependencies>
</metadata>
<files>
Expand Down
Binary file modified Source/src/WixSharp.Samples/WixSharp.Lab.dll
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.
10 changes: 10 additions & 0 deletions Source/src/WixSharp.Samples/WixSharp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14961,6 +14961,16 @@
</example>
</summary>
</member>
<member name="F:WixSharp.Project.ReinstallMode">
<summary>
The REINSTALLMODE property is a string that contains letters specifying the type of reinstall to perform.
Options are case-insensitive and order-independent. This property should normally always be used in
conjunction with the REINSTALL property.
<para>Note, REINSTALLMODE property will be created only in the automatically produced WiX definition file
only if <see cref="F:WixSharp.Project.MajorUpgrade"/> is set.</para>
<para>Read more: https://docs.microsoft.com/en-us/windows/desktop/msi/reinstallmode </para>
</summary>
</member>
<member name="F:WixSharp.Project.LicenceFile">
<summary>
Relative path to RTF file with the custom licence agreement to be displayed in the Licence dialog.
Expand Down
1 change: 1 addition & 0 deletions Source/src/WixSharp/Project.cs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ internal virtual void Preprocess()
/// conjunction with the REINSTALL property.
/// <para>Note, REINSTALLMODE property will be created only in the automatically produced WiX definition file
/// only if <see cref="WixSharp.Project.MajorUpgrade"/> is set.</para>
/// <para>Read more: https://docs.microsoft.com/en-us/windows/desktop/msi/reinstallmode </para>
/// </summary>
public string ReinstallMode = "amus";

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

0 comments on commit 1e22829

Please sign in to comment.