1 files changed, 0 insertions, 131 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
deleted file mode 100644
index a566b490..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// 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",
-                    "-sw1151", // this is expected for this test
-                    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",
-                    "-sw1151", // this is expected for this test
-                    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", "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", "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", "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", "SecondX64.msi"),
-            });
-            result.AssertSuccess();
-        }
-    }
-}

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