1 files changed, 12 insertions, 4 deletions

diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
index 028ea0cf..32680e5d 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
@@ -17,9 +17,6 @@ namespace WixToolsetTest.Sdk
 
     public static class MsbuildUtilities
     {
-        public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "..", "..", "publish", "WixToolset.Sdk");
-        public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
-
         public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true)
         {
             var allArgs = new List<string>
@@ -27,7 +24,6 @@ namespace WixToolsetTest.Sdk
                 $"-verbosity:{verbosityLevel}",
                 $"-p:Configuration={configuration}",
                 $"-p:SuppressValidation={suppressValidation}",
-                GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath),
                 // Node reuse means that child msbuild processes can stay around after the build completes.
                 // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.
                 "-nr:false",
@@ -74,11 +70,23 @@ namespace WixToolsetTest.Sdk
             {
                 case BuildSystem.DotNetCoreSdk:
                     {
+                        // If the value ends with a backslash, double-escape it (it should end up with four backslashes).
+                        if (valueToQuote?.EndsWith("\\") == true)
+                        {
+                            valueToQuote += @"\\\";
+                        }
+
                         return $"-p:{propertyName}=\\\"{valueToQuote}\\\"";
                     }
                 case BuildSystem.MSBuild:
                 case BuildSystem.MSBuild64:
                     {
+                        // If the value ends with a backslash, escape it.
+                        if (valueToQuote?.EndsWith("\\") == true)
+                        {
+                            valueToQuote += @"\";
+                        }
+
                         return $"-p:{propertyName}=\"{valueToQuote}\"";
                     }
                 default: