MSI transaction cleanup.

author: Sean Hall <r.sean.hall@gmail.com> 2020-12-02 14:33:15 -0600
committer: Sean Hall <r.sean.hall@gmail.com> 2020-12-02 14:52:55 -0600
commit: 5a874790ba9ec6c2d3c9002699114c2fe4c493ae (patch)
tree: 4baa88262fbae45446363baf174d54a6877a9a9e /src/test
parent: 2a8f47e357bfbfe20c962cade4455793e45dae7c (diff)
download: wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.tar.gz
wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.tar.bz2
wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.zip
8 files changed, 191 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
new file mode 100644
index 00000000..5a29eb9e
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
@@ -0,0 +1,129 @@
+// 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.IO;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using Xunit;
+    public class MsiTransactionFixture
+    {
+        [Fact]
+        public void CantBuildX64AfterX86Bundle()
+        {
+            var folder = TestData.Get(@"TestData");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var exePath = Path.Combine(binFolder, "test.exe");
+                BuildMsiPackages(folder, intermediateFolder, binFolder);
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "MsiTransaction", "X64AfterX86Bundle.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", binFolder,
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", exePath,
+                });
+                Assert.Equal(390, result.ExitCode);
+            }
+        }
+        [Fact]
+        public void CanBuildX86AfterX64Bundle()
+        {
+            var folder = TestData.Get(@"TestData");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var exePath = Path.Combine(binFolder, "test.exe");
+                BuildMsiPackages(folder, intermediateFolder, binFolder);
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "MsiTransaction", "X86AfterX64Bundle.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", binFolder,
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", exePath,
+                });
+                result.AssertSuccess();
+                Assert.True(File.Exists(exePath));
+            }
+        }
+        private static void BuildMsiPackages(string folder, string intermediateFolder, string binFolder)
+        {
+            var result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(folder, "MsiTransaction", "FirstX86.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                "-intermediateFolder", intermediateFolder,
+                "-o", Path.Combine(binFolder, "FirstX86.msi"),
+            });
+            result.AssertSuccess();
+            result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(folder, "MsiTransaction", "SecondX86.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                "-intermediateFolder", intermediateFolder,
+                "-o", Path.Combine(binFolder, "SecondX86.msi"),
+            });
+            result.AssertSuccess();
+            result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(folder, "MsiTransaction", "FirstX64.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                "-intermediateFolder", intermediateFolder,
+                "-arch", "x64",
+                "-o", Path.Combine(binFolder, "FirstX64.msi"),
+            });
+            result.AssertSuccess();
+            result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(folder, "MsiTransaction", "SecondX64.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                "-intermediateFolder", intermediateFolder,
+                "-arch", "x64",
+                "-o", Path.Combine(binFolder, "SecondX64.msi"),
+            });
+            result.AssertSuccess();
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs
new file mode 100644
index 00000000..e72b6402
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs
new file mode 100644
index 00000000..e72b6402
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs
new file mode 100644
index 00000000..e72b6402
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs
new file mode 100644
index 00000000..e72b6402
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs
new file mode 100644
index 00000000..8f4fc8bd
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsiPackage SourceFile="FirstX64.msi" />
+            <RollbackBoundary Transaction="yes" />
+            <MsiPackage SourceFile="FirstX86.msi" />
+            <MsiPackage SourceFile="SecondX86.msi" />
+            <MsiPackage SourceFile="SecondX64.msi" />
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs
new file mode 100644
index 00000000..221f06c5
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsiPackage SourceFile="FirstX86.msi" />
+            <RollbackBoundary Transaction="yes" />
+            <MsiPackage SourceFile="FirstX64.msi" />
+            <MsiPackage SourceFile="SecondX64.msi" />
+            <MsiPackage SourceFile="SecondX86.msi" />
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index fdb56987..8e5a005c 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -64,6 +64,12 @@
    <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\MsiTransaction\FirstX64.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MsiTransaction\FirstX86.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MsiTransaction\SecondX64.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MsiTransaction\SecondX86.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MsiTransaction\X64AfterX86Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MsiTransaction\X86AfterX64Bundle.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" />
author	Sean Hall <r.sean.hall@gmail.com>	2020-12-02 14:33:15 -0600
committer	Sean Hall <r.sean.hall@gmail.com>	2020-12-02 14:52:55 -0600
commit	5a874790ba9ec6c2d3c9002699114c2fe4c493ae (patch)
tree	4baa88262fbae45446363baf174d54a6877a9a9e /src/test
parent	2a8f47e357bfbfe20c962cade4455793e45dae7c (diff)
download	wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.tar.gz wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.tar.bz2 wix-5a874790ba9ec6c2d3c9002699114c2fe4c493ae.zip

diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs new file mode 100644 index 00000000..5a29eb9e --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
@@ -0,0 +1,129 @@
		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	namespace WixToolsetTest.CoreIntegration
		4	{
		5	using System.IO;
		6	using WixBuildTools.TestSupport;
		7	using WixToolset.Core.TestPackage;
		8	using Xunit;
		9
		10	public class MsiTransactionFixture
		11	{
		12	[Fact]
		13	public void CantBuildX64AfterX86Bundle()
		14	{
		15	var folder = TestData.Get(@"TestData");
		16
		17	using (var fs = new DisposableFileSystem())
		18	{
		19	var baseFolder = fs.GetFolder();
		20	var intermediateFolder = Path.Combine(baseFolder, "obj");
		21	var binFolder = Path.Combine(baseFolder, "bin");
		22	var exePath = Path.Combine(binFolder, "test.exe");
		23
		24	BuildMsiPackages(folder, intermediateFolder, binFolder);
		25
		26	var result = WixRunner.Execute(new[]
		27	{
		28	"build",
		29	Path.Combine(folder, "MsiTransaction", "X64AfterX86Bundle.wxs"),
		30	Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
		31	"-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
		32	"-bindpath", binFolder,
		33	"-intermediateFolder", intermediateFolder,
		34	"-o", exePath,
		35	});
		36
		37	Assert.Equal(390, result.ExitCode);
		38	}
		39	}
		40
		41	[Fact]
		42	public void CanBuildX86AfterX64Bundle()
		43	{
		44	var folder = TestData.Get(@"TestData");
		45
		46	using (var fs = new DisposableFileSystem())
		47	{
		48	var baseFolder = fs.GetFolder();
		49	var intermediateFolder = Path.Combine(baseFolder, "obj");
		50	var binFolder = Path.Combine(baseFolder, "bin");
		51	var exePath = Path.Combine(binFolder, "test.exe");
		52
		53	BuildMsiPackages(folder, intermediateFolder, binFolder);
		54
		55	var result = WixRunner.Execute(new[]
		56	{
		57	"build",
		58	Path.Combine(folder, "MsiTransaction", "X86AfterX64Bundle.wxs"),
		59	Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
		60	"-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
		61	"-bindpath", binFolder,
		62	"-intermediateFolder", intermediateFolder,
		63	"-o", exePath,
		64	});
		65
		66	result.AssertSuccess();
		67
		68	Assert.True(File.Exists(exePath));
		69	}
		70	}
		71
		72	private static void BuildMsiPackages(string folder, string intermediateFolder, string binFolder)
		73	{
		74	var result = WixRunner.Execute(new[]
		75	{
		76	"build",
		77	Path.Combine(folder, "MsiTransaction", "FirstX86.wxs"),
		78	Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
		79	Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
		80	"-bindpath", Path.Combine(folder, "SingleFile", "data"),
		81	"-intermediateFolder", intermediateFolder,
		82	"-o", Path.Combine(binFolder, "FirstX86.msi"),
		83	});
		84
		85	result.AssertSuccess();
		86
		87	result = WixRunner.Execute(new[]
		88	{
		89	"build",
		90	Path.Combine(folder, "MsiTransaction", "SecondX86.wxs"),
		91	Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
		92	Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
		93	"-bindpath", Path.Combine(folder, "SingleFile", "data"),
		94	"-intermediateFolder", intermediateFolder,
		95	"-o", Path.Combine(binFolder, "SecondX86.msi"),
		96	});
		97
		98	result.AssertSuccess();
		99
		100	result = WixRunner.Execute(new[]
		101	{
		102	"build",
		103	Path.Combine(folder, "MsiTransaction", "FirstX64.wxs"),
		104	Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
		105	Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
		106	"-bindpath", Path.Combine(folder, "SingleFile", "data"),
		107	"-intermediateFolder", intermediateFolder,
		108	"-arch", "x64",
		109	"-o", Path.Combine(binFolder, "FirstX64.msi"),
		110	});
		111
		112	result.AssertSuccess();
		113
		114	result = WixRunner.Execute(new[]
		115	{
		116	"build",
		117	Path.Combine(folder, "MsiTransaction", "SecondX64.wxs"),
		118	Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
		119	Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
		120	"-bindpath", Path.Combine(folder, "SingleFile", "data"),
		121	"-intermediateFolder", intermediateFolder,
		122	"-arch", "x64",
		123	"-o", Path.Combine(binFolder, "SecondX64.msi"),
		124	});
		125
		126	result.AssertSuccess();
		127	}
		128	}
		129	}


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs new file mode 100644 index 00000000..e72b6402 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs
@@ -0,0 +1,8 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<ComponentGroup Id="ProductComponents">
		5	<ComponentGroupRef Id="MinimalComponentGroup" />
		6	</ComponentGroup>
		7	</Fragment>
		8	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs new file mode 100644 index 00000000..e72b6402 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs
@@ -0,0 +1,8 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<ComponentGroup Id="ProductComponents">
		5	<ComponentGroupRef Id="MinimalComponentGroup" />
		6	</ComponentGroup>
		7	</Fragment>
		8	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs new file mode 100644 index 00000000..e72b6402 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs
@@ -0,0 +1,8 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<ComponentGroup Id="ProductComponents">
		5	<ComponentGroupRef Id="MinimalComponentGroup" />
		6	</ComponentGroup>
		7	</Fragment>
		8	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs new file mode 100644 index 00000000..e72b6402 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs
@@ -0,0 +1,8 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<ComponentGroup Id="ProductComponents">
		5	<ComponentGroupRef Id="MinimalComponentGroup" />
		6	</ComponentGroup>
		7	</Fragment>
		8	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs new file mode 100644 index 00000000..8f4fc8bd --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs
@@ -0,0 +1,12 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<MsiPackage SourceFile="FirstX64.msi" />
		6	<RollbackBoundary Transaction="yes" />
		7	<MsiPackage SourceFile="FirstX86.msi" />
		8	<MsiPackage SourceFile="SecondX86.msi" />
		9	<MsiPackage SourceFile="SecondX64.msi" />
		10	</PackageGroup>
		11	</Fragment>
		12	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs new file mode 100644 index 00000000..221f06c5 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs
@@ -0,0 +1,12 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<MsiPackage SourceFile="FirstX86.msi" />
		6	<RollbackBoundary Transaction="yes" />
		7	<MsiPackage SourceFile="FirstX64.msi" />
		8	<MsiPackage SourceFile="SecondX64.msi" />
		9	<MsiPackage SourceFile="SecondX86.msi" />
		10	</PackageGroup>
		11	</Fragment>
		12	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index fdb56987..8e5a005c 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -64,6 +64,12 @@
64	<Content Include="TestData\Font\TrueType.wxs" CopyToOutputDirectory="PreserveNewest" />	64	<Content Include="TestData\Font\TrueType.wxs" CopyToOutputDirectory="PreserveNewest" />
65	<Content Include="TestData\Icon\SampleIcon.wxs" CopyToOutputDirectory="PreserveNewest" />	65	<Content Include="TestData\Icon\SampleIcon.wxs" CopyToOutputDirectory="PreserveNewest" />
66	<Content Include="TestData\LockPermissions\EmptyPermissions.wxs" CopyToOutputDirectory="PreserveNewest" />	66	<Content Include="TestData\LockPermissions\EmptyPermissions.wxs" CopyToOutputDirectory="PreserveNewest" />
		67	<Content Include="TestData\MsiTransaction\FirstX64.wxs" CopyToOutputDirectory="PreserveNewest" />
		68	<Content Include="TestData\MsiTransaction\FirstX86.wxs" CopyToOutputDirectory="PreserveNewest" />
		69	<Content Include="TestData\MsiTransaction\SecondX64.wxs" CopyToOutputDirectory="PreserveNewest" />
		70	<Content Include="TestData\MsiTransaction\SecondX86.wxs" CopyToOutputDirectory="PreserveNewest" />
		71	<Content Include="TestData\MsiTransaction\X64AfterX86Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
		72	<Content Include="TestData\MsiTransaction\X86AfterX64Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
67	<Content Include="TestData\PatchFamilyFilter\.data\Av1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />	73	<Content Include="TestData\PatchFamilyFilter\.data\Av1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />
68	<Content Include="TestData\PatchFamilyFilter\.data\Av1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />	74	<Content Include="TestData\PatchFamilyFilter\.data\Av1.0.1.txt" CopyToOutputDirectory="PreserveNewest" />
69	<Content Include="TestData\PatchFamilyFilter\.data\Bv1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />	75	<Content Include="TestData\PatchFamilyFilter\.data\Bv1.0.0.txt" CopyToOutputDirectory="PreserveNewest" />