diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-19 00:58:00 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-21 07:36:59 -0700 |
| commit | 2724cfee4c163f3297ee25edfd2372767cfd4945 (patch) | |
| tree | 8cdda34c83bea014a586a491e3b4b187ad8f16da /src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |
| parent | 4d40bef9cf51b8cff7e1f6a73fdf68b9722eb8a0 (diff) | |
| download | wix-2724cfee4c163f3297ee25edfd2372767cfd4945.tar.gz wix-2724cfee4c163f3297ee25edfd2372767cfd4945.tar.bz2 wix-2724cfee4c163f3297ee25edfd2372767cfd4945.zip | |
Move tool projects to Tools repo
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index 5de61368..cc631c22 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |||
| @@ -8,6 +8,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 8 | using Example.Extension; | 8 | using Example.Extension; |
| 9 | using WixBuildTools.TestSupport; | 9 | using WixBuildTools.TestSupport; |
| 10 | using WixToolset.Core; | 10 | using WixToolset.Core; |
| 11 | using WixToolset.Core.TestPackage; | ||
| 11 | using WixToolset.Data; | 12 | using WixToolset.Data; |
| 12 | using WixToolset.Data.Tuples; | 13 | using WixToolset.Data.Tuples; |
| 13 | using Xunit; | 14 | using Xunit; |
| @@ -37,8 +38,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 37 | { | 38 | { |
| 38 | var intermediateFolder = fs.GetFolder(); | 39 | var intermediateFolder = fs.GetFolder(); |
| 39 | 40 | ||
| 40 | var program = new Program(); | 41 | var result = WixRunner.Execute(new[] |
| 41 | var result = program.Run(new WixToolsetServiceProvider(), null, new[] | ||
| 42 | { | 42 | { |
| 43 | "build", | 43 | "build", |
| 44 | Path.Combine(folder, "Package.wxs"), | 44 | Path.Combine(folder, "Package.wxs"), |
| @@ -48,7 +48,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 48 | "-bindpath", Path.Combine(folder, "data"), | 48 | "-bindpath", Path.Combine(folder, "data"), |
| 49 | "-intermediateFolder", intermediateFolder, | 49 | "-intermediateFolder", intermediateFolder, |
| 50 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") | 50 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") |
| 51 | }); | 51 | }, out var messages); |
| 52 | 52 | ||
| 53 | Assert.Equal(0, result); | 53 | Assert.Equal(0, result); |
| 54 | 54 | ||
| @@ -80,8 +80,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 80 | { | 80 | { |
| 81 | var intermediateFolder = fs.GetFolder(); | 81 | var intermediateFolder = fs.GetFolder(); |
| 82 | 82 | ||
| 83 | var program = new Program(); | 83 | var result = WixRunner.Execute(new[] |
| 84 | var result = program.Run(new WixToolsetServiceProvider(), null, new[] | ||
| 85 | { | 84 | { |
| 86 | "build", | 85 | "build", |
| 87 | Path.Combine(folder, "Package.wxs"), | 86 | Path.Combine(folder, "Package.wxs"), |
| @@ -92,7 +91,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 92 | "-intermediateFolder", intermediateFolder, | 91 | "-intermediateFolder", intermediateFolder, |
| 93 | "-example", "test", | 92 | "-example", "test", |
| 94 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") | 93 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") |
| 95 | }); | 94 | }, out var messages); |
| 96 | 95 | ||
| 97 | Assert.Equal(0, result); | 96 | Assert.Equal(0, result); |
| 98 | 97 | ||
| @@ -107,8 +106,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 107 | 106 | ||
| 108 | private static void Build(string[] args) | 107 | private static void Build(string[] args) |
| 109 | { | 108 | { |
| 110 | var program = new Program(); | 109 | var result = WixRunner.Execute(args, out var messages); |
| 111 | var result = program.Run(new WixToolsetServiceProvider(), null, args); | ||
| 112 | Assert.Equal(0, result); | 110 | Assert.Equal(0, result); |
| 113 | } | 111 | } |
| 114 | } | 112 | } |
