From 5d77af7e974fb88d84a4bf74f12e760a9fb3e59a Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 24 Jul 2025 08:55:29 -0400 Subject: [PATCH] Add .NET Standard 2.0 and 2.1 --- SabreTools.RedumpLib/Builder.cs | 2 +- SabreTools.RedumpLib/Data/SubmissionInfo.cs | 16 ---------------- SabreTools.RedumpLib/SabreTools.RedumpLib.csproj | 2 +- SabreTools.RedumpLib/Web/RedumpClient.cs | 14 +++++++------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/SabreTools.RedumpLib/Builder.cs b/SabreTools.RedumpLib/Builder.cs index 6af6052..0efb5ce 100644 --- a/SabreTools.RedumpLib/Builder.cs +++ b/SabreTools.RedumpLib/Builder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -#if NET40_OR_GREATER || NETCOREAPP +#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER using System.Net; #endif using System.Text; diff --git a/SabreTools.RedumpLib/Data/SubmissionInfo.cs b/SabreTools.RedumpLib/Data/SubmissionInfo.cs index 119e7e5..c9a140c 100644 --- a/SabreTools.RedumpLib/Data/SubmissionInfo.cs +++ b/SabreTools.RedumpLib/Data/SubmissionInfo.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -#if NET40_OR_GREATER || NETCOREAPP -using System.Linq; -#endif using Newtonsoft.Json; using SabreTools.RedumpLib.Converters; @@ -75,7 +72,6 @@ namespace SabreTools.RedumpLib.Data public object Clone() { -#if NET20 || NET35 Dictionary? artifacts = null; if (this.Artifacts != null) { @@ -85,9 +81,6 @@ namespace SabreTools.RedumpLib.Data artifacts[kvp.Key] = kvp.Value; } } -#else - var artifacts = this.Artifacts?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); -#endif return new SubmissionInfo { @@ -249,7 +242,6 @@ namespace SabreTools.RedumpLib.Data public object Clone() { -#if NET20 || NET35 Dictionary? commentsSpecialFields = null; if (this.CommentsSpecialFields != null) { @@ -269,10 +261,6 @@ namespace SabreTools.RedumpLib.Data contentsSpecialFields[kvp.Key] = kvp.Value; } } -#else - var commentsSpecialFields = this.CommentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - var contentsSpecialFields = this.ContentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); -#endif return new CommonDiscInfoSection { @@ -455,7 +443,6 @@ namespace SabreTools.RedumpLib.Data public object Clone() { -#if NET20 || NET35 Dictionary?>? fullProtections = null; if (this.FullProtections != null) { @@ -465,9 +452,6 @@ namespace SabreTools.RedumpLib.Data fullProtections[kvp.Key] = kvp.Value; } } -#else - var fullProtections = this.FullProtections?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); -#endif return new CopyProtectionSection { diff --git a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj index d856bba..3d75053 100644 --- a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj +++ b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj @@ -2,7 +2,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1 true latest enable diff --git a/SabreTools.RedumpLib/Web/RedumpClient.cs b/SabreTools.RedumpLib/Web/RedumpClient.cs index 0a0e97a..df4b087 100644 --- a/SabreTools.RedumpLib/Web/RedumpClient.cs +++ b/SabreTools.RedumpLib/Web/RedumpClient.cs @@ -36,7 +36,7 @@ namespace SabreTools.RedumpLib.Web /// /// Internal client for interaction /// -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER private CookieWebClient _internalClient; #else private HttpClient _internalClient; @@ -49,7 +49,7 @@ namespace SabreTools.RedumpLib.Web /// public RedumpClient() { -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER _internalClient = new CookieWebClient(); #else _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) }; @@ -131,7 +131,7 @@ namespace SabreTools.RedumpLib.Web var loginPage = await DownloadString(Constants.LoginUrl); string token = Constants.TokenRegex.Match(loginPage ?? string.Empty).Groups[1].Value; -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER // Construct the login request _internalClient.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded"; _internalClient.Encoding = Encoding.UTF8; @@ -205,7 +205,7 @@ namespace SabreTools.RedumpLib.Web { #if NET40 return await Task.Factory.StartNew(() => _internalClient.DownloadData(uri)); -#elif NETFRAMEWORK +#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER return await Task.Run(() => _internalClient.DownloadData(uri)); #else return await _internalClient.GetByteArrayAsync(uri); @@ -231,7 +231,7 @@ namespace SabreTools.RedumpLib.Web #if NET40 await Task.Factory.StartNew(() => { _internalClient.DownloadFile(uri, fileName); return true; }); return _internalClient.GetLastFilename(); -#elif NETFRAMEWORK +#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER await Task.Run(() => _internalClient.DownloadFile(uri, fileName)); return _internalClient.GetLastFilename(); #else @@ -271,7 +271,7 @@ namespace SabreTools.RedumpLib.Web { #if NET40 return await Task.Factory.StartNew(() => _internalClient.DownloadString(uri)); -#elif NETFRAMEWORK +#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER return await Task.Run(() => _internalClient.DownloadString(uri)); #else return await _internalClient.GetStringAsync(uri); @@ -497,7 +497,7 @@ namespace SabreTools.RedumpLib.Web { #if NET40 return await Task.Factory.StartNew(() => _internalClient.DownloadData(string.Format(url, system.ShortName()))); -#elif NETFRAMEWORK +#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER return await Task.Run(() => _internalClient.DownloadData(string.Format(url, system.ShortName()))); #else return await _internalClient.GetByteArrayAsync(string.Format(url, system.ShortName()));