MSBuild cleanup.
Bob Arnson committed
Nov 5, 2022 at 22:31 UTC
cea1ddb1adeea09bd3457077c3aa717cb84124c4
3 files changed
+3
-10
src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
+1
-1
@@ -8,7 +8,7 @@ namespace WixToolset.BuildTasks
8
/// <summary>
9
/// An MSBuild task to run WiX to detach bundle engine to be signed.
10
/// </summary>
11
- public sealed partial class WindowsInstallerValidation : WixExeBaseTask
11
+ public sealed class WindowsInstallerValidation : WixExeBaseTask
12
{
13
/// <summary>
14
/// Gets or sets the path to the database to validate.
src/wix/WixToolset.BuildTasks/WixBuild.cs
+1
-5
@@ -10,7 +10,7 @@ namespace WixToolset.BuildTasks
10
/// <summary>
11
/// An MSBuild task to run the WiX compiler.
12
/// </summary>
13
- public sealed partial class WixBuild : WixExeBaseTask
13
+ public sealed class WixBuild : WixExeBaseTask
14
{
15
public string[] Cultures { get; set; }
16
@@ -55,10 +55,6 @@ namespace WixToolset.BuildTasks
55
56
public string DefaultCompressionLevel { get; set; }
57
58
- public ITaskItem WixProjectFile { get; set; }
59
-
60
- public string[] WixVariables { get; set; }
61
-
58
protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
59
{
60
commandLineBuilder.AppendTextUnquoted("build");
src/wix/WixToolset.Sdk/tools/wix.targets
+1
-4
@@ -578,7 +578,7 @@
578
579
<WixBuild
580
SourceFiles="@(Compile)"
581
- LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
581
+ LibraryFiles="@(_ResolvedWixLibraryPaths)"
582
LocalizationFiles="@(_WixLocalizationFile)"
583
584
Cultures="%(CultureGroup.Identity)"
@@ -607,9 +607,6 @@
607
CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
608
DefaultCompressionLevel="$(DefaultCompressionLevel)"
609
610
- WixProjectFile="$(ProjectPath)"
611
- WixVariables="$(WixVariables)"
612
-
610
SuppressAllWarnings="$(SuppressAllWarnings)"
611
SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
612
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"