15 files changed, 234 insertions, 29 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
new file mode 100644
index 00000000..584f86fe
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
@@ -0,0 +1,112 @@
+// 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.CoreIntegration
+{
+    using System.ComponentModel;
+    using System.IO;
+    using System.Linq;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Xml.Linq;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using Xunit;
+
+    public class PatchFixture
+    {
+        private static readonly XNamespace PatchNamespace = "http://www.microsoft.com/msi/patch_applicability.xsd";
+
+        [Fact(Skip = "Skip until patches have files in them")]
+        public void CanBuildSimplePatch()
+        {
+            var folder = TestData.Get(@"TestData\PatchSingle");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var tempFolder = fs.GetFolder();
+
+                var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolder, "1.0.0", "1.0.0", "1.0.0");
+                var update1Pdb = BuildMsi("Update.msi", folder, tempFolder, "1.0.1", "1.0.1", "1.0.1");
+                var patchPdb = BuildMsp("Patch1.msp", folder, tempFolder, "1.0.1");
+                var baselinePath = Path.ChangeExtension(baselinePdb, ".msp");
+                var patchPath = Path.ChangeExtension(patchPdb, ".msp");
+
+                Assert.True(File.Exists(baselinePdb));
+                Assert.True(File.Exists(update1Pdb));
+
+                var doc = GetExtractPatchXml(patchPath);
+                Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value);
+
+                var names = Query.GetSubStorageNames(patchPath);
+                Assert.Equal(new[] { "#RTM.1", "RTM.1" }, names);
+
+                var cab = Path.Combine(tempFolder, "foo.cab");
+                Query.ExtractStream(patchPath, "foo.cab", cab);
+                Assert.True(File.Exists(cab));
+
+                var files = Query.GetCabinetFiles(cab);
+                Assert.Equal(new[] { "a", "b" }, files.Select(f => f.ArchiveName).ToArray()); // This test may not be quite correct, yet.
+            }
+        }
+
+        private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB)
+        {
+            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
+
+            var result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(sourceFolder, @"Package.wxs"),
+                "-d", "V=" + defineV,
+                "-d", "A=" + defineA,
+                "-d", "B=" + defineB,
+                "-bindpath", Path.Combine(sourceFolder, ".data"),
+                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
+                "-o", outputPath
+            });
+
+            result.AssertSuccess();
+
+            return Path.ChangeExtension(outputPath, ".wixpdb");
+        }
+
+        private static string BuildMsp(string outputName, string sourceFolder, string baseFolder, string defineV)
+        {
+            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
+
+            var result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(sourceFolder, @"Patch.wxs"),
+                "-d", "V=" + defineV,
+                "-bindpath", Path.Combine(baseFolder, "bin"),
+                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
+                "-o", outputPath
+            });
+
+            result.AssertSuccess();
+
+            return Path.ChangeExtension(outputPath, ".wixpdb");
+        }
+
+        private static XDocument GetExtractPatchXml(string path)
+        {
+            var buffer = new StringBuilder(65535);
+            var size = buffer.Capacity;
+
+            var er = MsiExtractPatchXMLData(path, 0, buffer, ref size);
+            if (er != 0)
+            {
+                throw new Win32Exception(er);
+            }
+
+            return XDocument.Parse(buffer.ToString());
+        }
+
+        [DllImport("msi.dll", EntryPoint = "MsiExtractPatchXMLDataW", CharSet = CharSet.Unicode, ExactSpelling = true)]
+        private static extern int MsiExtractPatchXMLData(string szPatchPath, int dwReserved, StringBuilder szXMLData, ref int pcchXMLData);
+
+        [DllImport("msi.dll", EntryPoint = "MsiApplyPatchW", CharSet = CharSet.Unicode, ExactSpelling = true)]
+        private static extern int MsiApplyPatch(string szPatchPackage, string szInstallPackage, int eInstallType, string szCommandLine);
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
index 4e48cbe1..b1a4c607 100644
--- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
@@ -68,34 +68,6 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
-        public void WixVersionVariablesWork()
-        {
-            var folder = TestData.Get(@"TestData\Variables");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var warning = result.Messages.Where(message => message.Id == (int)WarningMessages.Ids.PreprocessorWarning);
-                Assert.Single(warning);
-            }
-        }
-
-        [Fact]
         public void ForEachLoopsWork()
         {
             var folder = TestData.Get(@"TestData\ForEach");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt
new file mode 100644
index 00000000..6fd385bd
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt
@@ -0,0 +1 @@
+This is A v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt
new file mode 100644
index 00000000..b1f0bc01
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt
@@ -0,0 +1 @@
+This ia A v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt
new file mode 100644
index 00000000..ece55fec
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt
@@ -0,0 +1 @@
+This is B v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt
new file mode 100644
index 00000000..cf3372fd
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt
@@ -0,0 +1 @@
+This ia B v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
new file mode 100644
index 00000000..2657797f
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
@@ -0,0 +1,31 @@
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='e703bf17-4765-444c-91fd-88550fa681d4' Name='~Test Package'
+            Version='$(var.V)' Manufacturer='Example Corporation' Language='1033'
+            UpgradeCode='e703bf17-4765-444c-91fd-88550fa681d4'>
+    <Package InstallScope='perMachine' />
+
+    <MajorUpgrade DowngradeErrorMessage='Newer version already installed.' />
+    <MediaTemplate />
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder'>
+        <Directory Id='INSTALLFOLDER' Name='~Test App' />
+      </Directory>
+    </Directory>
+
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='Components' />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <ComponentGroup Id="Components" Directory='INSTALLFOLDER'>
+      <Component Id='A'>
+        <File Name='a.txt' Source='Av$(var.A).txt' />
+      </Component>
+      <Component Id='B'>
+        <File Name='b.txt' Source='Bv$(var.B).txt' />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
new file mode 100644
index 00000000..7c3cff7e
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
@@ -0,0 +1,23 @@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Patch
+    AllowRemoval="yes"
+    Manufacturer="FireGiant"
+    MoreInfoURL="http://www.example.com/"
+    DisplayName="~Test Patch v$(var.V)"
+    Description="~Test Small Update Patch v($var.V)"
+    Classification="Update"
+    >
+
+    <Media Id="1" Cabinet="foo.cab">
+      <PatchBaseline Id="RTM"/>
+    </Media>
+
+    <PatchFamilyRef Id='SamplePatchFamily'/>
+  </Patch>
+
+  <Fragment>
+    <PatchFamily Id='SamplePatchFamily' Version='$(var.V)' Supersede='yes'>
+      <ComponentRef Id="A"/>
+    </PatchFamily>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt
new file mode 100644
index 00000000..6fd385bd
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt
@@ -0,0 +1 @@
+This is A v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt
new file mode 100644
index 00000000..b1f0bc01
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt
@@ -0,0 +1 @@
+This ia A v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt
new file mode 100644
index 00000000..ece55fec
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt
@@ -0,0 +1 @@
+This is B v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt
new file mode 100644
index 00000000..cf3372fd
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt
@@ -0,0 +1 @@
+This ia B v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
new file mode 100644
index 00000000..ee133ba3
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
@@ -0,0 +1,31 @@
+<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+  <Product Id='7d326855-e790-4a94-8611-5351f8321fca' Name='~Test Package'
+            Version='$(var.V)' Manufacturer='Example Corporation' Language='1033'
+            UpgradeCode='7d326855-e790-4a94-8611-5351f8321fca'>
+    <Package InstallScope='perMachine' Compressed='yes' />
+
+    <MajorUpgrade DowngradeErrorMessage='Newer version already installed.' />
+    <MediaTemplate EmbedCab='yes' />
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder'>
+        <Directory Id='INSTALLFOLDER' Name='~Test App' />
+      </Directory>
+    </Directory>
+
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='Components' />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <ComponentGroup Id="Components" Directory='INSTALLFOLDER'>
+      <Component>
+        <File Id='a.txt' Name='a.txt' Source='Av$(var.A).txt' />
+      </Component>
+      <Component>
+        <File Id='b.txt' Name='b.txt' Source='Bv$(var.B).txt' />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs
new file mode 100644
index 00000000..52e87f64
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs
@@ -0,0 +1,16 @@
+<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+    <Patch
+    AllowRemoval="yes"
+    DisplayName="~Test Patch v$(var.V)"
+    Description="~Test Small Update Patch v$(var.V)"
+    MoreInfoURL="http://www.example.com/"
+    Manufacturer="Example Corporation"
+    Classification="Update">
+
+    <Media Id="1" Cabinet="foo.cab">
+      <PatchBaseline Id="RTM" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
+    </Media>
+
+    <PatchFamily Id='SequenceFamily' Version='$(var.V)' />
+  </Patch>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 0330adf6..b17a27ff 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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 Sdk="Microsoft.NET.Sdk">
@@ -41,6 +41,18 @@
     <Content Include="TestData\Font\TrueType.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\Icon\SampleIcon.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\LockPermissions\EmptyPermissions.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\.data\Av1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\.data\Av1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\.data\Bv1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\.data\Bv1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchFamilyFilter\Patch.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\.data\Av1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\.data\Av1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\.data\Bv1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\.data\Bv1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\PatchSingle\Patch.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SameFileFolders\data\a\test.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SameFileFolders\data\c\test.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SameFileFolders\data\b\test.txt" CopyToOutputDirectory="PreserveNewest" />