From 20ea356b2c0b4ab4d29778b4958d5b363f735f1f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 2 Nov 2020 19:43:20 -0600
Subject: More .NET 5 updates.

Fix tests when running on machine with .NET 5.
Update frameworks for .NET Core MBA (3.1 vs 5.0).
---
 .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj         |  4 ++--
 .../FullFramework2MBA/Example.FullFramework2MBA.csproj     |  2 +-
 .../FullFramework4MBA/Example.FullFramework4MBA.csproj     |  2 +-
 .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj    | 12 +++++-------
 src/test/examples/TestEngine/TestEngine.cpp                | 14 +++++++++++---
 src/test/examples/TestEngine/TestEngine.h                  |  1 +
 src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj     |  6 +++---
 7 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'src/test')

diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 19fbd249..cb66c138 100644
--- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <Description>Earliest .NET Core MBA</Description>
@@ -13,6 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.41" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 20c5c65c..21079ed1 100644
--- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -15,6 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.41" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index fff76795..a05e7888 100644
--- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.41" PrivateAssets="All" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index ccc642f0..9f3f02d9 100644
--- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -1,23 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <Description>Latest .NET Core MBA</Description>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(PublishTrimmed)'=='true'">
-    <PublishReadyToRunShowWarnings>false</PublishReadyToRunShowWarnings>
-    <PublishReadyToRun>true</PublishReadyToRun>
-  </PropertyGroup>
-
   <ItemGroup>
+    <TrimmerRootAssembly Include="System.Diagnostics.Tools" />
+    <TrimmerRootAssembly Include="System.Runtime" />
+    <TrimmerRootAssembly Include="System.Runtime.InteropServices" />
     <TrimmerRootAssembly Include="System.Runtime.Loader" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.41" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp
index a6a21174..4c7ec1c3 100644
--- a/src/test/examples/TestEngine/TestEngine.cpp
+++ b/src/test/examples/TestEngine/TestEngine.cpp
@@ -69,11 +69,19 @@ LExit:
 }
 
 HRESULT TestEngine::Log(
+    __in BOOTSTRAPPER_LOG_LEVEL level,
     __in LPCWSTR wzMessage
     )
 {
-    LogStringLine(REPORT_STANDARD, "%ls", wzMessage);
-    return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage);
+    switch (level)
+    {
+    case BOOTSTRAPPER_LOG_LEVEL_NONE:
+    case BOOTSTRAPPER_LOG_LEVEL_DEBUG:
+        return S_OK;
+    default:
+        LogStringLine(REPORT_STANDARD, "%ls", wzMessage);
+        return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage);
+    }
 }
 
 HRESULT TestEngine::RunApplication()
@@ -169,7 +177,7 @@ HRESULT TestEngine::BAEngineLog(
     __in BAENGINE_LOG_RESULTS* /*pResults*/
     )
 {
-    return Log(pArgs->wzMessage);
+    return Log(pArgs->level, pArgs->wzMessage);
 }
 
 HRESULT TestEngine::BAEngineQuit(
diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h
index 14b69999..44e813bd 100644
--- a/src/test/examples/TestEngine/TestEngine.h
+++ b/src/test/examples/TestEngine/TestEngine.h
@@ -28,6 +28,7 @@ public:
         );
 
     HRESULT Log(
+        __in BOOTSTRAPPER_LOG_LEVEL level,
         __in LPCWSTR wzMessage
         );
 
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index b488159d..296e5be9 100644
--- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <Description>WPF .NET Core MBA</Description>
@@ -11,6 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.41" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb