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/RollbackBoundaryTests
parent: aaae65d07ce2a78592fc533701975cc576341a46 (diff)
parent: d8e47230e094a506406a83eb78916abf2668b29c (diff)
download: wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
6 files changed, 74 insertions, 0 deletions
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..648cc934
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
@@ -0,0 +1,20 @@
+<!-- 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>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</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="..\PackageC\PackageC.wixproj" />
+    <ProjectReference Include="..\PackageF\PackageF.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..795dc13a
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
@@ -0,0 +1,15 @@
+<!-- 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="PackageC" SourceFile="$(var.PackageC.TargetPath)" Permanent="yes" /> <!-- TODO: this is a workaround for inability to specify RollbackBoundary as first package, remove when this is fixed -->
+      <RollbackBoundary Id="nonvital" Vital="no" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Permanent="yes" />
+      <RollbackBoundary />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" Permanent="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..25d9e279
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/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>{14A06CEA-CC9E-478F-AD20-5C9624827090}</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/RollbackBoundaryTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..2dc4f3a6
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/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>{C0B6E75E-4378-4589-B3C5-A23FFA39F59B}</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/RollbackBoundaryTests/PackageC/PackageC.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj
new file mode 100644
index 00000000..a4b5134b
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageC/PackageC.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>{1C977E8F-4E79-4E3B-A5B1-C4B0BE774041}</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/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
new file mode 100644
index 00000000..071c40a0
--- /dev/null
+++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.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>
+    <UpgradeCode>{E348D377-E5E7-44B0-897E-5DC8D401BF80}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" />
+  </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/RollbackBoundaryTests
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/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..648cc934 --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.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	<BA>hyperlinkLicense</BA>
	6	<UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</UpgradeCode>
	7	</PropertyGroup>
	8	<ItemGroup>
	9	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	10	</ItemGroup>
	11	<ItemGroup>
	12	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	13	<ProjectReference Include="..\PackageB\PackageB.wixproj" />
	14	<ProjectReference Include="..\PackageC\PackageC.wixproj" />
	15	<ProjectReference Include="..\PackageF\PackageF.wixproj" />
	16	</ItemGroup>
	17	<ItemGroup>
	18	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	19	</ItemGroup>
	20	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..795dc13a --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.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
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Permanent="yes" /> <!-- TODO: this is a workaround for inability to specify RollbackBoundary as first package, remove when this is fixed -->
	8	<RollbackBoundary Id="nonvital" Vital="no" />
	9	<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
	10	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Permanent="yes" />
	11	<RollbackBoundary />
	12	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" Permanent="yes" />
	13	</PackageGroup>
	14	</Fragment>
	15	</Wix>


diff --git a/src/test/burn/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..25d9e279 --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/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>{14A06CEA-CC9E-478F-AD20-5C9624827090}</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/RollbackBoundaryTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj new file mode 100644 index 00000000..2dc4f3a6 --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/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>{C0B6E75E-4378-4589-B3C5-A23FFA39F59B}</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/RollbackBoundaryTests/PackageC/PackageC.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj new file mode 100644 index 00000000..a4b5134b --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageC/PackageC.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>{1C977E8F-4E79-4E3B-A5B1-C4B0BE774041}</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/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj new file mode 100644 index 00000000..071c40a0 --- /dev/null +++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.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	<UpgradeCode>{E348D377-E5E7-44B0-897E-5DC8D401BF80}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
	8	</ItemGroup>
	9	<ItemGroup>
	10	<PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" />
	11	</ItemGroup>
	12	</Project> \ No newline at end of file