Skip to content

Commit 7ad81ca

Browse files
committed
Release v1.6.5.1
* Issue #377: How to register a new MIME type with custom document icon * Issue #373: Bootstrapper.DigitalSignature.Apply hide console output * Added missing IconFile support * SetupEvent sample extended to show how restart itself elevated if required.
1 parent 6615b49 commit 7ad81ca

20 files changed

Lines changed: 58 additions & 90 deletions

File tree

Source/NuGet/WixSharp/WixSharp.bin.nuspec

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
33
<metadata>
44
<id>WixSharp.bin</id>
5-
<version>1.6.4.3</version>
5+
<version>1.6.5.1</version>
66
<title>Wix# (WixSharp) - Binaries</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,25 +16,11 @@ The package contains Wix# binaries only.
1616
In order to use this package you need have WiX Toolset installed.
1717
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
1818
<summary>Wix# (WixSharp) - Binaries</summary>
19-
<releaseNotes>Release v1.6.4.3-HotFix
20-
21-
-----
22-
v1.6.4.3
23-
- Issue #354: Adding an InternetShortcuts throw NullReferenceException
24-
- Assorted internal fixes (XML docs etc.)
25-
- All compatible `IGenericEntity.Process(ProcessingContext)` cases moved to `WixEntity.CreateAndInsertParentComponent`
26-
27-
v1.6.4.2
28-
* Issue #344: Duplicate symbol 'Directory:ProgramFilesFolder' found
29-
30-
v1.6.4.1
31-
* Updated all IGenericEntity implementations to support 'no-directory' deployments
32-
* Removed all references to the obsolete `IncludeWixExtension`
33-
* Implemented clean algorithm for handling no-dir scenarios without resorting to the `%ProgramFiles%\WixSharp\DummyDir`.
34-
Algorithm is controlled by `AutoElements.LagacyDummyDirAlgorithm`
35-
* Issue #341: UAC Text is not localized
36-
* Implemented adding custom error description of he ManagedUI.ExitDialog depending on the Install error or cancellation.
37-
19+
<releaseNotes>Release v1.6.5.1
20+
* Issue #377: How to register a new MIME type with custom document icon
21+
* Issue #373: Bootstrapper.DigitalSignature.Apply hide console output
22+
* Added missing IconFile support
23+
* SetupEvent sample extended to show how restart itself elevated if required.
3824

3925
</releaseNotes>
4026
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>

Source/NuGet/WixSharp/WixSharp.lab.nuspec

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>WixSharp.Lab</id>
5-
<version>1.6.4.3</version>
5+
<version>1.6.5.1</version>
66
<title>Wix# (WixSharp) - Experimantal features</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -14,25 +14,11 @@
1414
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.
1515
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
1616
<summary>Wix# binaries containing experimental features (e.g. native WiX UI support).</summary>
17-
<releaseNotes>Release v1.6.4.3-HotFix
18-
19-
-----
20-
v1.6.4.3
21-
- Issue #354: Adding an InternetShortcuts throw NullReferenceException
22-
- Assorted internal fixes (XML docs etc.)
23-
- All compatible `IGenericEntity.Process(ProcessingContext)` cases moved to `WixEntity.CreateAndInsertParentComponent`
24-
25-
v1.6.4.2
26-
* Issue #344: Duplicate symbol 'Directory:ProgramFilesFolder' found
27-
28-
v1.6.4.1
29-
* Updated all IGenericEntity implementations to support 'no-directory' deployments
30-
* Removed all references to the obsolete `IncludeWixExtension`
31-
* Implemented clean algorithm for handling no-dir scenarios without resorting to the `%ProgramFiles%\WixSharp\DummyDir`.
32-
Algorithm is controlled by `AutoElements.LagacyDummyDirAlgorithm`
33-
* Issue #341: UAC Text is not localized
34-
* Implemented adding custom error description of he ManagedUI.ExitDialog depending on the Install error or cancellation.
35-
17+
<releaseNotes>Release v1.6.5.1
18+
* Issue #377: How to register a new MIME type with custom document icon
19+
* Issue #373: Bootstrapper.DigitalSignature.Apply hide console output
20+
* Added missing IconFile support
21+
* SetupEvent sample extended to show how restart itself elevated if required.
3622

3723
</releaseNotes>
3824
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
@@ -43,7 +29,7 @@ v1.6.4.1
4329
<frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
4430
</frameworkAssemblies>
4531
<dependencies>
46-
<dependency id="WixSharp.bin" version="1.6.4.3" />
32+
<dependency id="WixSharp.bin" version="1.6.5.1" />
4733
</dependencies>
4834
</metadata>
4935
<files>

Source/NuGet/WixSharp/WixSharp.nuspec

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>WixSharp</id>
5-
<version>1.6.4.3</version>
5+
<version>1.6.5.1</version>
66
<title>Wix# (WixSharp) - managed interface for WiX</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -18,32 +18,18 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
1818
In order to use this package you need have WiX Toolset installed.
1919
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
2020
<summary>Wix# (WixSharp) - Binaries</summary>
21-
<releaseNotes>Release v1.6.4.3-HotFix
22-
23-
-----
24-
v1.6.4.3
25-
- Issue #354: Adding an InternetShortcuts throw NullReferenceException
26-
- Assorted internal fixes (XML docs etc.)
27-
- All compatible `IGenericEntity.Process(ProcessingContext)` cases moved to `WixEntity.CreateAndInsertParentComponent`
28-
29-
v1.6.4.2
30-
* Issue #344: Duplicate symbol 'Directory:ProgramFilesFolder' found
31-
32-
v1.6.4.1
33-
* Updated all IGenericEntity implementations to support 'no-directory' deployments
34-
* Removed all references to the obsolete `IncludeWixExtension`
35-
* Implemented clean algorithm for handling no-dir scenarios without resorting to the `%ProgramFiles%\WixSharp\DummyDir`.
36-
Algorithm is controlled by `AutoElements.LagacyDummyDirAlgorithm`
37-
* Issue #341: UAC Text is not localized
38-
* Implemented adding custom error description of he ManagedUI.ExitDialog depending on the Install error or cancellation.
39-
21+
<releaseNotes>Release v1.6.5.1
22+
* Issue #377: How to register a new MIME type with custom document icon
23+
* Issue #373: Bootstrapper.DigitalSignature.Apply hide console output
24+
* Added missing IconFile support
25+
* SetupEvent sample extended to show how restart itself elevated if required.
4026

4127
</releaseNotes>
4228
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
4329
<language>en-AU</language>
4430
<tags>C# scripting msi install setup wix</tags>
4531
<dependencies>
46-
<dependency id="WixSharp.bin" version="1.6.4.3" />
32+
<dependency id="WixSharp.bin" version="1.6.5.1" />
4733
</dependencies>
4834
</metadata>
4935
<files>

Source/src/WixSharp.Samples/Support/testpad/setup.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,20 @@ static void Issue_374()
6666
Compiler.BuildMsi(project);
6767
}
6868

69-
static void Issue_354()
69+
static void Issue_378()
7070
{
71-
var mainFeature = new Feature("My Product", true, false);
71+
AutoElements.DisableAutoUserProfileRegistry = true;
72+
// Compiler.LightOptions += " -sice:ICE38";
7273

7374
var project = new Project("My Product",
74-
new InstallDir(@"%ProgramFiles%/My Company/My Product"),
75-
new Dir("%ProgramMenu%",
76-
// new Dir(mainFeature, "My Product",
77-
new Dir("My Product",
78-
new InternetShortcut()
79-
{
80-
Name = "Wix# project page",
81-
Target = "https://github.com/oleg-shilo/wixsharp",
82-
Type = InternetShortcut.ShortcutType.url
83-
})));
75+
// new Dir(@"%ProgramFiles%/My Company/My Product",
76+
new Dir(@"%LocalAppData%/My Company/My Product",
77+
new File("setup.cs")));
8478

8579
// project.DefaultFeature = mainFeature;
86-
8780
project.PreserveTempFiles = true;
88-
project.InstallScope = InstallScope.perMachine;
8981
project.GUID = new Guid("6fe30b47-2577-43ad-9095-1861ba25889c");
90-
project.BuildMsi();
82+
project.BuildMsi();
9183
}
9284

9385
static void Issue_298()
@@ -132,8 +124,8 @@ static void Issue_298b()
132124

133125
static public void Main(string[] args)
134126
{
127+
Issue_378(); return;
135128
Issue_374(); return;
136-
Issue_354(); return;
137129
Issue_298(); return;
138130
// Compiler.AutoGeneration.LegacyDefaultIdAlgorithm = true;
139131

Binary file not shown.

Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ static public void Main()
3131
new XmlFile(XmlFileAction.setValue, @"//configuration/connectionStrings/add[\[]@name='Server1'[\]]/@providerName", "System.Data.SqlClient"))),
3232
new ElevatedManagedAction(CustomActions.OnInstall, Return.check, When.After, Step.InstallFiles, Condition.NOT_Installed)
3333
{
34-
UsesProperties = "CONFIG_FILE=[INSTALLDIR]MyApp.exe.config, APP_FILE=[INSTALLDIR]MyApp.exe, DATABASE_CONNECTION_STRING=[DATABASE_CONNECTION_STRING]",
35-
Execute = WixSharp.Execute.deferred
34+
UsesProperties = "CONFIG_FILE=[INSTALLDIR]MyApp.exe.config, APP_FILE=[INSTALLDIR]MyApp.exe, DATABASE_CONNECTION_STRING=[DATABASE_CONNECTION_STRING]"
3635
});
3736

3837
project.GUID = new Guid("6fe30b47-2577-43ad-9195-1861ba25889b");
Binary file not shown.

Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ static public void Main(string[] args)
2828
Icon = "wixsharp.ico"
2929
}
3030
),
31-
new IconFile(),
3231
new Dir(@"Docs\Manual",
3332
new File(@"Files\Docs\Manual.txt")
3433
{

0 commit comments

Comments
 (0)