Fix named bind paths.

11 files changed, 134 insertions, 15 deletions

diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs
index b1676fad..6bc5a676 100644
--- a/src/WixToolset.Core/Bind/FileResolver.cs
+++ b/src/WixToolset.Core/Bind/FileResolver.cs
@@ -115,7 +115,7 @@ namespace WixToolset.Core.Bind
             }
             else // not a rooted path so let's try applying all the different source resolution options.
             {
-                string bindName = String.Empty;
+                string bindName = null;
                 var path = source;
                 string pathWithoutSourceDir = null;
 
@@ -138,25 +138,41 @@ namespace WixToolset.Core.Bind
 
                 foreach (var bindPath in bindPaths)
                 {
-                    if (!String.IsNullOrEmpty(pathWithoutSourceDir))
+                    if (!String.IsNullOrEmpty(bindName) && !String.IsNullOrEmpty(bindPath.Name))
                     {
-                        var filePath = Path.Combine(bindPath.Path, pathWithoutSourceDir);
-
-                        checkedPaths.Add(filePath);
-                        if (CheckFileExists(filePath))
+                        if (String.Equals(bindName, bindPath.Name, StringComparison.OrdinalIgnoreCase) && String.IsNullOrEmpty(resolved))
                         {
-                            resolved = filePath;
+                            var filePath = Path.Combine(bindPath.Path, path);
+
+                            checkedPaths.Add(filePath);
+                            if (CheckFileExists(filePath))
+                            {
+                                resolved = filePath;
+                            }
                         }
                     }
-
-                    if (String.IsNullOrEmpty(resolved))
+                    else
                     {
-                        var filePath = Path.Combine(bindPath.Path, path);
+                        if (!String.IsNullOrEmpty(pathWithoutSourceDir))
+                        {
+                            var filePath = Path.Combine(bindPath.Path, pathWithoutSourceDir);
 
-                        checkedPaths.Add(filePath);
-                        if (CheckFileExists(filePath))
+                            checkedPaths.Add(filePath);
+                            if (CheckFileExists(filePath))
+                            {
+                                resolved = filePath;
+                            }
+                        }
+
+                        if (String.IsNullOrEmpty(resolved))
                         {
-                            resolved = filePath;
+                            var filePath = Path.Combine(bindPath.Path, path);
+
+                            checkedPaths.Add(filePath);
+                            if (CheckFileExists(filePath))
+                            {
+                                resolved = filePath;
+                            }
                         }
                     }
                 }
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs
index 683d1f5a..79f5d5bc 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLine.cs
@@ -21,8 +21,6 @@ namespace WixToolset.Core.CommandLine
 
     internal class CommandLine : ICommandLine
     {
-        private static readonly char[] BindPathSplit = { '=' };
-
         public CommandLine(IWixToolsetServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
new file mode 100644
index 00000000..85dcb695
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Product Id="*" Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+
+        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+        <MediaTemplate />
+
+        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+            <ComponentGroupRef Id="ProductComponents" />
+        </Feature>
+    </Product>
+
+    <Fragment>
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+            </Directory>
+        </Directory>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs
new file mode 100644
index 00000000..7d1a4ae1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Binary Id="FooAlpha" SourceFile="!(bindpath.AlphaBits)foo.dll" />
+    </Fragment>
+
+    <Fragment>
+        <Binary Id="FooMips" SourceFile="!(bindpath.MipsBits)foo.dll" />
+    </Fragment>
+
+    <Fragment>
+        <Binary Id="FooPowerPC" SourceFile="!(bindpath.PowerBits)foo.dll" />
+    </Fragment>
+
+    <Fragment>
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+            <Component>
+                <File Source="test.txt" />
+            </Component>
+            
+            <Component Id="Shared.dll" Shared="yes">
+                <File Name="Shared.dll" Source="test.txt" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 60cbde85..3989699d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -172,6 +172,13 @@
     <Content Include="TestData\Components\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\Components\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\Components\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\data\alpha\foo.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\data\mips\foo.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\data\powerpc\foo.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\WixlibWithBinaries\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index f63d1144..63771248 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -53,6 +53,42 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanBuildWixlibWithBinariesFromNamedBindPaths()
+        {
+            var folder = TestData.Get(@"TestData\WixlibWithBinaries");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-bf",
+                    "-bindpath", Path.Combine(folder, "data"),
+                    // Use names that aren't excluded in default .gitignores.
+                    "-bindpath", $"AlphaBits={Path.Combine(folder, "data", "alpha")}",
+                    "-bindpath", $"MipsBits={Path.Combine(folder, "data", "mips")}",
+                    "-bindpath", $"PowerBits={Path.Combine(folder, "data", "powerpc")}",
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", wixlibPath,
+                });
+
+                result.AssertSuccess();
+
+                var wixlib = Intermediate.Load(wixlibPath);
+                var binaryTuples = wixlib.Sections.SelectMany(s => s.Tuples).OfType<BinaryTuple>().ToList();
+                Assert.Equal(3, binaryTuples.Count);
+                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll"));
+                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-1"));
+                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-2"));
+            }
+        }
+
+        [Fact]
         public void CanBuildSingleFileUsingWixlib()
         {
             var folder = TestData.Get(@"TestData\SingleFile");