Merge pull request #120 from aspriddell/netstd2

Downgrade to .NET Standard 2.0
dragonfruitnetwork · Oct 13, 2020 · 99f4f93 · 99f4f93
2 parents 30c0996 + 275e787
commit 99f4f93
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 24 deletions.
diff --git a/DragonFruit.Six.API.Demo/Program.cs b/DragonFruit.Six.API.Demo/Program.cs
@@ -5,8 +5,8 @@
 using System.Threading.Tasks;
 using DragonFruit.Six.API.Data.Extensions;
 using DragonFruit.Six.API.Enums;
-using DragonFruit.Six.API.Helpers;
 using DragonFruit.Six.API.Tests.Common;
+using DragonFruit.Six.API.Utils;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

diff --git a/DragonFruit.Six.API.Tests.Common/Dragon6DemoClient.cs b/DragonFruit.Six.API.Tests.Common/Dragon6DemoClient.cs
@@ -8,7 +8,7 @@
 using DragonFruit.Six.API.Developer.Extensions;
 using DragonFruit.Six.API.Enums;
 using DragonFruit.Six.API.Exceptions;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 
 namespace DragonFruit.Six.API.Tests.Common
 {

diff --git a/DragonFruit.Six.API/Data/Deserializers/AccountInfoDeserializer.cs b/DragonFruit.Six.API/Data/Deserializers/AccountInfoDeserializer.cs
@@ -5,7 +5,7 @@
 using DragonFruit.Common.Data.Extensions;
 using DragonFruit.Six.API.Data.Containers;
 using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 using Newtonsoft.Json.Linq;
 
 namespace DragonFruit.Six.API.Data.Deserializers

diff --git a/DragonFruit.Six.API/Data/Deserializers/AccountLoginInfoDeserializer.cs b/DragonFruit.Six.API/Data/Deserializers/AccountLoginInfoDeserializer.cs
@@ -7,7 +7,7 @@
 using DragonFruit.Common.Data.Extensions;
 using DragonFruit.Six.API.Data.Containers;
 using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 using Newtonsoft.Json.Linq;
 
 namespace DragonFruit.Six.API.Data.Deserializers

diff --git a/DragonFruit.Six.API/Data/Deserializers/SeasonStatsDeserializer.cs b/DragonFruit.Six.API/Data/Deserializers/SeasonStatsDeserializer.cs
@@ -5,6 +5,7 @@
 using DragonFruit.Common.Data.Extensions;
 using DragonFruit.Six.API.Data.Strings;
 using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.API.Utils;
 using Newtonsoft.Json.Linq;
 
 namespace DragonFruit.Six.API.Data.Deserializers
@@ -31,7 +32,7 @@ public static SeasonStats DeserializeSeasonStatsFor(this JObject jObject, string
                 Wins = json.GetUInt(Seasonal.Wins),
                 Losses = json.GetUInt(Seasonal.Losses),
                 Abandons = json.GetUInt(Seasonal.Abandons),
-                WL = json.GetFloat(Seasonal.Wins, 1) / Math.Clamp(json.GetFloat(Seasonal.Losses) + json.GetFloat(Seasonal.Abandons), 1, float.MaxValue),
+                WL = json.GetFloat(Seasonal.Wins, 1) / MathUtils.Clamp(json.GetFloat(Seasonal.Losses) + json.GetFloat(Seasonal.Abandons), 1, float.MaxValue),
 
                 Rank = json.GetUInt(Seasonal.Rank),
                 MaxRank = json.GetUInt(Seasonal.MaxRank),

diff --git a/DragonFruit.Six.API/Data/Deserializers/TokenDeserializer.cs b/DragonFruit.Six.API/Data/Deserializers/TokenDeserializer.cs
@@ -5,7 +5,7 @@
 using DragonFruit.Six.API.Data.Containers;
 using DragonFruit.Six.API.Data.Strings;
 using DragonFruit.Six.API.Data.Tokens;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 using Newtonsoft.Json.Linq;
 
 namespace DragonFruit.Six.API.Data.Deserializers

diff --git a/DragonFruit.Six.API/Data/Requests/AccountInfoRequest.cs b/DragonFruit.Six.API/Data/Requests/AccountInfoRequest.cs
@@ -5,7 +5,7 @@
 using DragonFruit.Common.Data.Parameters;
 using DragonFruit.Six.API.Data.Requests.Base;
 using DragonFruit.Six.API.Enums;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 
 namespace DragonFruit.Six.API.Data.Requests
 {
@@ -43,12 +43,12 @@ public AccountInfoRequest(Platform platform, LookupMethod lookupMethod, IEnumera
         public string PlatformValue => PlatformParser.PlatformIdentifierFor(Platform);
 
         [QueryParameter("nameOnPlatform")]
-        public string PlayerNames => LookupMethod == LookupMethod.Name ? string.Join(',', LookupQuery) : null;
+        public string PlayerNames => LookupMethod == LookupMethod.Name ? string.Join(",", LookupQuery) : null;
 
         [QueryParameter("idOnPlatform")]
-        public string PlatformIds => LookupMethod == LookupMethod.PlatformId ? string.Join(',', LookupQuery) : null;
+        public string PlatformIds => LookupMethod == LookupMethod.PlatformId ? string.Join(",", LookupQuery) : null;
 
         [QueryParameter("userId")]
-        public string UbisoftIds => LookupMethod == LookupMethod.UserId ? string.Join(',', LookupQuery) : null;
+        public string UbisoftIds => LookupMethod == LookupMethod.UserId ? string.Join(",", LookupQuery) : null;
     }
 }
diff --git a/DragonFruit.Six.API/Data/Requests/AccountLoginInfoRequests.cs b/DragonFruit.Six.API/Data/Requests/AccountLoginInfoRequests.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using DragonFruit.Common.Data.Parameters;
 using DragonFruit.Six.API.Data.Requests.Base;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 
 namespace DragonFruit.Six.API.Data.Requests
 {
@@ -29,9 +29,9 @@ public AccountLoginInfoRequest(IEnumerable<AccountInfo> profiles)
         public IEnumerable<AccountInfo> Accounts { get; set; }
 
         [QueryParameter("applicationIds")]
-        public string AppIdString => string.Join(',', AppIds);
+        public string AppIdString => string.Join(",", AppIds);
 
         [QueryParameter("profileIds")]
-        public string ProfileIdString => string.Join(',', Accounts.Select(x => x.Identifiers.Profile));
+        public string ProfileIdString => string.Join(",", Accounts.Select(x => x.Identifiers.Profile));
     }
 }
diff --git a/DragonFruit.Six.API/Data/Requests/Base/BasicStatsRequest.cs b/DragonFruit.Six.API/Data/Requests/Base/BasicStatsRequest.cs
@@ -29,6 +29,6 @@ public BasicStatsRequest(IEnumerable<AccountInfo> accounts)
         public override string AccountIdString => base.AccountIdString;
 
         [QueryParameter("statistics")]
-        public string CompiledStats => string.Join(',', Stats);
+        public string CompiledStats => string.Join(",", Stats);
     }
 }
diff --git a/DragonFruit.Six.API/Data/Requests/Base/PlatformSpecificRequest.cs b/DragonFruit.Six.API/Data/Requests/Base/PlatformSpecificRequest.cs
@@ -31,6 +31,6 @@ protected PlatformSpecificRequest(IEnumerable<AccountInfo> accounts)
 
         public IEnumerable<string> AccountIds => Accounts.Select(x => x.Identifiers.Profile);
 
-        public virtual string AccountIdString => string.Join(',', AccountIds);
+        public virtual string AccountIdString => string.Join(",", AccountIds);
     }
 }
diff --git a/DragonFruit.Six.API/Data/Requests/PlayerLevelStatsRequest.cs b/DragonFruit.Six.API/Data/Requests/PlayerLevelStatsRequest.cs
@@ -25,6 +25,6 @@ public PlayerLevelStatsRequest(IEnumerable<AccountInfo> accounts)
         }
 
         [QueryParameter("profile_ids")]
-        public string CompiledAccounts => string.Join(',', Accounts.Select(x => x.Identifiers.Profile));
+        public string CompiledAccounts => string.Join(",", Accounts.Select(x => x.Identifiers.Profile));
     }
 }
diff --git a/DragonFruit.Six.API/Data/Requests/SeasonStatsRequest.cs b/DragonFruit.Six.API/Data/Requests/SeasonStatsRequest.cs
@@ -42,6 +42,6 @@ public SeasonStatsRequest(IEnumerable<AccountInfo> accounts, int seasonId, strin
         public string Region { get; set; } = "EMEA";
 
         [QueryParameter("profile_ids")]
-        public string CompiledAccounts => string.Join(',', Accounts.Select(x => x.Identifiers.Profile));
+        public string CompiledAccounts => string.Join(",", Accounts.Select(x => x.Identifiers.Profile));
     }
 }
diff --git a/DragonFruit.Six.API/Dragon6Client.cs b/DragonFruit.Six.API/Dragon6Client.cs
@@ -10,7 +10,7 @@
 using DragonFruit.Six.API.Data.Tokens;
 using DragonFruit.Six.API.Enums;
 using DragonFruit.Six.API.Exceptions;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 
 namespace DragonFruit.Six.API
 {

diff --git a/DragonFruit.Six.API/DragonFruit.Six.API.csproj b/DragonFruit.Six.API/DragonFruit.Six.API.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>DragonFruit.Six.API</AssemblyName>
     <RootNamespace>DragonFruit.Six.API</RootNamespace>
     <PackageId>Dragon6.API</PackageId>
@@ -17,6 +17,7 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>r6stats, r6api, r6, rainbowsix</PackageTags>
     <Authors>DragonFruit Network</Authors>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/DragonFruit.Six.API/Endpoints.cs b/DragonFruit.Six.API/Endpoints.cs
@@ -3,7 +3,7 @@
 
 using System;
 using DragonFruit.Six.API.Enums;
-using DragonFruit.Six.API.Helpers;
+using DragonFruit.Six.API.Utils;
 
 namespace DragonFruit.Six.API
 {

diff --git a/DragonFruit.Six.API/Utils/MathUtils.cs b/DragonFruit.Six.API/Utils/MathUtils.cs
@@ -0,0 +1,77 @@
+// Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
+// Licensed under Apache-2. Please refer to the LICENSE file for more info
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace DragonFruit.Six.API.Utils
+{
+    /// <summary>
+    /// Functions from the <see cref="Math"/> class from .NET Standard 2
+    /// </summary>
+    /// <remarks>
+    /// Taken from https://source.dot.net/#System.Private.CoreLib/Math.cs (MIT)
+    /// </remarks>
+    internal static class MathUtils
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static double Clamp(double value, double min, double max)
+        {
+            if (min > max)
+            {
+                throw new ArgumentException();
+            }
+
+            if (value < min)
+            {
+                return min;
+            }
+            else if (value > max)
+            {
+                return max;
+            }
+
+            return value;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int Clamp(int value, int min, int max)
+        {
+            if (min > max)
+            {
+                throw new ArgumentException();
+            }
+
+            if (value < min)
+            {
+                return min;
+            }
+            else if (value > max)
+            {
+                return max;
+            }
+
+            return value;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Clamp(float value, float min, float max)
+        {
+            if (min > max)
+            {
+                throw new ArgumentException();
+            }
+
+            if (value < min)
+            {
+                return min;
+            }
+            else if (value > max)
+            {
+                return max;
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/DragonFruit.Six.API/Helpers/OperatorData.cs → DragonFruit.Six.API/Utils/OperatorData.cs b/DragonFruit.Six.API/Helpers/OperatorData.cs → DragonFruit.Six.API/Utils/OperatorData.cs
@@ -12,7 +12,7 @@
 using DragonFruit.Six.API.Enums;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Helpers
+namespace DragonFruit.Six.API.Utils
 {
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     public static class OperatorData

diff --git a/...onFruit.Six.API/Helpers/PlatformParser.cs → DragonFruit.Six.API/Utils/PlatformParser.cs b/...onFruit.Six.API/Helpers/PlatformParser.cs → DragonFruit.Six.API/Utils/PlatformParser.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using DragonFruit.Six.API.Enums;
 
-namespace DragonFruit.Six.API.Helpers
+namespace DragonFruit.Six.API.Utils
 {
     public static class PlatformParser
     {
@@ -14,7 +14,7 @@ public static class PlatformParser
         /// </summary>
         public static Platform GetPlatform(string platformId)
         {
-            return Enum.Parse<Platform>(platformId, true);
+            return (Platform)Enum.Parse(typeof(Platform), platformId, true);
         }
 
         /// <summary>

diff --git a/...uit.Six.API/Helpers/UbisoftIdentifiers.cs → ...Fruit.Six.API/Utils/UbisoftIdentifiers.cs b/...uit.Six.API/Helpers/UbisoftIdentifiers.cs → ...Fruit.Six.API/Utils/UbisoftIdentifiers.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using DragonFruit.Six.API.Enums;
 
-namespace DragonFruit.Six.API.Helpers
+namespace DragonFruit.Six.API.Utils
 {
     public static class UbisoftIdentifiers
     {