aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/PatchTests
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
commitdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch)
tree80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/PatchTests
parentaaae65d07ce2a78592fc533701975cc576341a46 (diff)
parentd8e47230e094a506406a83eb78916abf2668b29c (diff)
downloadwix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/PatchTests')
-rw-r--r--src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj19
-rw-r--r--src/test/burn/TestData/PatchTests/BundleA/BundleA.wxs9
-rw-r--r--src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj19
-rw-r--r--src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs9
-rw-r--r--src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj20
-rw-r--r--src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs10
-rw-r--r--src/test/burn/TestData/PatchTests/PackageAv1/PackageA.props13
-rw-r--r--src/test/burn/TestData/PatchTests/PackageAv1/PackageAv1.wixproj4
-rw-r--r--src/test/burn/TestData/PatchTests/PackageAv1/ProductComponents.wxs15
-rw-r--r--src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj10
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj12
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs24
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj12
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs23
14 files changed, 199 insertions, 0 deletions
diff --git a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..72419d2d
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj
@@ -0,0 +1,19 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <IncludeSoftwareTag>true</IncludeSoftwareTag>
6 <UpgradeCode>{486FC795-69A5-4130-8727-4068F645A0A1}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </ItemGroup>
15 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
17 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
18 </ItemGroup>
19</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..e3e0f4d7
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wxs
@@ -0,0 +1,9 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
7 </PackageGroup>
8 </Fragment>
9</Wix>
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
new file mode 100644
index 00000000..a506e843
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -0,0 +1,19 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <IncludeSoftwareTag>true</IncludeSoftwareTag>
6 <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </ItemGroup>
15 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
17 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
18 </ItemGroup>
19</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
new file mode 100644
index 00000000..bf0c0451
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wxs
@@ -0,0 +1,9 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
7 </PackageGroup>
8 </Fragment>
9</Wix>
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
new file mode 100644
index 00000000..9a022091
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
@@ -0,0 +1,20 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <IncludeSoftwareTag>true</IncludeSoftwareTag>
6 <UpgradeCode>{1BE09331-2327-4534-9223-59B54EFAE7A5}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
13 <ProjectReference Include="..\PatchA2\PatchA2.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
19 </ItemGroup>
20</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
new file mode 100644
index 00000000..24063db3
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wxs
@@ -0,0 +1,10 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes" />
7 <MspPackage Id="PatchA2" SourceFile="$(var.PatchA2.TargetPath)" PerMachine="yes" />
8 </PackageGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/burn/TestData/PatchTests/PackageAv1/PackageA.props b/src/test/burn/TestData/PatchTests/PackageAv1/PackageA.props
new file mode 100644
index 00000000..a9d9b981
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PackageAv1/PackageA.props
@@ -0,0 +1,13 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <PackageName>PackageA</PackageName>
5 <ProductComponentsRef>true</ProductComponentsRef>
6 <ProductCode>{724F9BA5-DD9D-4851-855E-ECC35B27BF11}</ProductCode>
7 <IncludeSoftwareTag>true</IncludeSoftwareTag>
8 <UpgradeCode>{C56DA396-7A9A-4177-8264-638161CE9EB8}</UpgradeCode>
9 </PropertyGroup>
10 <ItemGroup>
11 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
12 </ItemGroup>
13</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/PatchTests/PackageAv1/PackageAv1.wixproj
new file mode 100644
index 00000000..45d3b2c8
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PackageAv1/PackageAv1.wixproj
@@ -0,0 +1,4 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="PackageA.props" />
4</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/PackageAv1/ProductComponents.wxs b/src/test/burn/TestData/PatchTests/PackageAv1/ProductComponents.wxs
new file mode 100644
index 00000000..72b5d4bd
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PackageAv1/ProductComponents.wxs
@@ -0,0 +1,15 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents">
6 <ComponentRef Id="RegistryComponent2" />
7 </ComponentGroup>
8 </Fragment>
9
10 <Fragment>
11 <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
12 <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" />
13 </Component>
14 </Fragment>
15</Wix>
diff --git a/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
new file mode 100644
index 00000000..9ceda117
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -0,0 +1,10 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 <Version>1.0.1.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj
new file mode 100644
index 00000000..da9acb5e
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wixproj
@@ -0,0 +1,12 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>PatchCreation</OutputType>
5 <TargetExt>.msp</TargetExt>
6 <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
10 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
11 </ItemGroup>
12</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
new file mode 100644
index 00000000..ba961762
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
@@ -0,0 +1,24 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Patch AllowRemoval="yes" Classification="Update" Description="Patch A in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
9 <Media Id="100" Cabinet="PatchA" EmbedCab="yes">
10 <PatchBaseline
11 Id="PatchA"
12 BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
13 UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
14 />
15 </Media>
16
17 <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19
20 <ComponentRef Id="RegistryComponent"/>
21 <PropertyRef Id="TestVersion"/>
22 </PatchFamily>
23 </Patch>
24</Wix>
diff --git a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj
new file mode 100644
index 00000000..da9acb5e
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj
@@ -0,0 +1,12 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>PatchCreation</OutputType>
5 <TargetExt>.msp</TargetExt>
6 <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
10 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
11 </ItemGroup>
12</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
new file mode 100644
index 00000000..e2aa3e2b
--- /dev/null
+++ b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
@@ -0,0 +1,23 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Patch AllowRemoval="yes" Classification="Update" Description="Patch A2 in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A2" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
9 <Media Id="100" Cabinet="PatchA2" EmbedCab="yes">
10 <PatchBaseline
11 Id="PatchA2"
12 BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
13 UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
14 />
15 </Media>
16
17 <PatchFamily Id="A2" Version="$(var.Version)" Supersede="yes">
18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19
20 <ComponentRef Id="RegistryComponent2"/>
21 </PatchFamily>
22 </Patch>
23</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-09 15:19:22 +0000