diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 09:07:42 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 14:03:30 +1000 |
| commit | a75639ceaffcf5f56fa33094037bca86331d9ac0 (patch) | |
| tree | d34b808eeae67744d6f3065c4eba6ec5c5780644 /src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |
| parent | a74cbd658fb7bf904275ed5f27a7b15bedc18435 (diff) | |
| download | wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.tar.gz wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.tar.bz2 wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.zip | |
Use WixToolset.Burn package to get rid of -burnStubPath.
Stop using x86 stub for x64.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 6e66aa74..acddd2d5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |||
| @@ -19,7 +19,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 19 | [Fact] | 19 | [Fact] |
| 20 | public void CanBuildMultiFileBundle() | 20 | public void CanBuildMultiFileBundle() |
| 21 | { | 21 | { |
| 22 | var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); | ||
| 23 | var folder = TestData.Get(@"TestData\SimpleBundle"); | 22 | var folder = TestData.Get(@"TestData\SimpleBundle"); |
| 24 | 23 | ||
| 25 | using (var fs = new DisposableFileSystem()) | 24 | using (var fs = new DisposableFileSystem()) |
| @@ -35,7 +34,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 35 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), | 34 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), |
| 36 | "-bindpath", Path.Combine(folder, "data"), | 35 | "-bindpath", Path.Combine(folder, "data"), |
| 37 | "-intermediateFolder", intermediateFolder, | 36 | "-intermediateFolder", intermediateFolder, |
| 38 | "-burnStub", burnStubPath, | ||
| 39 | "-o", Path.Combine(baseFolder, @"bin\test.exe") | 37 | "-o", Path.Combine(baseFolder, @"bin\test.exe") |
| 40 | }); | 38 | }); |
| 41 | 39 | ||
| @@ -49,7 +47,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 49 | [Fact] | 47 | [Fact] |
| 50 | public void CanBuildSimpleBundle() | 48 | public void CanBuildSimpleBundle() |
| 51 | { | 49 | { |
| 52 | var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); | ||
| 53 | var folder = TestData.Get(@"TestData\SimpleBundle"); | 50 | var folder = TestData.Get(@"TestData\SimpleBundle"); |
| 54 | 51 | ||
| 55 | using (var fs = new DisposableFileSystem()) | 52 | using (var fs = new DisposableFileSystem()) |
| @@ -68,7 +65,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 68 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), | 65 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), |
| 69 | "-bindpath", Path.Combine(folder, "data"), | 66 | "-bindpath", Path.Combine(folder, "data"), |
| 70 | "-intermediateFolder", intermediateFolder, | 67 | "-intermediateFolder", intermediateFolder, |
| 71 | "-burnStub", burnStubPath, | ||
| 72 | "-o", exePath, | 68 | "-o", exePath, |
| 73 | }); | 69 | }); |
| 74 | 70 | ||
| @@ -113,7 +109,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 113 | [Fact] | 109 | [Fact] |
| 114 | public void CanBuildSimpleBundleUsingExtensionBA() | 110 | public void CanBuildSimpleBundleUsingExtensionBA() |
| 115 | { | 111 | { |
| 116 | var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); | ||
| 117 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | 112 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); |
| 118 | var folder = TestData.Get(@"TestData\SimpleBundle"); | 113 | var folder = TestData.Get(@"TestData\SimpleBundle"); |
| 119 | 114 | ||
| @@ -130,7 +125,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 130 | "-ext", extensionPath, | 125 | "-ext", extensionPath, |
| 131 | "-bindpath", Path.Combine(folder, "data"), | 126 | "-bindpath", Path.Combine(folder, "data"), |
| 132 | "-intermediateFolder", intermediateFolder, | 127 | "-intermediateFolder", intermediateFolder, |
| 133 | "-burnStub", burnStubPath, | ||
| 134 | "-o", Path.Combine(baseFolder, @"bin\test.exe") | 128 | "-o", Path.Combine(baseFolder, @"bin\test.exe") |
| 135 | }); | 129 | }); |
| 136 | 130 | ||
| @@ -144,7 +138,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 144 | [Fact] | 138 | [Fact] |
| 145 | public void CanBuildSingleExeBundle() | 139 | public void CanBuildSingleExeBundle() |
| 146 | { | 140 | { |
| 147 | var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); | ||
| 148 | var folder = TestData.Get(@"TestData"); | 141 | var folder = TestData.Get(@"TestData"); |
| 149 | 142 | ||
| 150 | using (var fs = new DisposableFileSystem()) | 143 | using (var fs = new DisposableFileSystem()) |
| @@ -161,7 +154,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 161 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), | 154 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), |
| 162 | "-bindpath", Path.Combine(folder, ".Data"), | 155 | "-bindpath", Path.Combine(folder, ".Data"), |
| 163 | "-intermediateFolder", intermediateFolder, | 156 | "-intermediateFolder", intermediateFolder, |
| 164 | "-burnStub", burnStubPath, | ||
| 165 | "-o", exePath, | 157 | "-o", exePath, |
| 166 | }); | 158 | }); |
| 167 | 159 | ||
| @@ -174,7 +166,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 174 | [Fact] | 166 | [Fact] |
| 175 | public void CanBuildSingleExeRemotePayloadBundle() | 167 | public void CanBuildSingleExeRemotePayloadBundle() |
| 176 | { | 168 | { |
| 177 | var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); | ||
| 178 | var folder = TestData.Get(@"TestData"); | 169 | var folder = TestData.Get(@"TestData"); |
| 179 | 170 | ||
| 180 | using (var fs = new DisposableFileSystem()) | 171 | using (var fs = new DisposableFileSystem()) |
| @@ -190,7 +181,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 190 | Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), | 181 | Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), |
| 191 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), | 182 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), |
| 192 | "-intermediateFolder", intermediateFolder, | 183 | "-intermediateFolder", intermediateFolder, |
| 193 | "-burnStub", burnStubPath, | ||
| 194 | "-o", exePath, | 184 | "-o", exePath, |
| 195 | }); | 185 | }); |
| 196 | 186 | ||
