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).
---
 src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj')

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
-- 
cgit v1.2.3-55-g6feb