aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-20 22:33:48 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-20 23:20:10 +1000
commit4029dacd2053cc35bdbce158fb9b2c4c832ebb78 (patch)
tree24ce597c1d91f9a39b1ec50d842908c76051b45a /src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
parent037243df84151413db9666c78526fc60ff5e3b53 (diff)
downloadwix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.tar.gz
wix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.tar.bz2
wix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.zip
Update .NET Core packages so they don't conflict.
Make it easier to add new ones. Add AsPrereq package group for DotNetCoreRuntime packages.
Diffstat (limited to 'src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs')
-rw-r--r--src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 38724481..15c31088 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -2,6 +2,7 @@
2 2
3namespace WixToolsetTest.Netfx 3namespace WixToolsetTest.Netfx
4{ 4{
5 using System.IO;
5 using System.Linq; 6 using System.Linq;
6 using WixBuildTools.TestSupport; 7 using WixBuildTools.TestSupport;
7 using WixToolset.Core.TestPackage; 8 using WixToolset.Core.TestPackage;
@@ -11,6 +12,31 @@ namespace WixToolsetTest.Netfx
11 public class NetfxExtensionFixture 12 public class NetfxExtensionFixture
12 { 13 {
13 [Fact] 14 [Fact]
15 public void CanBuildUsingDotNetCorePackages()
16 {
17 using (var fs = new DisposableFileSystem())
18 {
19 var baseFolder = fs.GetFolder();
20 var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
22 var intermediateFolder = Path.Combine(baseFolder, "obj");
23
24 var compileResult = WixRunner.Execute(new[]
25 {
26 "build",
27 Path.Combine(bundleSourceFolder, "Bundle.wxs"),
28 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
29 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
30 "-intermediateFolder", intermediateFolder,
31 "-o", bundleFile,
32 });
33 compileResult.AssertSuccess();
34
35 Assert.True(File.Exists(bundleFile));
36 }
37 }
38
39 [Fact]
14 public void CanBuildUsingNativeImage() 40 public void CanBuildUsingNativeImage()
15 { 41 {
16 var folder = TestData.Get(@"TestData\UsingNativeImage"); 42 var folder = TestData.Get(@"TestData\UsingNativeImage");