SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Re-enable .NET Framework 4.0 building in Core

Browse Source
This commit is contained in:
Matt Nadareski
2023-11-22 15:56:43 -05:00
parent 4d8153dba1
commit 8e8e3368d0
31 changed files with 309 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MPF.Check/Program.cs
View File

@@ -50,7 +50,7 @@ namespace MPF.Check
#else
(bool? _, string? message) = RedumpHttpClient.ValidateCredentials(options.RedumpUsername ?? string.Empty, options.RedumpPassword ?? string.Empty).ConfigureAwait(false).GetAwaiter().GetResult();
#endif
if (!string.IsNullOrWhiteSpace(message))
if (!string.IsNullOrEmpty(message))
Console.WriteLine(message);
// Loop through all the rest of the args
@@ -68,13 +68,13 @@ namespace MPF.Check
// Now populate an environment
Drive? drive = null;
if (!string.IsNullOrWhiteSpace(path))
if (!string.IsNullOrEmpty(path))
drive = Drive.Create(null, path!);
var env = new DumpEnvironment(options, filepath, drive, knownSystem, mediaType, internalProgram: null, parameters: null);
// Finally, attempt to do the output dance
#if NET40
#if NET20 || NET35 || NET40
var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress);
#else
var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress).ConfigureAwait(false).GetAwaiter().GetResult();