From ae1751902076edfd8978b7fb42f24d3ac3f7ad55 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 29 Apr 2020 19:36:24 +1000
Subject: Add WPF .NET Core test.

---
 .../WixToolsetTest.ManagedHost/DncHostFixture.cs   | 34 ++++++++++++++++++++++
 .../WPFCoreMBA/FrameworkDependentBundle.wxs        | 17 +++++++++++
 .../WixToolsetTest.ManagedHost.csproj              | 17 +++++++++--
 3 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs

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

diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index 7f40ee26..f33709ab 100644
--- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -335,5 +335,39 @@ namespace WixToolsetTest.ManagedHost
                 Assert.Equal("Shutdown,Restart,0", logMessages[8]);
             }
         }
+
+        [Fact]
+        public void CanLoadFDDWPFCoreMBA()
+        {
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FDDWPFCoreMBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\WPFCoreMBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
+
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("WPFCoreBA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..ecc5e8c1
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs
@@ -0,0 +1,17 @@
+<?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="FDDWPFCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
+        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json' Name='Example.WPFCoreMBA.deps.json' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll' Name='Example.WPFCoreMBA.dll' bal:BAFactoryAssembly='yes' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb' Name='Example.WPFCoreMBA.pdb' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json' Name='Example.WPFCoreMBA.runtimeconfig.json' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\mbanative.dll' Name='mbanative.dll' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll' Name='WixToolset.Mba.Core.dll' />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index 958c63fc..ff472322 100644
--- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -14,6 +14,7 @@
   <PropertyGroup>
     <EarliestCoreMBAProjectPath>..\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
     <LatestCoreMBAProjectPath>..\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj</LatestCoreMBAProjectPath>
+    <WPFCoreMBAProjectPath>..\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj</WPFCoreMBAProjectPath>
     <MBAPublishPath>$(OutputPath)examples\publish\</MBAPublishPath>
   </PropertyGroup>
 
@@ -30,6 +31,7 @@
     <Content Include="TestData\LatestCoreMBA\HarvestedTrimmedSCD.wxs" CopyToOutputDirectory="PreserveNewest"/>
     <Content Include="TestData\LatestCoreMBA\SelfContainedBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
     <Content Include="TestData\LatestCoreMBA\TrimmedSelfContainedBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
+    <Content Include="TestData\WPFCoreMBA\FrameworkDependentBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
   <Target Name="CopyExtensions" AfterTargets="Build">
@@ -43,11 +45,17 @@
     <CoreMBAProject Include="$(LatestCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.LatestCoreMBA</PublishPath>
     </CoreMBAProject>
+    <CoreMBAProject Include="$(WPFCoreMBAProjectPath)">
+      <PublishPath>$(MBAPublishPath)Example.WPFCoreMBA</PublishPath>
+      <SkipSCD>true</SkipSCD>
+      <SkipTrimmedSCD>true</SkipTrimmedSCD>
+    </CoreMBAProject>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(EarliestCoreMBAProjectPath)" />
     <ProjectReference Include="$(LatestCoreMBAProjectPath)" />
+    <ProjectReference Include="$(WPFCoreMBAProjectPath)" />
     <ProjectReference Include="..\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj" />
     <ProjectReference Include="..\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj" />
     <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" />
@@ -69,8 +77,11 @@
   </ItemGroup>
 
   <Target Name="PublishExamples" AfterTargets="Build">
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"' />
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"' />
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true "%(CoreMBAProject.Identity)"' />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipFDD)'==''" />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipSCD)'==''" />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipTrimmedSCD)'==''" />
   </Target>
 </Project>
-- 
cgit v1.2.3-55-g6feb