From 6f3997198d894d60afce07bd6a68bcad5fd20ba0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 4 Apr 2023 13:17:10 -0700
Subject: Fix build of outputs with comma in their filename

Fixes 7343
---
 src/wix/WixToolset.Sdk/tools/wix.targets           |  2 +-
 src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs  | 34 ++++++++++++++++++++++
 .../TestData/PackageWith,Comma/Package.wxs         | 17 +++++++++++
 .../PackageWith,Comma/PackageWith,Comma.wixproj    |  6 ++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/Package.wxs
 create mode 100644 src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/PackageWith,Comma.wixproj

diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 2b24215d..0decbbeb 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -904,7 +904,7 @@
     </ReadTracking>
 
     <ItemGroup>
-      <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.FullPath)))" />
+      <_RelativePath Include="$([MSBuild]::MakeRelative(&quot;$(FullIntermediateOutputPath)&quot;, &quot;%(_FullPathToCopy.FullPath)&quot;))" />
     </ItemGroup>
 
     <Copy
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 85774bfd..5d2d1b2c 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -818,6 +818,40 @@ namespace WixToolsetTest.Sdk
             }
         }
 
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
+        public void CanBuildPackageWithComma(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "PackageWith,Comma");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "PackageWith,Comma.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                });
+                result.AssertSuccess();
+
+                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .OrderBy(s => s)
+                    .ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"bin\Release\cab1.cab",
+                    @"bin\Release\PackageWith,Comma.msi",
+                    @"bin\Release\PackageWith,Comma.wixpdb",
+                }, paths);
+            }
+        }
+
         [Theory(Skip = "Depends on creating broken publish which is not supported at this time")]
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/Package.wxs
new file mode 100644
index 00000000..dcaa7e28
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/Package.wxs
@@ -0,0 +1,17 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="Package With Comma" Version="1" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MajorUpgrade DowngradeErrorMessage="Downgrade message" />
+
+    <Feature Id="ProductFeature">
+       <Component Directory="INSTALLFOLDER">
+         <File Source="Package.wxs" />
+       </Component>
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/PackageWith,Comma.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/PackageWith,Comma.wixproj
new file mode 100644
index 00000000..1feeef43
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/PackageWith,Comma/PackageWith,Comma.wixproj
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build">
+  <Import Project="$(WixMSBuildProps)" />
+
+  <Import Project="$(WixTargetsPath)" />
+</Project>
-- 
cgit v1.2.3-55-g6feb