Update all MSBuild tests to run on x86 and x64 MSBuild.

1 files changed, 46 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
new file mode 100644
index 00000000..d4815bde
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
@@ -0,0 +1,46 @@
+// Copyright(c) .NET Foundation and contributors.All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.MSBuild
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using WixBuildTools.TestSupport;
+
+    public enum BuildSystem
+    {
+        MSBuild,
+        MSBuild64,
+    }
+
+    public static class MsbuildUtilities
+    {
+        public static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
+
+        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, params string[] arguments)
+        {
+            var allArgs = new List<string>
+            {
+                $"-p:WixMSBuildProps={MsbuildUtilities.WixPropsPath}",
+            };
+
+            if (arguments != null)
+            {
+                allArgs.AddRange(arguments);
+            }
+
+            switch (buildSystem)
+            {
+                case BuildSystem.MSBuild:
+                case BuildSystem.MSBuild64:
+                    {
+                        return MsbuildRunner.Execute(projectPath, allArgs.ToArray(), buildSystem == BuildSystem.MSBuild64);
+                    }
+                default:
+                    {
+                        throw new NotImplementedException();
+                    }
+            }
+        }
+    }
+}