From 8b8b51ace41202b10855d2bde61464c2012d61d4 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 22 Nov 2023 16:02:08 -0500 Subject: [PATCH] Re-enable .NET Framework 4.0 building in Check --- CHANGELIST.md | 1 + MPF.Check/MPF.Check.csproj | 2 +- MPF.Check/Program.cs | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 688cbeda..a61e1a2a 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -29,6 +29,7 @@ - Update to BinaryObjectScanner 3.0.2 - Re-enable .NET Framework 4.0 building in Core - Re-enable .NET Framework 4.0 building in UI.Core +- Re-enable .NET Framework 4.0 building in Check ### 3.0.0 (2023-11-14) diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index 30f0486b..39689e4d 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -2,7 +2,7 @@ - net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 Exe false diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs index 9cd955c1..2ccfa141 100644 --- a/MPF.Check/Program.cs +++ b/MPF.Check/Program.cs @@ -75,7 +75,9 @@ namespace MPF.Check // Finally, attempt to do the output dance #if NET20 || NET35 || NET40 - var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress); + var resultTask = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress); + resultTask.Wait(); + var result = resultTask.Result; #else var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress).ConfigureAwait(false).GetAwaiter().GetResult(); #endif