diff options
Diffstat (limited to 'src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs')
-rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 484e5dc1..428cfc3e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs | |||
@@ -248,7 +248,6 @@ namespace WixToolsetTest.CoreIntegration | |||
248 | public void CanBuildWithExtensionUsingWixlib() | 248 | public void CanBuildWithExtensionUsingWixlib() |
249 | { | 249 | { |
250 | var folder = TestData.Get(@"TestData\ExampleExtension"); | 250 | var folder = TestData.Get(@"TestData\ExampleExtension"); |
251 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
252 | 251 | ||
253 | using (var fs = new DisposableFileSystem()) | 252 | using (var fs = new DisposableFileSystem()) |
254 | { | 253 | { |
@@ -259,7 +258,7 @@ namespace WixToolsetTest.CoreIntegration | |||
259 | { | 258 | { |
260 | "build", | 259 | "build", |
261 | Path.Combine(folder, "PackageComponents.wxs"), | 260 | Path.Combine(folder, "PackageComponents.wxs"), |
262 | "-ext", extensionPath, | 261 | "-ext", ExtensionPaths.ExampleExtensionPath, |
263 | "-intermediateFolder", intermediateFolder, | 262 | "-intermediateFolder", intermediateFolder, |
264 | "-o", Path.Combine(intermediateFolder, @"test.wixlib") | 263 | "-o", Path.Combine(intermediateFolder, @"test.wixlib") |
265 | }); | 264 | }); |
@@ -272,7 +271,7 @@ namespace WixToolsetTest.CoreIntegration | |||
272 | Path.Combine(folder, "Package.wxs"), | 271 | Path.Combine(folder, "Package.wxs"), |
273 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 272 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
274 | "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), | 273 | "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), |
275 | "-ext", extensionPath, | 274 | "-ext", ExtensionPaths.ExampleExtensionPath, |
276 | "-bindpath", Path.Combine(folder, "data"), | 275 | "-bindpath", Path.Combine(folder, "data"), |
277 | "-intermediateFolder", intermediateFolder, | 276 | "-intermediateFolder", intermediateFolder, |
278 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") | 277 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") |
@@ -297,7 +296,6 @@ namespace WixToolsetTest.CoreIntegration | |||
297 | public void CanBuildWithExtensionUsingMultipleWixlibs() | 296 | public void CanBuildWithExtensionUsingMultipleWixlibs() |
298 | { | 297 | { |
299 | var folder = TestData.Get(@"TestData\ComplexExampleExtension"); | 298 | var folder = TestData.Get(@"TestData\ComplexExampleExtension"); |
300 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
301 | 299 | ||
302 | using (var fs = new DisposableFileSystem()) | 300 | using (var fs = new DisposableFileSystem()) |
303 | { | 301 | { |
@@ -308,7 +306,7 @@ namespace WixToolsetTest.CoreIntegration | |||
308 | { | 306 | { |
309 | "build", | 307 | "build", |
310 | Path.Combine(folder, "PackageComponents.wxs"), | 308 | Path.Combine(folder, "PackageComponents.wxs"), |
311 | "-ext", extensionPath, | 309 | "-ext", ExtensionPaths.ExampleExtensionPath, |
312 | "-intermediateFolder", intermediateFolder, | 310 | "-intermediateFolder", intermediateFolder, |
313 | "-o", Path.Combine(intermediateFolder, @"components.wixlib") | 311 | "-o", Path.Combine(intermediateFolder, @"components.wixlib") |
314 | }); | 312 | }); |
@@ -319,7 +317,7 @@ namespace WixToolsetTest.CoreIntegration | |||
319 | { | 317 | { |
320 | "build", | 318 | "build", |
321 | Path.Combine(folder, "OtherComponents.wxs"), | 319 | Path.Combine(folder, "OtherComponents.wxs"), |
322 | "-ext", extensionPath, | 320 | "-ext", ExtensionPaths.ExampleExtensionPath, |
323 | "-intermediateFolder", intermediateFolder, | 321 | "-intermediateFolder", intermediateFolder, |
324 | "-o", Path.Combine(intermediateFolder, @"other.wixlib") | 322 | "-o", Path.Combine(intermediateFolder, @"other.wixlib") |
325 | }); | 323 | }); |
@@ -333,7 +331,7 @@ namespace WixToolsetTest.CoreIntegration | |||
333 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 331 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
334 | "-lib", Path.Combine(intermediateFolder, @"components.wixlib"), | 332 | "-lib", Path.Combine(intermediateFolder, @"components.wixlib"), |
335 | "-lib", Path.Combine(intermediateFolder, @"other.wixlib"), | 333 | "-lib", Path.Combine(intermediateFolder, @"other.wixlib"), |
336 | "-ext", extensionPath, | 334 | "-ext", ExtensionPaths.ExampleExtensionPath, |
337 | "-bindpath", Path.Combine(folder, "data"), | 335 | "-bindpath", Path.Combine(folder, "data"), |
338 | "-intermediateFolder", intermediateFolder, | 336 | "-intermediateFolder", intermediateFolder, |
339 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") | 337 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") |