diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 12 | ||||
| -rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index bb3b7b35..4c01a78f 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |||
| @@ -24,7 +24,7 @@ namespace WixToolsetTest.Netfx | |||
| 24 | var extensionResult = WixRunner.Execute(new[] | 24 | var extensionResult = WixRunner.Execute(new[] |
| 25 | { | 25 | { |
| 26 | "extension", "add", | 26 | "extension", "add", |
| 27 | "WixToolset.Bal.wixext" | 27 | "WixToolset.Bal.wixext/4.0.0" |
| 28 | }); | 28 | }); |
| 29 | 29 | ||
| 30 | var compileResult = WixRunner.Execute(new[] | 30 | var compileResult = WixRunner.Execute(new[] |
| @@ -33,7 +33,7 @@ namespace WixToolsetTest.Netfx | |||
| 33 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), | 33 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), |
| 34 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), | 34 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), |
| 35 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), | 35 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), |
| 36 | "-ext", "WixToolset.Bal.wixext", | 36 | "-ext", "WixToolset.Bal.wixext/4.0.0", |
| 37 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 37 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
| 38 | "-intermediateFolder", intermediateFolder, | 38 | "-intermediateFolder", intermediateFolder, |
| 39 | "-o", bundleFile, | 39 | "-o", bundleFile, |
| @@ -57,7 +57,7 @@ namespace WixToolsetTest.Netfx | |||
| 57 | var extensionResult = WixRunner.Execute(new[] | 57 | var extensionResult = WixRunner.Execute(new[] |
| 58 | { | 58 | { |
| 59 | "extension", "add", | 59 | "extension", "add", |
| 60 | "WixToolset.Bal.wixext" | 60 | "WixToolset.Bal.wixext/4.0.0" |
| 61 | }); | 61 | }); |
| 62 | 62 | ||
| 63 | var compileResult = WixRunner.Execute(new[] | 63 | var compileResult = WixRunner.Execute(new[] |
| @@ -65,7 +65,7 @@ namespace WixToolsetTest.Netfx | |||
| 65 | "build", | 65 | "build", |
| 66 | Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), | 66 | Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), |
| 67 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), | 67 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), |
| 68 | "-ext", "WixToolset.Bal.wixext", | 68 | "-ext", "WixToolset.Bal.wixext/4.0.0", |
| 69 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 69 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
| 70 | "-intermediateFolder", intermediateFolder, | 70 | "-intermediateFolder", intermediateFolder, |
| 71 | "-o", bundleFile, | 71 | "-o", bundleFile, |
| @@ -89,14 +89,14 @@ namespace WixToolsetTest.Netfx | |||
| 89 | var extensionResult = WixRunner.Execute(new[] | 89 | var extensionResult = WixRunner.Execute(new[] |
| 90 | { | 90 | { |
| 91 | "extension", "add", | 91 | "extension", "add", |
| 92 | "WixToolset.Bal.wixext" | 92 | "WixToolset.Bal.wixext/4.0.0" |
| 93 | }); | 93 | }); |
| 94 | 94 | ||
| 95 | var compileResult = WixRunner.Execute(new[] | 95 | var compileResult = WixRunner.Execute(new[] |
| 96 | { | 96 | { |
| 97 | "build", | 97 | "build", |
| 98 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), | 98 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), |
| 99 | "-ext", "WixToolset.Bal.wixext", | 99 | "-ext", "WixToolset.Bal.wixext/4.0.0", |
| 100 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 100 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
| 101 | "-intermediateFolder", intermediateFolder, | 101 | "-intermediateFolder", intermediateFolder, |
| 102 | "-o", bundleFile, | 102 | "-o", bundleFile, |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index 710f3b8d..0731700b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |||
| @@ -231,7 +231,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | [Fact] | 234 | [Fact(Skip = "Blocked by issue #8033.")] |
| 235 | public void CanManipulateExtensionCache() | 235 | public void CanManipulateExtensionCache() |
| 236 | { | 236 | { |
| 237 | var currentFolder = Environment.CurrentDirectory; | 237 | var currentFolder = Environment.CurrentDirectory; |
