Merge Integration

author: Rob Mensching <rob@firegiant.com> 2021-05-11 09:14:53 -0700
committer: Rob Mensching <rob@firegiant.com> 2021-05-11 09:14:53 -0700
commit: dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch)
tree: 80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/FailureTests
parent: aaae65d07ce2a78592fc533701975cc576341a46 (diff)
parent: d8e47230e094a506406a83eb78916abf2668b29c (diff)
download: wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
8 files changed, 120 insertions, 0 deletions
diff --git a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..321f139c
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleA/BundleA.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>{FE5197EB-E324-411E-B3AC-760E566E1000}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wxs b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..95e714ec
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
new file mode 100644
index 00000000..ea3d029e
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
@@ -0,0 +1,26 @@
+<!-- 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:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+    <!-- ParallelCache="yes" should be the only thing different from the template -->
+    <Chain ParallelCache="yes">
+      <PackageGroupRef Id="TestBA" />
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..1a5d5837
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
@@ -0,0 +1,16 @@
+<!-- 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>{C60B9483-CE87-4FDA-AE5A-B39A52E956E8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..60bd5ef7
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.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>{9E9964D0-2120-4358-8136-D4A8727E0C59}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wxs b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wxs
new file mode 100644
index 00000000..48c4ab72
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Name="MissingNonVital.msi" Vital="no" Compressed="no" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..3b0e74e2
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{82FB39B2-56FA-4631-AA03-8B8D3215E6AE}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..96f7a031
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{94160B95-81DD-4DAB-AE2D-246A9E3A108E}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
author	Rob Mensching <rob@firegiant.com>	2021-05-11 09:14:53 -0700
committer	Rob Mensching <rob@firegiant.com>	2021-05-11 09:14:53 -0700
commit	dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch)
tree	80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/FailureTests
parent	aaae65d07ce2a78592fc533701975cc576341a46 (diff)
parent	d8e47230e094a506406a83eb78916abf2668b29c (diff)
download	wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2 wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip

diff --git a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..321f139c --- /dev/null +++ b/src/test/burn/TestData/FailureTests/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	<UpgradeCode>{FE5197EB-E324-411E-B3AC-760E566E1000}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	9	</ItemGroup>
	10	<ItemGroup>
	11	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	12	<ProjectReference Include="..\PackageB\PackageB.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/FailureTests/BundleA/BundleA.wxs b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..95e714ec --- /dev/null +++ b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wxs
@@ -0,0 +1,11 @@
	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
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
	8	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
	9	</PackageGroup>
	10	</Fragment>
	11	</Wix>


diff --git a/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs new file mode 100644 index 00000000..ea3d029e --- /dev/null +++ b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
@@ -0,0 +1,26 @@
	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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
	8	<Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
	9	<Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
	10
	11	<Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
	12
	13	<!-- ParallelCache="yes" should be the only thing different from the template -->
	14	<Chain ParallelCache="yes">
	15	<PackageGroupRef Id="TestBA" />
	16
	17	<PackageGroupRef Id="BundlePackages" />
	18	</Chain>
	19	</Bundle>
	20	<Fragment>
	21	<PackageGroup Id="BundlePackages">
	22	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
	23	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
	24	</PackageGroup>
	25	</Fragment>
	26	</Wix>


diff --git a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj new file mode 100644 index 00000000..1a5d5837 --- /dev/null +++ b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
@@ -0,0 +1,16 @@
	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	<UpgradeCode>{C60B9483-CE87-4FDA-AE5A-B39A52E956E8}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	9	<ProjectReference Include="..\PackageB\PackageB.wixproj" />
	10	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	11	</ItemGroup>
	12	<ItemGroup>
	13	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	14	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	15	</ItemGroup>
	16	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj new file mode 100644 index 00000000..60bd5ef7 --- /dev/null +++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.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	<UpgradeCode>{9E9964D0-2120-4358-8136-D4A8727E0C59}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	9	</ItemGroup>
	10	<ItemGroup>
	11	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	12	<ProjectReference Include="..\PackageB\PackageB.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/FailureTests/BundleC/BundleC.wxs b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wxs new file mode 100644 index 00000000..48c4ab72 --- /dev/null +++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wxs
@@ -0,0 +1,11 @@
	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
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Name="MissingNonVital.msi" Vital="no" Compressed="no" />
	8	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
	9	</PackageGroup>
	10	</Fragment>
	11	</Wix>


diff --git a/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..3b0e74e2 --- /dev/null +++ b/src/test/burn/TestData/FailureTests/PackageA/PackageA.wixproj
@@ -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	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<UpgradeCode>{82FB39B2-56FA-4631-AA03-8B8D3215E6AE}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	8	</ItemGroup>
	9	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj new file mode 100644 index 00000000..96f7a031 --- /dev/null +++ b/src/test/burn/TestData/FailureTests/PackageB/PackageB.wixproj
@@ -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	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<UpgradeCode>{94160B95-81DD-4DAB-AE2D-246A9E3A108E}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	8	</ItemGroup>
	9	</Project> \ No newline at end of file