Skip to content

Commit 2e709b8

Browse files
lbs-contributorlbs-contributor
committed
Release v1.9.5
* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement` * Issue #608: Create Shortcut on Desktop to dotnet.exe * Issue #551: Cannot include extra .wxs as part of a bundle * Issue #610: Warning when building two bundles in one setup * Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled? * Issue #606: Platform.x64 not marking some folders win64="yes" * Issue #599: Files creating empty folders on Destination (2) * Issue #599: Files creating empty folders on Destination * Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593 * Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()` * Issue #586: How to add bal:overridable for Variable with wix# * Issue #591: Code signing timestamping fails if old Windows SDK is installed * Issue #585: Question: Warning about auto-generated IDs * Issue #580: Wrong path to the AdminToolsFolder * Add MsuPackage Element * Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed
1 parent eb6e323 commit 2e709b8

18 files changed

Lines changed: 255 additions & 56 deletions

File tree

‎Source/NuGet/WixSharp/WixSharp.bin.nuspec‎

Lines changed: 20 additions & 17 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.9.4.0</version>
5+
<version>1.9.5.0</version>
66
<title>Wix# (WixSharp) - Binaries</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,24 +16,27 @@ 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.9.4
19+
<releaseNotes>Release v1.9.5
2020

21-
* VS project templates - added packages.config files
22-
* Added Condition-s for .NET Frameworks 4.7.1 and 4.7.2
23-
* Issue #569: Updating WixSharp leads to malfuncion of SetEvVar
24-
* Added support for `UI.Error` WiX element
25-
* Issue #552: Question: Install 2 windows services in same installer
26-
* Issue #541: Installing 2 Services in the same installer results in �
27-
* Samples update
28-
* Issue #560: Semantic difference between UninstallCondition and IsUninstalling
29-
* Issue #564: Correct variable name of SequentialGuid initialization.
30-
* Issue #562: Typo in Compiler.cs comments
31-
* Issue #561: Typo in WixProject.cs
32-
* Added missing namespace in custom dialog template, fixed comment.
33-
* Added explicit `WixEntity.ComponentId` property
21+
* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
22+
* Issue #608: Create Shortcut on Desktop to dotnet.exe
3423
* Issue #551: Cannot include extra .wxs as part of a bundle
35-
* Issue #542: ServiceInstaller.StartOn/StopOn/RemoveOn - Documentation bug
36-
* Issue #544: Failed while processing WebSites; added support for `IISVirtualDir.AttributesDefinition`</releaseNotes>
24+
* Issue #610: Warning when building two bundles in one setup
25+
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
26+
* Issue #606: Platform.x64 not marking some folders win64="yes"
27+
* Issue #599: Files creating empty folders on Destination (2)
28+
* Issue #599: Files creating empty folders on Destination
29+
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
30+
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
31+
* Issue #586: How to add bal:overridable for Variable with wix#
32+
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
33+
* Issue #585: Question: Warning about auto-generated IDs
34+
* Issue #580: Wrong path to the AdminToolsFolder
35+
* Add MsuPackage Element
36+
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed
37+
38+
39+
</releaseNotes>
3740
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
3841
<language>en-AU</language>
3942
<tags>C# scripting msi install setup wix</tags>

‎Source/NuGet/WixSharp/WixSharp.lab.nuspec‎

Lines changed: 21 additions & 18 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.9.4.0</version>
5+
<version>1.9.5.0</version>
66
<title>Wix# (WixSharp) - Experimantal features</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -14,24 +14,27 @@
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.9.4
17+
<releaseNotes>Release v1.9.5
1818

19-
* VS project templates - added packages.config files
20-
* Added Condition-s for .NET Frameworks 4.7.1 and 4.7.2
21-
* Issue #569: Updating WixSharp leads to malfuncion of SetEvVar
22-
* Added support for `UI.Error` WiX element
23-
* Issue #552: Question: Install 2 windows services in same installer
24-
* Issue #541: Installing 2 Services in the same installer results in �
25-
* Samples update
26-
* Issue #560: Semantic difference between UninstallCondition and IsUninstalling
27-
* Issue #564: Correct variable name of SequentialGuid initialization.
28-
* Issue #562: Typo in Compiler.cs comments
29-
* Issue #561: Typo in WixProject.cs
30-
* Added missing namespace in custom dialog template, fixed comment.
31-
* Added explicit `WixEntity.ComponentId` property
19+
* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
20+
* Issue #608: Create Shortcut on Desktop to dotnet.exe
3221
* Issue #551: Cannot include extra .wxs as part of a bundle
33-
* Issue #542: ServiceInstaller.StartOn/StopOn/RemoveOn - Documentation bug
34-
* Issue #544: Failed while processing WebSites; added support for `IISVirtualDir.AttributesDefinition`</releaseNotes>
22+
* Issue #610: Warning when building two bundles in one setup
23+
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
24+
* Issue #606: Platform.x64 not marking some folders win64="yes"
25+
* Issue #599: Files creating empty folders on Destination (2)
26+
* Issue #599: Files creating empty folders on Destination
27+
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
28+
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
29+
* Issue #586: How to add bal:overridable for Variable with wix#
30+
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
31+
* Issue #585: Question: Warning about auto-generated IDs
32+
* Issue #580: Wrong path to the AdminToolsFolder
33+
* Add MsuPackage Element
34+
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed
35+
36+
37+
</releaseNotes>
3538
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
3639
<language>en-AU</language>
3740
<tags>C# Scripting msi install setup</tags>
@@ -40,7 +43,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
4043
<frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
4144
</frameworkAssemblies>
4245
<dependencies>
43-
<dependency id="WixSharp.bin" version="1.9.4.0" />
46+
<dependency id="WixSharp.bin" version="1.9.5.0" />
4447
</dependencies>
4548
</metadata>
4649
<files>

‎Source/NuGet/WixSharp/WixSharp.nuspec‎

Lines changed: 21 additions & 18 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.9.4.0</version>
5+
<version>1.9.5.0</version>
66
<title>Wix# (WixSharp) - managed interface for WiX</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -18,29 +18,32 @@ 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.9.4
21+
<releaseNotes>Release v1.9.5
2222

23-
* VS project templates - added packages.config files
24-
* Added Condition-s for .NET Frameworks 4.7.1 and 4.7.2
25-
* Issue #569: Updating WixSharp leads to malfuncion of SetEvVar
26-
* Added support for `UI.Error` WiX element
27-
* Issue #552: Question: Install 2 windows services in same installer
28-
* Issue #541: Installing 2 Services in the same installer results in �
29-
* Samples update
30-
* Issue #560: Semantic difference between UninstallCondition and IsUninstalling
31-
* Issue #564: Correct variable name of SequentialGuid initialization.
32-
* Issue #562: Typo in Compiler.cs comments
33-
* Issue #561: Typo in WixProject.cs
34-
* Added missing namespace in custom dialog template, fixed comment.
35-
* Added explicit `WixEntity.ComponentId` property
23+
* Added new XML injection extensions `WixProject.AddXml` and `WixProject.AddXmlElement`
24+
* Issue #608: Create Shortcut on Desktop to dotnet.exe
3625
* Issue #551: Cannot include extra .wxs as part of a bundle
37-
* Issue #542: ServiceInstaller.StartOn/StopOn/RemoveOn - Documentation bug
38-
* Issue #544: Failed while processing WebSites; added support for `IISVirtualDir.AttributesDefinition`</releaseNotes>
26+
* Issue #610: Warning when building two bundles in one setup
27+
* Issue #604: Is it possible to suppress the "UAC prompt" text if UAC is not enabled?
28+
* Issue #606: Platform.x64 not marking some folders win64="yes"
29+
* Issue #599: Files creating empty folders on Destination (2)
30+
* Issue #599: Files creating empty folders on Destination
31+
* Added `WixEntity.ComponentCondition` to assist with cases when WiX element does not have condition (e.g. `RegistryKey`). Triggered by issue #593
32+
* Added support for attribute namespaces during XML auto serialization with `WixObject.ToXElement()`
33+
* Issue #586: How to add bal:overridable for Variable with wix#
34+
* Issue #591: Code signing timestamping fails if old Windows SDK is installed
35+
* Issue #585: Question: Warning about auto-generated IDs
36+
* Issue #580: Wrong path to the AdminToolsFolder
37+
* Add MsuPackage Element
38+
* Fix Condition Net462_Installed, Net47_Installed, Net471_Installed, Net472_Installed
39+
40+
41+
</releaseNotes>
3942
<copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
4043
<language>en-AU</language>
4144
<tags>C# scripting msi install setup wix</tags>
4245
<dependencies>
43-
<dependency id="WixSharp.bin" version="1.9.4.0" />
46+
<dependency id="WixSharp.bin" version="1.9.5.0" />
4447
</dependencies>
4548
</metadata>
4649
<files>

‎Source/bin/package.readme‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
1. Rebuild Release configuration (Just to verify Release code correctness)
2+
3+
2.1 Execute src\build.cmd (Builds all solutions)
4+
2.2 Execute src\aggregate.cmd Gatherers binaries and builds the help file)
5+
6+
3. Run bin\package.cs (Packages release in the 7zip file)
7+
8+
4. Update NuGet (NuGet\WixSharp\UpdatePackage.cs)
9+
10+
5. Commit the code
11+
12+
6. Update GitHub (Make release)
13+
14+
7. Update VS Gallery
15+

‎Source/src/Docs/WixSharp.Docs.shfbproj‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<!-- The configuration and platform will be used to determine which
5+
assemblies to include from solution and project documentation
6+
sources -->
7+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9+
<SchemaVersion>2.0</SchemaVersion>
10+
<ProjectGuid>{12f7a748-f685-43df-bc03-1591a76df1ab}</ProjectGuid>
11+
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
12+
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
13+
Studio adds them anyway -->
14+
<AssemblyName>Documentation</AssemblyName>
15+
<RootNamespace>Documentation</RootNamespace>
16+
<Name>WixSharp.Docs</Name>
17+
<!-- SHFB properties -->
18+
<OutputPath>Build\</OutputPath>
19+
<HtmlHelpName>WixSharp.Reference</HtmlHelpName>
20+
<ProjectSummary>
21+
</ProjectSummary>
22+
<MissingTags>Parameter, Returns, AutoDocumentCtors, TypeParameter</MissingTags>
23+
<VisibleItems>None</VisibleItems>
24+
<HtmlHelp1xCompilerPath>C:\Program Files (x86)\HTML Help Workshop\</HtmlHelp1xCompilerPath>
25+
<HtmlHelp2xCompilerPath>
26+
</HtmlHelp2xCompilerPath>
27+
<SandcastlePath>
28+
</SandcastlePath>
29+
<WorkingPath>
30+
</WorkingPath>
31+
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
32+
<PresentationStyle>VS2010</PresentationStyle>
33+
<DocumentationSources>
34+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.dll" />
35+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.Msi.dll" />
36+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.Msi.xml" />
37+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.UI.dll" />
38+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.UI.xml" />
39+
<DocumentationSource sourceFile="..\..\bin\WixSharp\WixSharp.xml" /></DocumentationSources>
40+
<NamespaceSummaries>
41+
<NamespaceSummaryItem name="(global)" isDocumented="True">Namespace Summary: N/A</NamespaceSummaryItem>
42+
<NamespaceSummaryItem name="csscript" isDocumented="True">Namespace Summary: N/A</NamespaceSummaryItem>
43+
<NamespaceSummaryItem name="CSScriptLibrary" isDocumented="True">Namespace Summary: N/A</NamespaceSummaryItem>
44+
<NamespaceSummaryItem name="CSScriptLibrary.ThirdpartyLibraries.Rubenhak.Utils" isDocumented="True">Namespace Summary: N/A</NamespaceSummaryItem>
45+
</NamespaceSummaries>
46+
<HelpFileFormat>HtmlHelp1</HelpFileFormat>
47+
<SyntaxFilters>CSharp, VisualBasic</SyntaxFilters>
48+
<SdkLinkTarget>Blank</SdkLinkTarget>
49+
<RootNamespaceContainer>False</RootNamespaceContainer>
50+
<Preliminary>False</Preliminary>
51+
<NamingMethod>Guid</NamingMethod>
52+
<Language>en-US</Language>
53+
<HelpTitle>A Wix# Documented Class Library</HelpTitle>
54+
<ContentPlacement>AboveNamespaces</ContentPlacement>
55+
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
56+
<IndentHtml>True</IndentHtml>
57+
<KeepLogFile>True</KeepLogFile>
58+
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
59+
<CppCommentsFixup>False</CppCommentsFixup>
60+
<CleanIntermediates>True</CleanIntermediates>
61+
<ApiFilter>
62+
<Filter entryType="Namespace" fullName="WindowsInstaller" isExposed="False" />
63+
<Filter entryType="Namespace" fullName="WixSharp" isExposed="True">
64+
<Filter entryType="Class" fullName="WixSharp.Buttons" filterName="Buttons" isExposed="False" />
65+
<Filter entryType="Class" fullName="WixSharp.CommonDialogs" filterName="CommonDialogs" isExposed="False" />
66+
</Filter>
67+
</ApiFilter>
68+
</PropertyGroup>
69+
<!-- There are no properties for these two groups but they need to appear in
70+
order for Visual Studio to perform the build. -->
71+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
72+
</PropertyGroup>
73+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
74+
</PropertyGroup>
75+
<ItemGroup>
76+
<Reference Include="BootstrapperCore">
77+
<HintPath>..\WixSharp.Samples\Wix_bin\SDK\BootstrapperCore.dll</HintPath>
78+
</Reference>
79+
<Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad">
80+
<HintPath>..\WixSharp.Samples\Wix_bin\bin\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
81+
<Private>True</Private>
82+
</Reference>
83+
</ItemGroup>
84+
<!-- Import the SHFB build targets -->
85+
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
86+
</Project>

‎Source/src/Docs/WixSharp.Docs.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30501.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "WixSharp.Docs", "WixSharp.Docs.shfbproj", "{12F7A748-F685-43DF-BC03-1591A76DF1AB}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{12F7A748-F685-43DF-BC03-1591A76DF1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{12F7A748-F685-43DF-BC03-1591A76DF1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{12F7A748-F685-43DF-BC03-1591A76DF1AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{12F7A748-F685-43DF-BC03-1591A76DF1AB}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,18 @@ static void Issue_374()
125125
Compiler.BuildMsi(project);
126126
}
127127

128+
static void Issue_609()
129+
{
130+
// AutoElements.DisableAutoKeyPath = true;
131+
132+
var project = new Project("MyProduct",
133+
new Dir(@"%LocalAppDataFolder%\My Company\My Product", new File("setup.cs")),
134+
new RegValue(RegistryHive.CurrentUser, @"Software\My Company\My Product", "LICENSE_KEY", "123456"));
135+
136+
project.PreserveTempFiles = true;
137+
project.BuildMsi();
138+
}
139+
128140
static void Issue_377()
129141
{
130142
var project = new Project("someProject",
@@ -276,6 +288,7 @@ static void Issue_298b()
276288
static public void Main()
277289
{
278290
// HiTeach_MSI.Program.Main1(); return;
291+
Issue_609(); return;
279292
Issue_551(); return;
280293
Issue_606(); return;
281294
Issue_377(); return;

‎Source/src/WixSharp.Samples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/Embedded/setup.exe‎

0 Bytes
Binary file not shown.

‎Source/src/WixSharp.Samples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/CustomAction.dll‎

0 Bytes
Binary file not shown.

‎Source/src/WixSharp.Samples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/DispalyMessage.dll‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)