From 4029dacd2053cc35bdbce158fb9b2c4c832ebb78 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 20 May 2020 22:33:48 +1000
Subject: Update .NET Core packages so they don't conflict. Make it easier to
 add new ones. Add AsPrereq package group for DotNetCoreRuntime packages.

---
 .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs  | 26 ++++++++++++++++++++++
 .../TestData/UsingDotNetCorePackages/Bundle.wxs    | 20 +++++++++++++++++
 .../WixToolsetTest.Netfx.csproj                    |  6 +++++
 3 files changed, 52 insertions(+)
 create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs

(limited to 'src/test/WixToolsetTest.Netfx')

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 @@
 
 namespace WixToolsetTest.Netfx
 {
+    using System.IO;
     using System.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
@@ -10,6 +11,31 @@ namespace WixToolsetTest.Netfx
 
     public class NetfxExtensionFixture
     {
+        [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 CanBuildUsingNativeImage()
         {
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
new file mode 100644
index 00000000..7c008171
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
+            <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
+            <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
+            <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 88303fcd..cf7afa8b 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,17 +12,23 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <Target Name="CopyExtensions" AfterTargets="Build">
+    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
-- 
cgit v1.2.3-55-g6feb