diff options
Diffstat (limited to 'src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index 74978322..9f761c32 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | |||
| @@ -13,13 +13,6 @@ namespace WixToolsetTest.BuildTasks | |||
| 13 | { | 13 | { |
| 14 | private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets"); | 14 | private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets"); |
| 15 | 15 | ||
| 16 | public MsbuildFixture() | ||
| 17 | { | ||
| 18 | this.MsbuildRunner = new MsbuildRunner(); | ||
| 19 | } | ||
| 20 | |||
| 21 | private MsbuildRunner MsbuildRunner { get; } | ||
| 22 | |||
| 23 | [Fact] | 16 | [Fact] |
| 24 | public void CanBuildSimpleMsiPackage() | 17 | public void CanBuildSimpleMsiPackage() |
| 25 | { | 18 | { |
| @@ -31,7 +24,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 31 | var binFolder = Path.Combine(baseFolder, @"bin\"); | 24 | var binFolder = Path.Combine(baseFolder, @"bin\"); |
| 32 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 25 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 33 | 26 | ||
| 34 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 27 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 35 | { | 28 | { |
| 36 | $"-p:WixTargetsPath={WixTargetsPath}", | 29 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 37 | $"-p:IntermediateOutputPath={intermediateFolder}", | 30 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -69,7 +62,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 69 | var binFolder = Path.Combine(baseFolder, @"bin\"); | 62 | var binFolder = Path.Combine(baseFolder, @"bin\"); |
| 70 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 63 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 71 | 64 | ||
| 72 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 65 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 73 | { | 66 | { |
| 74 | $"-p:WixTargetsPath={WixTargetsPath}", | 67 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 75 | $"-p:IntermediateOutputPath={intermediateFolder}", | 68 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -94,7 +87,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 94 | var binFolder = Path.Combine(baseFolder, @"bin\"); | 87 | var binFolder = Path.Combine(baseFolder, @"bin\"); |
| 95 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 88 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 96 | 89 | ||
| 97 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 90 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 98 | { | 91 | { |
| 99 | $"-p:WixTargetsPath={WixTargetsPath}", | 92 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 100 | $"-p:IntermediateOutputPath={intermediateFolder}", | 93 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -116,7 +109,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 116 | var binFolder = Path.Combine(baseFolder, @"bin\"); | 109 | var binFolder = Path.Combine(baseFolder, @"bin\"); |
| 117 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 110 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 118 | 111 | ||
| 119 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 112 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 120 | { | 113 | { |
| 121 | $"-p:WixTargetsPath={WixTargetsPath}", | 114 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 122 | $"-p:IntermediateOutputPath={intermediateFolder}", | 115 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -141,7 +134,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 141 | var binFolder = Path.Combine(baseFolder, @"bin\"); | 134 | var binFolder = Path.Combine(baseFolder, @"bin\"); |
| 142 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 135 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 143 | 136 | ||
| 144 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 137 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 145 | { | 138 | { |
| 146 | $"-p:WixTargetsPath={WixTargetsPath}", | 139 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 147 | $"-p:IntermediateOutputPath={intermediateFolder}", | 140 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -169,7 +162,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 169 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | 162 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); |
| 170 | 163 | ||
| 171 | // Build | 164 | // Build |
| 172 | var result = this.MsbuildRunner.Execute(projectPath, new[] | 165 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 173 | { | 166 | { |
| 174 | $"-p:WixTargetsPath={WixTargetsPath}", | 167 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 175 | $"-p:IntermediateOutputPath={intermediateFolder}", | 168 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| @@ -187,7 +180,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 187 | Assert.NotEmpty(createdPaths); | 180 | Assert.NotEmpty(createdPaths); |
| 188 | 181 | ||
| 189 | // Clean | 182 | // Clean |
| 190 | result = this.MsbuildRunner.Execute(projectPath, new[] | 183 | result = MsbuildRunner.Execute(projectPath, new[] |
| 191 | { | 184 | { |
| 192 | $"-p:WixTargetsPath={WixTargetsPath}", | 185 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 193 | $"-p:IntermediateOutputPath={intermediateFolder}", | 186 | $"-p:IntermediateOutputPath={intermediateFolder}", |