From cea1ddb1adeea09bd3457077c3aa717cb84124c4 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 5 Nov 2022 22:31:11 -0400
Subject: MSBuild cleanup.

---
 src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs | 2 +-
 src/wix/WixToolset.BuildTasks/WixBuild.cs                   | 6 +-----
 src/wix/WixToolset.Sdk/tools/wix.targets                    | 5 +----
 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
     /// <summary>
     /// An MSBuild task to run WiX to detach bundle engine to be signed.
     /// </summary>
-    public sealed partial class WindowsInstallerValidation : WixExeBaseTask
+    public sealed class WindowsInstallerValidation : WixExeBaseTask
     {
         /// <summary>
         /// 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
     /// <summary>
     /// An MSBuild task to run the WiX compiler.
     /// </summary>
-    public sealed partial class WixBuild : WixExeBaseTask
+    public sealed class WixBuild : WixExeBaseTask
     {
         public string[] Cultures { get; set; }
 
@@ -55,10 +55,6 @@ namespace WixToolset.BuildTasks
 
         public string DefaultCompressionLevel { get; set; }
 
-        public ITaskItem WixProjectFile { get; set; }
-
-        public string[] WixVariables { get; set; }
-
         protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
         {
             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 @@
 
     <WixBuild
         SourceFiles="@(Compile)"
-        LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
+        LibraryFiles="@(_ResolvedWixLibraryPaths)"
         LocalizationFiles="@(_WixLocalizationFile)"
 
         Cultures="%(CultureGroup.Identity)"
@@ -607,9 +607,6 @@
         CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
         DefaultCompressionLevel="$(DefaultCompressionLevel)"
 
-        WixProjectFile="$(ProjectPath)"
-        WixVariables="$(WixVariables)"
-
         SuppressAllWarnings="$(SuppressAllWarnings)"
         SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
-- 
cgit v1.2.3-55-g6feb