aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs2
-rw-r--r--src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj25
2 files changed, 6 insertions, 21 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
index bc2786e9..daa3da42 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
@@ -20,7 +20,7 @@ namespace WixToolsetTest.CoreIntegrationFixture
20 var intermediateFolder = fs.GetFolder(); 20 var intermediateFolder = fs.GetFolder();
21 21
22 var program = new Program(); 22 var program = new Program();
23 var result = program.Run(new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" }); 23 var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
24 24
25 Assert.Equal(0, result); 25 Assert.Equal(0, result);
26 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi"))); 26 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
index 86482a19..bce6e6b2 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
@@ -12,25 +12,14 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <None Remove="TestData\SingleFile\data\test.txt" /> 15 <Content Include="TestData\SingleFile\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
16 <None Remove="TestData\SingleFile\Package.en-us.wxl" /> 16 <Content Include="TestData\SingleFile\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
17 <None Remove="TestData\SingleFile\Package.wxs" /> 17 <Content Include="TestData\SingleFile\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
18 <None Remove="TestData\SingleFile\PackageComponents.wxs" /> 18 <Content Include="TestData\SingleFile\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
19 </ItemGroup> 19 </ItemGroup>
20 20
21 <ItemGroup> 21 <ItemGroup>
22 <Content Include="TestData\SingleFile\data\test.txt"> 22 <ProjectReference Include="..\..\wix\wix.csproj" />
23 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24 </Content>
25 <Content Include="TestData\SingleFile\Package.en-us.wxl">
26 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27 </Content>
28 <Content Include="TestData\SingleFile\Package.wxs">
29 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30 </Content>
31 <Content Include="TestData\SingleFile\PackageComponents.wxs">
32 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33 </Content>
34 </ItemGroup> 23 </ItemGroup>
35 24
36 <ItemGroup> 25 <ItemGroup>
@@ -38,8 +27,4 @@
38 <PackageReference Include="xunit" Version="2.2.0" /> 27 <PackageReference Include="xunit" Version="2.2.0" />
39 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> 28 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
40 </ItemGroup> 29 </ItemGroup>
41
42 <ItemGroup>
43 <ProjectReference Include="..\..\wix\wix.csproj" />
44 </ItemGroup>
45</Project> 30</Project>