Skip to content

Commit 8d54e67

Browse files
oleg-shilooleg-shilo
committed
Release v2.7.5
- Addressing #1825 (related to #1430, PRs #1432 & 1433)
1 parent 17d5418 commit 8d54e67

8 files changed

Lines changed: 25 additions & 31 deletions

File tree

‎Source/NuGet/WixSharp/WixSharp.WPF.nuspec‎

Lines changed: 4 additions & 5 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.WPF</id>
5-
<version>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - Binaries (targeting WiX3)</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,15 +16,14 @@ 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 v2.7.4.0
20-
'Merge pull request #1820 from austinw-fineart/master'
21-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
19+
<releaseNotes>Release v2.7.5.0
20+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2221
</releaseNotes>
2322
<copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
2423
<language>en-AU</language>
2524
<tags>C# scripting msi install setup wix</tags>
2625
<dependencies>
27-
<dependency id="WixSharp.bin" version="2.7.4.0" />
26+
<dependency id="WixSharp.bin" version="2.7.5.0" />
2827
<dependency id="Caliburn.Micro" version="4.0.212" />
2928
</dependencies>
3029
<references>

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

Lines changed: 3 additions & 4 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>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - Binaries (targeting WiX3)</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,9 +16,8 @@ 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 v2.7.4.0
20-
'Merge pull request #1820 from austinw-fineart/master'
21-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
19+
<releaseNotes>Release v2.7.5.0
20+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2221
</releaseNotes>
2322
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
2423
<language>en-AU</language>

‎Source/NuGet/WixSharp/WixSharp.nuspec‎

Lines changed: 4 additions & 5 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>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - managed interface for WiX3</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -18,15 +18,14 @@ 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 v2.7.4.0
22-
'Merge pull request #1820 from austinw-fineart/master'
23-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
21+
<releaseNotes>Release v2.7.5.0
22+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2423
</releaseNotes>
2524
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
2625
<language>en-AU</language>
2726
<tags>C# scripting msi install setup wix</tags>
2827
<dependencies>
29-
<dependency id="WixSharp.bin" version="2.7.4.0" />
28+
<dependency id="WixSharp.bin" version="2.7.5.0" />
3029
</dependencies>
3130
</metadata>
3231
<files>

‎Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec‎

Lines changed: 4 additions & 5 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-wix4.WPF</id>
5-
<version>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - Binaries (targeting WiX4 and later)</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,15 +16,14 @@ The package contains Wix# binaries only.
1616
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
1717
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
1818
<summary>Wix# (WixSharp) - Binaries</summary>
19-
<releaseNotes>Release v2.7.4.0
20-
'Merge pull request #1820 from austinw-fineart/master'
21-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
19+
<releaseNotes>Release v2.7.5.0
20+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2221
</releaseNotes>
2322
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
2423
<language>en-AU</language>
2524
<tags>C# scripting msi install setup wix</tags>
2625
<dependencies>
27-
<dependency id="WixSharp_wix4.bin" version="2.7.4.0" />
26+
<dependency id="WixSharp_wix4.bin" version="2.7.5.0" />
2827
</dependencies>
2928
<references>
3029
<reference file="WixSharp.UI.WPF.dll" />

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

Lines changed: 3 additions & 4 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_wix4.bin</id>
5-
<version>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - Binaries (targeting WiX4 and later)</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -16,9 +16,8 @@ The package contains Wix# binaries only.
1616
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
1717
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
1818
<summary>Wix# (WixSharp) - Binaries</summary>
19-
<releaseNotes>Release v2.7.4.0
20-
'Merge pull request #1820 from austinw-fineart/master'
21-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
19+
<releaseNotes>Release v2.7.5.0
20+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2221
</releaseNotes>
2322
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
2423
<language>en-AU</language>

‎Source/NuGet/WixSharp/WixSharp_wix4.nuspec‎

Lines changed: 4 additions & 5 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_wix4</id>
5-
<version>2.7.4.0</version>
5+
<version>2.7.5.0</version>
66
<title>Wix# (WixSharp) - managed interface for WiX4 and later</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -18,15 +18,14 @@ 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: `dotnet tool install --global wix`
1919
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
2020
<summary>Wix# (WixSharp) - Binaries</summary>
21-
<releaseNotes>Release v2.7.4.0
22-
'Merge pull request #1820 from austinw-fineart/master'
23-
'Handle missing Windows 10 SDK directory in DiscoverWellKnownLocations'
21+
<releaseNotes>Release v2.7.5.0
22+
- Addressing #1825 (related to #1430, PRs #1432 &amp; 1433)
2423
</releaseNotes>
2524
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
2625
<language>en-AU</language>
2726
<tags>C# scripting msi install setup wix</tags>
2827
<dependencies>
29-
<dependency id="WixSharp_wix4.bin" version="2.7.4.0" />
28+
<dependency id="WixSharp_wix4.bin" version="2.7.5.0" />
3029
</dependencies>
3130
</metadata>
3231
<files>

‎Source/NuGet/WixSharp/publish.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set ver=2.7.4
1+
set ver=2.7.5
22
echo !!!! Note: symbols are pushed automatically with nupkg
33

44
set nugetkey=%nuget_key%

‎Source/src/WixSharp.UI/ManagedUI/Forms/FeatureItem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ public FeatureItem(Session session, string name)
132132
var defaultState = (Convert.ToInt32(row["Level"]) <= installLevel) ? InstallState.Local : InstallState.Absent;
133133
if (session.IsInstalling()
134134
&& conditionRow?["Condition"] != null
135-
&& session.EvaluateCondition(conditionRow["Condition"].ToString()) // If condition is true...
135+
&& session.EvaluateCondition(conditionRow["Condition"].ToString())) // If condition is true...
136136
{
137137
// ...set state according to condition level.
138138
defaultState = (Convert.ToInt32(conditionRow["Level"]) <= installLevel)
139-
? InstallState.Local
139+
? InstallState.Local
140140
: InstallState.Absent;
141141
}
142142

0 commit comments

Comments
 (0)