Merge pull request #21 from japarson/dev/japarson/current_pack_def

Add package definitions for the latest version of .NET Core 3.1

1 files changed, 27 insertions, 2 deletions

diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8bcac8df..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.Netfx
     public class NetfxExtensionFixture
     {
         [Fact]
-        public void CanBuildUsingDotNetCorePackages()
+        public void CanBuildUsingLatestDotNetCorePackages()
         {
             using (var fs = new DisposableFileSystem())
             {
@@ -24,7 +24,32 @@ namespace WixToolsetTest.Netfx
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
-                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
+                    Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+
+                Assert.True(File.Exists(bundleFile));
+            }
+        }
+
+        [Fact]
+        public void CanBuildUsingLatestDotNetCorePackages_X64()
+        {
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,