From e0a88194af923cb523384352165bca91780c4289 Mon Sep 17 00:00:00 2001 From: James Parsons Date: Wed, 23 Sep 2020 14:06:22 -0700 Subject: Add package definitions for the latest version of .NET Core 3.1 --- .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 25 ++++ .../TestData/UsingDotNetCorePackages/Bundle.wxs | 32 ++++-- .../UsingDotNetCorePackages/Bundle_x64.wxs | 34 ++++++ .../WixToolsetTest.Netfx.csproj | 1 + src/wixlib/NetCore3.1.Latest_x64.wxs | 128 +++++++++++++++++++++ src/wixlib/NetCore3.1.Latest_x86.wxs | 128 +++++++++++++++++++++ 6 files changed, 339 insertions(+), 9 deletions(-) create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs create mode 100644 src/wixlib/NetCore3.1.Latest_x64.wxs create mode 100644 src/wixlib/NetCore3.1.Latest_x86.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 8bcac8df..845e1373 100644 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -36,6 +36,31 @@ namespace WixToolsetTest.Netfx } } + [Fact] + public void CanBuildUsingDotNetCorePackages_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, "Bundle_x64.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 CanBuildUsingNativeImage() { diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs index 7c008171..a31848a7 100644 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs @@ -6,15 +6,29 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs new file mode 100644 index 00000000..a5e91532 --- /dev/null +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index cf7afa8b..1df84972 100644 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -13,6 +13,7 @@ + diff --git a/src/wixlib/NetCore3.1.Latest_x64.wxs b/src/wixlib/NetCore3.1.Latest_x64.wxs new file mode 100644 index 00000000..f8f2bfbc --- /dev/null +++ b/src/wixlib/NetCore3.1.Latest_x64.wxs @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetCore3.1.Latest_x86.wxs b/src/wixlib/NetCore3.1.Latest_x86.wxs new file mode 100644 index 00000000..c36523dc --- /dev/null +++ b/src/wixlib/NetCore3.1.Latest_x86.wxs @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From 9ed6f291d49599bb12a1baa3a0e000f1e0e254cf Mon Sep 17 00:00:00 2001 From: James Parsons Date: Tue, 29 Sep 2020 00:10:57 -0700 Subject: Remove unsupported .NET Core 3.1 package definitions --- .../TestData/UsingDotNetCorePackages/Bundle.wxs | 26 +---- .../UsingDotNetCorePackages/Bundle_x64.wxs | 26 +---- src/wixlib/NetCore3.1.0_x64.wxs | 123 -------------------- src/wixlib/NetCore3.1.0_x86.wxs | 123 -------------------- src/wixlib/NetCore3.1.1_x64.wxs | 123 -------------------- src/wixlib/NetCore3.1.1_x86.wxs | 123 -------------------- src/wixlib/NetCore3.1.2_x64.wxs | 123 -------------------- src/wixlib/NetCore3.1.2_x86.wxs | 123 -------------------- src/wixlib/NetCore3.1.3_x64.wxs | 123 -------------------- src/wixlib/NetCore3.1.3_x86.wxs | 123 -------------------- src/wixlib/NetCore3.1.4_x64.wxs | 123 -------------------- src/wixlib/NetCore3.1.4_x86.wxs | 123 -------------------- src/wixlib/NetCore3.1.Latest_x64.wxs | 128 --------------------- src/wixlib/NetCore3.1.Latest_x86.wxs | 128 --------------------- src/wixlib/NetCore3.1_x64.wxs | 128 +++++++++++++++++++++ src/wixlib/NetCore3.1_x86.wxs | 128 +++++++++++++++++++++ 16 files changed, 262 insertions(+), 1532 deletions(-) delete mode 100644 src/wixlib/NetCore3.1.0_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.0_x86.wxs delete mode 100644 src/wixlib/NetCore3.1.1_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.1_x86.wxs delete mode 100644 src/wixlib/NetCore3.1.2_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.2_x86.wxs delete mode 100644 src/wixlib/NetCore3.1.3_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.3_x86.wxs delete mode 100644 src/wixlib/NetCore3.1.4_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.4_x86.wxs delete mode 100644 src/wixlib/NetCore3.1.Latest_x64.wxs delete mode 100644 src/wixlib/NetCore3.1.Latest_x86.wxs create mode 100644 src/wixlib/NetCore3.1_x64.wxs create mode 100644 src/wixlib/NetCore3.1_x86.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs index a31848a7..49e8c022 100644 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs @@ -6,29 +6,9 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs index a5e91532..09c7bcdd 100644 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs @@ -6,29 +6,9 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/src/wixlib/NetCore3.1.0_x64.wxs b/src/wixlib/NetCore3.1.0_x64.wxs deleted file mode 100644 index cda6aedf..00000000 --- a/src/wixlib/NetCore3.1.0_x64.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs deleted file mode 100644 index 92da9266..00000000 --- a/src/wixlib/NetCore3.1.0_x86.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.1_x64.wxs b/src/wixlib/NetCore3.1.1_x64.wxs deleted file mode 100644 index 14adbea3..00000000 --- a/src/wixlib/NetCore3.1.1_x64.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.1_x86.wxs b/src/wixlib/NetCore3.1.1_x86.wxs deleted file mode 100644 index 132f4349..00000000 --- a/src/wixlib/NetCore3.1.1_x86.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.2_x64.wxs b/src/wixlib/NetCore3.1.2_x64.wxs deleted file mode 100644 index e63f8117..00000000 --- a/src/wixlib/NetCore3.1.2_x64.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.2_x86.wxs b/src/wixlib/NetCore3.1.2_x86.wxs deleted file mode 100644 index 8f3c26d7..00000000 --- a/src/wixlib/NetCore3.1.2_x86.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.3_x64.wxs b/src/wixlib/NetCore3.1.3_x64.wxs deleted file mode 100644 index 85887c84..00000000 --- a/src/wixlib/NetCore3.1.3_x64.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.3_x86.wxs b/src/wixlib/NetCore3.1.3_x86.wxs deleted file mode 100644 index 9a038650..00000000 --- a/src/wixlib/NetCore3.1.3_x86.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.4_x64.wxs deleted file mode 100644 index 06a42c37..00000000 --- a/src/wixlib/NetCore3.1.4_x64.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.4_x86.wxs deleted file mode 100644 index ea643a04..00000000 --- a/src/wixlib/NetCore3.1.4_x86.wxs +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.Latest_x64.wxs b/src/wixlib/NetCore3.1.Latest_x64.wxs deleted file mode 100644 index f8f2bfbc..00000000 --- a/src/wixlib/NetCore3.1.Latest_x64.wxs +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1.Latest_x86.wxs b/src/wixlib/NetCore3.1.Latest_x86.wxs deleted file mode 100644 index c36523dc..00000000 --- a/src/wixlib/NetCore3.1.Latest_x86.wxs +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs new file mode 100644 index 00000000..d43ba1ce --- /dev/null +++ b/src/wixlib/NetCore3.1_x64.wxs @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs new file mode 100644 index 00000000..7cb1b26b --- /dev/null +++ b/src/wixlib/NetCore3.1_x86.wxs @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From af731a9631a7f7f6d7c3b2ef84f38a07bb4db211 Mon Sep 17 00:00:00 2001 From: James Parsons Date: Thu, 1 Oct 2020 23:05:25 -0700 Subject: Split up latest package and individual packages. Make corresponding changes to tests. --- .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 50 +++++++++ .../TestData/UsingDotNetCorePackages/Bundle.wxs | 6 +- .../UsingDotNetCorePackages/BundleLatest.wxs | 14 +++ .../UsingDotNetCorePackages/BundleLatest_x64.wxs | 14 +++ .../UsingDotNetCorePackages/Bundle_x64.wxs | 6 +- .../WixToolsetTest.Netfx.csproj | 2 + src/wixlib/NetCore3.1.8_x64.wxs | 123 +++++++++++++++++++++ src/wixlib/NetCore3.1.8_x86.wxs | 123 +++++++++++++++++++++ src/wixlib/NetCore3.1_x64.wxs | 116 +------------------ src/wixlib/NetCore3.1_x86.wxs | 116 +------------------ 10 files changed, 344 insertions(+), 226 deletions(-) create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs create mode 100644 src/wixlib/NetCore3.1.8_x64.wxs create mode 100644 src/wixlib/NetCore3.1.8_x86.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 845e1373..c9391074 100644 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -11,6 +11,56 @@ namespace WixToolsetTest.Netfx public class NetfxExtensionFixture { + [Fact] + public void CanBuildUsingLatestDotNetCorePackages() + { + 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.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, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + } + } + [Fact] public void CanBuildUsingDotNetCorePackages() { diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs index 49e8c022..d746226e 100644 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs new file mode 100644 index 00000000..49e8c022 --- /dev/null +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs new file mode 100644 index 00000000..09c7bcdd --- /dev/null +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs index 09c7bcdd..4d1ba73e 100644 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 1df84972..a9e5cd2b 100644 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -14,6 +14,8 @@ + + diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs new file mode 100644 index 00000000..56f498de --- /dev/null +++ b/src/wixlib/NetCore3.1.8_x64.wxs @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs new file mode 100644 index 00000000..87d780c3 --- /dev/null +++ b/src/wixlib/NetCore3.1.8_x86.wxs @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs index d43ba1ce..b6fd944d 100644 --- a/src/wixlib/NetCore3.1_x64.wxs +++ b/src/wixlib/NetCore3.1_x64.wxs @@ -4,125 +4,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - - - - - - - - - - - + + diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs index 7cb1b26b..fd4470c0 100644 --- a/src/wixlib/NetCore3.1_x86.wxs +++ b/src/wixlib/NetCore3.1_x86.wxs @@ -4,125 +4,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - - - - - - - - - - - + + -- cgit v1.2.3-55-g6feb From 9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 Mon Sep 17 00:00:00 2001 From: James Parsons Date: Thu, 15 Oct 2020 15:23:07 -0700 Subject: Fix 3.1.8 desktop runtime payloads and remove version specific tests --- .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 50 ---------------------- .../TestData/UsingDotNetCorePackages/Bundle.wxs | 14 ------ .../UsingDotNetCorePackages/Bundle_x64.wxs | 14 ------ .../WixToolsetTest.Netfx.csproj | 2 - src/wixlib/NetCore3.1.8_x64.wxs | 8 ++-- src/wixlib/NetCore3.1.8_x86.wxs | 8 ++-- 6 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index c9391074..72d4a682 100644 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -61,56 +61,6 @@ namespace WixToolsetTest.Netfx } } - [Fact] - public void CanBuildUsingDotNetCorePackages() - { - 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, "Bundle.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 CanBuildUsingDotNetCorePackages_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, "Bundle_x64.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 CanBuildUsingNativeImage() { diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs deleted file mode 100644 index d746226e..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs deleted file mode 100644 index 4d1ba73e..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index a9e5cd2b..4dea73da 100644 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -12,8 +12,6 @@ - - diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs index 56f498de..d6877e56 100644 --- a/src/wixlib/NetCore3.1.8_x64.wxs +++ b/src/wixlib/NetCore3.1.8_x64.wxs @@ -76,10 +76,10 @@ diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs index 87d780c3..bf639c22 100644 --- a/src/wixlib/NetCore3.1.8_x86.wxs +++ b/src/wixlib/NetCore3.1.8_x86.wxs @@ -76,10 +76,10 @@ -- cgit v1.2.3-55-g6feb