aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-11-05 22:31:11 -0400
committerRob Mensching <rob@firegiant.com>2022-11-06 19:27:55 -0800
commitcea1ddb1adeea09bd3457077c3aa717cb84124c4 (patch)
tree5fcf829fffee6c9d5a4e368513b2a639e4028957 /src
parentaec4d14e6f73727a2ae73f43c22f187d52bf37ca (diff)
downloadwix-cea1ddb1adeea09bd3457077c3aa717cb84124c4.tar.gz
wix-cea1ddb1adeea09bd3457077c3aa717cb84124c4.tar.bz2
wix-cea1ddb1adeea09bd3457077c3aa717cb84124c4.zip
MSBuild cleanup.
Diffstat (limited to 'src')
-rw-r--r--src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs2
-rw-r--r--src/wix/WixToolset.BuildTasks/WixBuild.cs6
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.targets5
3 files changed, 3 insertions, 10 deletions
diff --git a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
index cfa6ed85..24e50444 100644
--- a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
+++ b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
@@ -8,7 +8,7 @@ namespace WixToolset.BuildTasks
8 /// <summary> 8 /// <summary>
9 /// An MSBuild task to run WiX to detach bundle engine to be signed. 9 /// An MSBuild task to run WiX to detach bundle engine to be signed.
10 /// </summary> 10 /// </summary>
11 public sealed partial class WindowsInstallerValidation : WixExeBaseTask 11 public sealed class WindowsInstallerValidation : WixExeBaseTask
12 { 12 {
13 /// <summary> 13 /// <summary>
14 /// Gets or sets the path to the database to validate. 14 /// Gets or sets the path to the database to validate.
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 8696230f..d725abff 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -10,7 +10,7 @@ namespace WixToolset.BuildTasks
10 /// <summary> 10 /// <summary>
11 /// An MSBuild task to run the WiX compiler. 11 /// An MSBuild task to run the WiX compiler.
12 /// </summary> 12 /// </summary>
13 public sealed partial class WixBuild : WixExeBaseTask 13 public sealed class WixBuild : WixExeBaseTask
14 { 14 {
15 public string[] Cultures { get; set; } 15 public string[] Cultures { get; set; }
16 16
@@ -55,10 +55,6 @@ namespace WixToolset.BuildTasks
55 55
56 public string DefaultCompressionLevel { get; set; } 56 public string DefaultCompressionLevel { get; set; }
57 57
58 public ITaskItem WixProjectFile { get; set; }
59
60 public string[] WixVariables { get; set; }
61
62 protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) 58 protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
63 { 59 {
64 commandLineBuilder.AppendTextUnquoted("build"); 60 commandLineBuilder.AppendTextUnquoted("build");
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index d08e150f..d13152a1 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -578,7 +578,7 @@
578 578
579 <WixBuild 579 <WixBuild
580 SourceFiles="@(Compile)" 580 SourceFiles="@(Compile)"
581 LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)" 581 LibraryFiles="@(_ResolvedWixLibraryPaths)"
582 LocalizationFiles="@(_WixLocalizationFile)" 582 LocalizationFiles="@(_WixLocalizationFile)"
583 583
584 Cultures="%(CultureGroup.Identity)" 584 Cultures="%(CultureGroup.Identity)"
@@ -607,9 +607,6 @@
607 CabinetCreationThreadCount="$(CabinetCreationThreadCount)" 607 CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
608 DefaultCompressionLevel="$(DefaultCompressionLevel)" 608 DefaultCompressionLevel="$(DefaultCompressionLevel)"
609 609
610 WixProjectFile="$(ProjectPath)"
611 WixVariables="$(WixVariables)"
612
613 SuppressAllWarnings="$(SuppressAllWarnings)" 610 SuppressAllWarnings="$(SuppressAllWarnings)"
614 SuppressSpecificWarnings="$(SuppressSpecificWarnings)" 611 SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
615 TreatWarningsAsErrors="$(TreatWarningsAsErrors)" 612 TreatWarningsAsErrors="$(TreatWarningsAsErrors)"