Port the patch tests from the old repo.

15 files changed, 211 insertions, 1 deletions

diff --git a/src/TestData/PatchTests/BundleA/BundleA.wixproj b/src/TestData/PatchTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..bbdace55
--- /dev/null
+++ b/src/TestData/PatchTests/BundleA/BundleA.wixproj
@@ -0,0 +1,18 @@
+<!-- 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="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{486FC795-69A5-4130-8727-4068F645A0A1}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.81" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/BundleA/BundleA.wxs b/src/TestData/PatchTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..d40351a1
--- /dev/null
+++ b/src/TestData/PatchTests/BundleA/BundleA.wxs
@@ -0,0 +1,11 @@
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+    </PackageGroup>
+
+    <!--<swid:Tag Regid="regid.1995-08.com.example" />-->
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
new file mode 100644
index 00000000..5846fce5
--- /dev/null
+++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -0,0 +1,18 @@
+<!-- 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="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.81" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
new file mode 100644
index 00000000..89f24936
--- /dev/null
+++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
@@ -0,0 +1,11 @@
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
+    </PackageGroup>
+
+    <!--<swid:Tag Regid="regid.1995-08.com.example" Type="patch" />-->
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
new file mode 100644
index 00000000..dee4a0f3
--- /dev/null
+++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
@@ -0,0 +1,19 @@
+<!-- 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="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{1BE09331-2327-4534-9223-59B54EFAE7A5}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\PatchA2\PatchA2.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.81" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
new file mode 100644
index 00000000..f2c44ad4
--- /dev/null
+++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
@@ -0,0 +1,12 @@
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
+      <MspPackage Id="PatchA2" SourceFile="$(var.PatchA2.TargetPath)" PerMachine="yes" />
+    </PackageGroup>
+
+    <!--<swid:Tag Regid="regid.1995-08.com.example" Type="patch" />-->
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PatchTests/PackageAv1/PackageA.props b/src/TestData/PatchTests/PackageAv1/PackageA.props
new file mode 100644
index 00000000..1209d09e
--- /dev/null
+++ b/src/TestData/PatchTests/PackageAv1/PackageA.props
@@ -0,0 +1,12 @@
+<!-- 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>
+  <PropertyGroup>
+    <PackageName>PackageA</PackageName>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <ProductCode>{724F9BA5-DD9D-4851-855E-ECC35B27BF11}</ProductCode>
+    <UpgradeCode>{C56DA396-7A9A-4177-8264-638161CE9EB8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/PackageAv1/PackageAv1.wixproj b/src/TestData/PatchTests/PackageAv1/PackageAv1.wixproj
new file mode 100644
index 00000000..45d3b2c8
--- /dev/null
+++ b/src/TestData/PatchTests/PackageAv1/PackageAv1.wixproj
@@ -0,0 +1,4 @@
+<!-- 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="WixToolset.Sdk">
+  <Import Project="PackageA.props" />
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs b/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs
new file mode 100644
index 00000000..81c6da0c
--- /dev/null
+++ b/src/TestData/PatchTests/PackageAv1/ProductComponents.wxs
@@ -0,0 +1,17 @@
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="RegistryComponent2" />
+    </ComponentGroup>
+
+    <!-- <swid:Tag Regid="regid.1995-08.com.example" /> -->
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
new file mode 100644
index 00000000..9ceda117
--- /dev/null
+++ b/src/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -0,0 +1,10 @@
+<!-- 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="WixToolset.Sdk">
+  <Import Project="..\PackageAv1\PackageA.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/PatchA/PatchA.wixproj b/src/TestData/PatchTests/PatchA/PatchA.wixproj
new file mode 100644
index 00000000..da9acb5e
--- /dev/null
+++ b/src/TestData/PatchTests/PatchA/PatchA.wixproj
@@ -0,0 +1,12 @@
+<!-- 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="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>PatchCreation</OutputType>
+    <TargetExt>.msp</TargetExt>
+    <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/PatchA/PatchA.wxs b/src/TestData/PatchTests/PatchA/PatchA.wxs
new file mode 100644
index 00000000..067f25ca
--- /dev/null
+++ b/src/TestData/PatchTests/PatchA/PatchA.wxs
@@ -0,0 +1,24 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch A in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchA" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchA"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
+          <!-- <swid:TagRef Regid="regid.1995-08.com.example" /> -->
+
+          <ComponentRef Id="RegistryComponent"/>
+          <PropertyRef Id="TestVersion"/>
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/TestData/PatchTests/PatchA2/PatchA2.wixproj b/src/TestData/PatchTests/PatchA2/PatchA2.wixproj
new file mode 100644
index 00000000..da9acb5e
--- /dev/null
+++ b/src/TestData/PatchTests/PatchA2/PatchA2.wixproj
@@ -0,0 +1,12 @@
+<!-- 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="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>PatchCreation</OutputType>
+    <TargetExt>.msp</TargetExt>
+    <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PatchTests/PatchA2/PatchA2.wxs b/src/TestData/PatchTests/PatchA2/PatchA2.wxs
new file mode 100644
index 00000000..a06401cc
--- /dev/null
+++ b/src/TestData/PatchTests/PatchA2/PatchA2.wxs
@@ -0,0 +1,23 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch A2 in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A2" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchA2" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchA2"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="A2" Version="$(var.Version)" Supersede="yes">
+          <!-- <swid:TagRef Regid="regid.1995-08.com.example" /> -->
+
+          <ComponentRef Id="RegistryComponent2"/>
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index 5522b9a3..4923e1aa 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -6,8 +6,12 @@
 <?define Version = 1.0.0.0?>
 <?endif?>
 
+<?ifndef ProductCode?>
+<?define ProductCode = *?>
+<?endif?>
+
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
@@ -20,6 +24,9 @@
     <Feature Id="Complete" Level="1">
       <ComponentRef Id="FileComponent" />
       <ComponentRef Id="RegistryComponent" />
+      <?ifdef var.ProductComponents?>
+      <ComponentGroupRef Id="ProductComponents" />
+      <?endif?>
     </Feature>
   </Package>