Use strongly-typed tuple creation...

...especially for tuples shared with WixToolset.Data.
Add bundle tests.

13 files changed, 159 insertions, 75 deletions

diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props
index a784e352..1666e4fe 100644
--- a/src/FindLocalWix.props
+++ b/src/FindLocalWix.props
@@ -3,6 +3,6 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
   </PropertyGroup>
 </Project>
diff --git a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe
new file mode 100644
index 00000000..2a4f423f
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
new file mode 100644
index 00000000..bc1dee83
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
@@ -0,0 +1,10 @@
+<?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="BundleName">~TestBundle</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
new file mode 100644
index 00000000..cafd4255
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+        <BootstrapperApplication SourceFile="fakeba.dll" />
+
+        <util:RegistrySearchRef Id="RegistrySearchId" />
+        <util:ProductSearchRef Id="ProductSearchId" />
+        <util:FileSearchRef Id="FileSearchId" />
+
+        <Chain>
+            <MsiPackage SourceFile="test.msi">
+                <MsiProperty Name="TEST" Value="1" />
+            </MsiPackage>
+        </Chain>
+    </Bundle>
+
+    <Fragment>
+        <util:RegistrySearch
+            Id="RegistrySearchId"
+            Variable="RegistrySearchVariable"
+            Root="HKLM"
+            Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
+            Value="Release"
+            Result="value" />
+    </Fragment>
+
+    <Fragment>
+        <util:ProductSearch Id="ProductSearchId" Variable="ProductSearchVariable" UpgradeCode="738D02BF-E231-4370-8209-E9FD4E1BE2A1" Condition="1 &amp; 2 &lt; 3" Result="version" />
+    </Fragment>
+
+    <Fragment>
+        <util:FileSearch Id="FileSearchId" Variable="FileSearchVariable" Path="%windir%\System32\mscoree.dll" Result="exists" />
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
new file mode 100644
index 00000000..0e461ba8
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
@@ -0,0 +1 @@
+This is Shared.dll.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
new file mode 100644
index 00000000..8b986220
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
@@ -0,0 +1 @@
+This is test.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
new file mode 100644
index 00000000..970efdf0
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
@@ -0,0 +1 @@
+This is a fakeba.dll
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
new file mode 100644
index 00000000..0722d60e
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 74cf9769..f2f06af8 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -2,9 +2,12 @@
 
 namespace WixToolsetTest.Util
 {
+    using System.IO;
     using System.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
     using WixToolset.Util;
     using Xunit;
 
@@ -24,6 +27,70 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
+        [Fact]
+        public void CanBuildBundleWithSearches()
+        {
+            var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe");
+            var folder = TestData.Get(@"TestData\BundleWithSearches");
+            var rootFolder = TestData.Get();
+            var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Bundle.wxs"),
+                    "-ext", wixext,
+                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-burnStub", burnStubPath,
+                    "-o", Path.Combine(baseFolder, @"bin\test.exe")
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe")));
+#if TODO
+                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
+#endif
+
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
+                var section = intermediate.Sections.Single();
+
+                var searchTuples = section.Tuples.OfType<WixSearchTuple>().OrderBy(t => t.Id.Id).ToList();
+                Assert.Equal(3, searchTuples.Count);
+                Assert.Equal("FileSearchId", searchTuples[0].Id.Id);
+                Assert.Equal("FileSearchVariable", searchTuples[0].Variable);
+                Assert.Equal("ProductSearchId", searchTuples[1].Id.Id);
+                Assert.Equal("ProductSearchVariable", searchTuples[1].Variable);
+                Assert.Equal("1 & 2 < 3", searchTuples[1].Condition);
+                Assert.Equal("RegistrySearchId", searchTuples[2].Id.Id);
+                Assert.Equal("RegistrySearchVariable", searchTuples[2].Variable);
+
+                var fileSearchTuple = section.Tuples.OfType<WixFileSearchTuple>().Single();
+                Assert.Equal("FileSearchId", fileSearchTuple.Id.Id);
+                Assert.Equal(@"%windir%\System32\mscoree.dll", fileSearchTuple.Path);
+                Assert.Equal(WixFileSearchAttributes.Default | WixFileSearchAttributes.WantExists, fileSearchTuple.Attributes);
+
+                var productSearchTuple = section.Tuples.OfType<WixProductSearchTuple>().Single();
+                Assert.Equal("ProductSearchId", productSearchTuple.Id.Id);
+                Assert.Equal("{738D02BF-E231-4370-8209-E9FD4E1BE2A1}", productSearchTuple.Guid);
+                Assert.Equal(WixProductSearchAttributes.Version | WixProductSearchAttributes.UpgradeCode, productSearchTuple.Attributes);
+
+                var registrySearchTuple = section.Tuples.OfType<WixRegistrySearchTuple>().Single();
+                Assert.Equal("RegistrySearchId", registrySearchTuple.Id.Id);
+                Assert.Equal(RegistryRootType.LocalMachine, registrySearchTuple.Root);
+                Assert.Equal(@"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full", registrySearchTuple.Key);
+                Assert.Equal("Release", registrySearchTuple.Value);
+                Assert.Equal(WixRegistrySearchAttributes.WantValue | WixRegistrySearchAttributes.Raw, registrySearchTuple.Attributes);
+            }
+        }
+
         private static void Build(string[] args)
         {
             var result = WixRunner.Execute(args)
diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index 294844ac..6cf001a2 100644
--- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
@@ -12,6 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="TestData\.Data\burn.exe" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\data\fakeba.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\data\MsiPackage\Shared.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\data\MsiPackage\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\data\test.msi" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\Bundle.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleWithSearches\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingFileShare\example.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingFileShare\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingFileShare\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index cc51733a..19f4af06 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -34,55 +34,12 @@ namespace WixToolset.Util
         internal const int UserDontCreateUser = 0x00000200;
         internal const int UserNonVital = 0x00000400;
 
-        [Flags]
-        internal enum WixFileSearchAttributes
-        {
-            Default = 0x001,
-            MinVersionInclusive = 0x002,
-            MaxVersionInclusive = 0x004,
-            MinSizeInclusive = 0x008,
-            MaxSizeInclusive = 0x010,
-            MinDateInclusive = 0x020,
-            MaxDateInclusive = 0x040,
-            WantVersion = 0x080,
-            WantExists = 0x100,
-            IsDirectory = 0x200,
-        }
-
         internal enum WixRegistrySearchFormat
         {
             Raw,
             Compatible,
         }
 
-        [Flags]
-        internal enum WixRegistrySearchAttributes
-        {
-            Raw = 0x01,
-            Compatible = 0x02,
-            ExpandEnvironmentVariables = 0x04,
-            WantValue = 0x08,
-            WantExists = 0x10,
-            Win64 = 0x20,
-        }
-
-        internal enum WixComponentSearchAttributes
-        {
-            KeyPath = 0x1,
-            State = 0x2,
-            WantDirectory = 0x4,
-        }
-
-        [Flags]
-        internal enum WixProductSearchAttributes
-        {
-            Version = 0x01,
-            Language = 0x02,
-            State = 0x04,
-            Assignment = 0x08,
-            UpgradeCode = 0x10,
-        }
-
         internal enum WixRestartResourceAttributes
         {
             Filename = 1,
@@ -505,10 +462,12 @@ namespace WixToolset.Util
                         break;
                 }
 
-                var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixComponentSearch", id);
-                row.Set(1, guid);
-                row.Set(2, productCode);
-                row.Set(3, (int)attributes);
+                section.Tuples.Add(new WixComponentSearchTuple(sourceLineNumbers, id)
+                {
+                    Guid = guid,
+                    ProductCode = productCode,
+                    Attributes = attributes,
+                });
             }
         }
 
@@ -1087,16 +1046,11 @@ namespace WixToolset.Util
         /// <param name="attributes"></param>
         private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes)
         {
-            var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixFileSearch", id);
-            row.Set(1, path);
-            //row.Set(2, minVersion;
-            //row.Set(3, maxVersion;
-            //row.Set(4, minSize;
-            //row.Set(5, maxSize;
-            //row.Set(6, minDate;
-            //row.Set(7, maxDate;
-            //row.Set(8, languages;
-            row.Set(9, (int)attributes);
+            section.Tuples.Add(new WixFileSearchTuple(sourceLineNumbers, id)
+            {
+                Path = path,
+                Attributes = attributes,
+            });
         }
 
         /// <summary>
@@ -1108,9 +1062,11 @@ namespace WixToolset.Util
         /// <param name="condition">A condition to test before evaluating the search.</param>
         private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition)
         {
-            var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearch", id);
-            row.Set(1, variable);
-            row.Set(2, condition);
+            section.Tuples.Add(new WixSearchTuple(sourceLineNumbers, id)
+            {
+                Variable = variable,
+                Condition = condition,
+            });
         }
 
         /// <summary>
@@ -1122,9 +1078,11 @@ namespace WixToolset.Util
         /// <param name="attributes">Further details about the relation between id and parentId.</param>
         private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes)
         {
-            var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearchRelation", id);
-            row.Set(1, parentId);
-            row.Set(2, attributes);
+            section.Tuples.Add(new WixSearchRelationTuple(sourceLineNumbers, id)
+            {
+                ParentSearchRef = parentId,
+                Attributes = attributes,
+            });
         }
 
         /// <summary>
@@ -2680,9 +2638,11 @@ namespace WixToolset.Util
                     attributes |= WixProductSearchAttributes.UpgradeCode;
                 }
 
-                var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixProductSearch", id);
-                row.Set(1, productCode ?? upgradeCode);
-                row.Set(2, (int)attributes);
+                section.Tuples.Add(new WixProductSearchTuple(sourceLineNumbers, id)
+                {
+                    Guid = productCode ?? upgradeCode,
+                    Attributes = attributes,
+                });
             }
         }
 
@@ -2836,11 +2796,13 @@ namespace WixToolset.Util
                     this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
                 }
 
-                var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRegistrySearch", id);
-                row.Set(1, (int)root);
-                row.Set(2, key);
-                row.Set(3, value);
-                row.Set(4, (int)attributes);
+                section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id)
+                {
+                    Root = (RegistryRootType)root,
+                    Key = key,
+                    Value = value,
+                    Attributes = attributes,
+                });
             }
         }
 
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 251c740a..ba4482d2 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0043" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0048" developmentDependency="true" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj
index 3af40366..cc68d92c 100644
--- a/src/wixlib/util.wixproj
+++ b/src/wixlib/util.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0043\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0043\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0048\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0048\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
@@ -46,7 +46,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0043\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0043\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0048\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0048\build\WixToolset.MSBuild.props'))" />
   </Target>
   <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
 </Project>