From 62a14b01bdc03c0a818c956a4c513739b661e8e2 Mon Sep 17 00:00:00 2001 From: Albie Date: Fri, 17 Dec 2021 20:44:20 +0000 Subject: [PATCH 1/2] update libraries --- DragonFruit.Six.Api.Tests/DragonFruit.Six.Api.Tests.csproj | 2 +- DragonFruit.Six.Api/DragonFruit.Six.Api.csproj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DragonFruit.Six.Api.Tests/DragonFruit.Six.Api.Tests.csproj b/DragonFruit.Six.Api.Tests/DragonFruit.Six.Api.Tests.csproj index 9acf5fd4..bc3a772c 100644 --- a/DragonFruit.Six.Api.Tests/DragonFruit.Six.Api.Tests.csproj +++ b/DragonFruit.Six.Api.Tests/DragonFruit.Six.Api.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj b/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj index 695bd209..ada45705 100644 --- a/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj +++ b/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj @@ -29,7 +29,8 @@ - + + From 004833c8935e95640a48754c35d2307f0ee8a5e8 Mon Sep 17 00:00:00 2001 From: Albie Date: Fri, 17 Dec 2021 20:45:09 +0000 Subject: [PATCH 2/2] update data library and change namespaces --- .../Deserializers/AccountActivityDeserializer.cs | 2 +- DragonFruit.Six.Api/Deserializers/AccountInfoDeserializer.cs | 2 +- DragonFruit.Six.Api/Deserializers/GeneralStatsDeserializer.cs | 2 +- .../Deserializers/OperatorStatsDeserializer.cs | 2 +- DragonFruit.Six.Api/Deserializers/SeasonStatsDeserializer.cs | 2 +- DragonFruit.Six.Api/Deserializers/TokenDeserializer.cs | 2 +- DragonFruit.Six.Api/Deserializers/WeaponStatsDeserializer.cs | 2 +- DragonFruit.Six.Api/Dragon6Client.cs | 4 ++-- DragonFruit.Six.Api/Dragon6DeveloperClient.cs | 4 ++-- DragonFruit.Six.Api/Extensions/PlatformStatsExtensions.cs | 2 +- DragonFruit.Six.Api/Extensions/ServerStatusExtensions.cs | 2 +- DragonFruit.Six.Api/Extensions/UbisoftTokenExtensions.cs | 2 +- DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs | 2 +- DragonFruit.Six.Api/Requests/AccountActivityRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/AccountInfoRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/BasicStatsRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/DeveloperApiRequest.cs | 2 +- DragonFruit.Six.Api/Requests/GeolocationRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/HinaClientCredentialsRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/OperatorDataRequest.cs | 2 +- DragonFruit.Six.Api/Requests/PlayerLevelStatsRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/SeasonStatsRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/ServerStatusRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/TokenRequest.cs | 4 ++-- DragonFruit.Six.Api/Requests/UbiApiRequest.cs | 2 +- DragonFruit.Six.Api/Utils/OperatorData.cs | 4 ++-- 26 files changed, 38 insertions(+), 38 deletions(-) diff --git a/DragonFruit.Six.Api/Deserializers/AccountActivityDeserializer.cs b/DragonFruit.Six.Api/Deserializers/AccountActivityDeserializer.cs index 03c1c637..1e169ff8 100644 --- a/DragonFruit.Six.Api/Deserializers/AccountActivityDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/AccountActivityDeserializer.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Containers; using DragonFruit.Six.Api.Strings; diff --git a/DragonFruit.Six.Api/Deserializers/AccountInfoDeserializer.cs b/DragonFruit.Six.Api/Deserializers/AccountInfoDeserializer.cs index 346f849a..8b792152 100644 --- a/DragonFruit.Six.Api/Deserializers/AccountInfoDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/AccountInfoDeserializer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Containers; using DragonFruit.Six.Api.Strings; diff --git a/DragonFruit.Six.Api/Deserializers/GeneralStatsDeserializer.cs b/DragonFruit.Six.Api/Deserializers/GeneralStatsDeserializer.cs index 25061ab8..9fa1adda 100644 --- a/DragonFruit.Six.Api/Deserializers/GeneralStatsDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/GeneralStatsDeserializer.cs @@ -2,7 +2,7 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Containers; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Strings; diff --git a/DragonFruit.Six.Api/Deserializers/OperatorStatsDeserializer.cs b/DragonFruit.Six.Api/Deserializers/OperatorStatsDeserializer.cs index 28fdd540..fa58e182 100644 --- a/DragonFruit.Six.Api/Deserializers/OperatorStatsDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/OperatorStatsDeserializer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Strings; using DragonFruit.Six.Api.Strings.Stats; diff --git a/DragonFruit.Six.Api/Deserializers/SeasonStatsDeserializer.cs b/DragonFruit.Six.Api/Deserializers/SeasonStatsDeserializer.cs index a0cfe0e7..e5902c73 100644 --- a/DragonFruit.Six.Api/Deserializers/SeasonStatsDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/SeasonStatsDeserializer.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Strings; using DragonFruit.Six.Api.Enums; diff --git a/DragonFruit.Six.Api/Deserializers/TokenDeserializer.cs b/DragonFruit.Six.Api/Deserializers/TokenDeserializer.cs index 6e45823f..c41eade3 100644 --- a/DragonFruit.Six.Api/Deserializers/TokenDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/TokenDeserializer.cs @@ -1,7 +1,7 @@ // Dragon6 API Copyright 2020 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Containers; using DragonFruit.Six.Api.Exceptions; diff --git a/DragonFruit.Six.Api/Deserializers/WeaponStatsDeserializer.cs b/DragonFruit.Six.Api/Deserializers/WeaponStatsDeserializer.cs index d7fdfecc..719b2192 100644 --- a/DragonFruit.Six.Api/Deserializers/WeaponStatsDeserializer.cs +++ b/DragonFruit.Six.Api/Deserializers/WeaponStatsDeserializer.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Strings; using DragonFruit.Six.Api.Enums; diff --git a/DragonFruit.Six.Api/Dragon6Client.cs b/DragonFruit.Six.Api/Dragon6Client.cs index 9e3faab3..38ec4d5f 100644 --- a/DragonFruit.Six.Api/Dragon6Client.cs +++ b/DragonFruit.Six.Api/Dragon6Client.cs @@ -6,8 +6,8 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Serializers; +using DragonFruit.Data; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Tokens; using DragonFruit.Six.Api.Enums; using DragonFruit.Six.Api.Exceptions; diff --git a/DragonFruit.Six.Api/Dragon6DeveloperClient.cs b/DragonFruit.Six.Api/Dragon6DeveloperClient.cs index 0ac5bfdd..acbd7718 100644 --- a/DragonFruit.Six.Api/Dragon6DeveloperClient.cs +++ b/DragonFruit.Six.Api/Dragon6DeveloperClient.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data; +using DragonFruit.Data.Extensions; using DragonFruit.Six.Api.Requests; using DragonFruit.Six.Api.Tokens; using Newtonsoft.Json.Linq; diff --git a/DragonFruit.Six.Api/Extensions/PlatformStatsExtensions.cs b/DragonFruit.Six.Api/Extensions/PlatformStatsExtensions.cs index 9ad5d51a..f749e552 100644 --- a/DragonFruit.Six.Api/Extensions/PlatformStatsExtensions.cs +++ b/DragonFruit.Six.Api/Extensions/PlatformStatsExtensions.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using DragonFruit.Common.Data; +using DragonFruit.Data; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Requests; using Newtonsoft.Json.Linq; diff --git a/DragonFruit.Six.Api/Extensions/ServerStatusExtensions.cs b/DragonFruit.Six.Api/Extensions/ServerStatusExtensions.cs index 66f733b1..74df12db 100644 --- a/DragonFruit.Six.Api/Extensions/ServerStatusExtensions.cs +++ b/DragonFruit.Six.Api/Extensions/ServerStatusExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using DragonFruit.Common.Data; +using DragonFruit.Data; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Requests; diff --git a/DragonFruit.Six.Api/Extensions/UbisoftTokenExtensions.cs b/DragonFruit.Six.Api/Extensions/UbisoftTokenExtensions.cs index fc75666c..9ed317e9 100644 --- a/DragonFruit.Six.Api/Extensions/UbisoftTokenExtensions.cs +++ b/DragonFruit.Six.Api/Extensions/UbisoftTokenExtensions.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -using DragonFruit.Common.Data; +using DragonFruit.Data; using DragonFruit.Six.Api.Requests; using DragonFruit.Six.Api.Tokens; diff --git a/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs b/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs index ca3d7641..b1c557f5 100644 --- a/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs +++ b/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -using DragonFruit.Common.Data; +using DragonFruit.Data; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Requests; diff --git a/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs b/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs index ee391dca..b21ebd65 100644 --- a/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs +++ b/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Utils; diff --git a/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs b/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs index 4ae6ab1c..a8bfe27d 100644 --- a/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs +++ b/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Enums; using DragonFruit.Six.Api.Utils; diff --git a/DragonFruit.Six.Api/Requests/BasicStatsRequest.cs b/DragonFruit.Six.Api/Requests/BasicStatsRequest.cs index 2b2589a6..b3397b49 100644 --- a/DragonFruit.Six.Api/Requests/BasicStatsRequest.cs +++ b/DragonFruit.Six.Api/Requests/BasicStatsRequest.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Utils; diff --git a/DragonFruit.Six.Api/Requests/DeveloperApiRequest.cs b/DragonFruit.Six.Api/Requests/DeveloperApiRequest.cs index 6c691ae8..540d8c1f 100644 --- a/DragonFruit.Six.Api/Requests/DeveloperApiRequest.cs +++ b/DragonFruit.Six.Api/Requests/DeveloperApiRequest.cs @@ -1,7 +1,7 @@ // Dragon6 API Copyright 2020 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data; +using DragonFruit.Data; namespace DragonFruit.Six.Api.Requests { diff --git a/DragonFruit.Six.Api/Requests/GeolocationRequest.cs b/DragonFruit.Six.Api/Requests/GeolocationRequest.cs index 64a43aa6..20155bde 100644 --- a/DragonFruit.Six.Api/Requests/GeolocationRequest.cs +++ b/DragonFruit.Six.Api/Requests/GeolocationRequest.cs @@ -1,8 +1,8 @@ // Dragon6 API Copyright 2020 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data; +using DragonFruit.Data.Extensions; using DragonFruit.Six.Api.Enums; using DragonFruit.Six.Api.Utils; diff --git a/DragonFruit.Six.Api/Requests/HinaClientCredentialsRequest.cs b/DragonFruit.Six.Api/Requests/HinaClientCredentialsRequest.cs index 4053b881..70827100 100644 --- a/DragonFruit.Six.Api/Requests/HinaClientCredentialsRequest.cs +++ b/DragonFruit.Six.Api/Requests/HinaClientCredentialsRequest.cs @@ -1,8 +1,8 @@ // Dragon6 API Copyright 2021 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; namespace DragonFruit.Six.Api.Requests { diff --git a/DragonFruit.Six.Api/Requests/OperatorDataRequest.cs b/DragonFruit.Six.Api/Requests/OperatorDataRequest.cs index 5d82bb4c..50131cd1 100644 --- a/DragonFruit.Six.Api/Requests/OperatorDataRequest.cs +++ b/DragonFruit.Six.Api/Requests/OperatorDataRequest.cs @@ -1,7 +1,7 @@ // Dragon6 API Copyright 2020 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data; +using DragonFruit.Data; namespace DragonFruit.Six.Api.Requests { diff --git a/DragonFruit.Six.Api/Requests/PlayerLevelStatsRequest.cs b/DragonFruit.Six.Api/Requests/PlayerLevelStatsRequest.cs index e9277113..c4422c90 100644 --- a/DragonFruit.Six.Api/Requests/PlayerLevelStatsRequest.cs +++ b/DragonFruit.Six.Api/Requests/PlayerLevelStatsRequest.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Utils; diff --git a/DragonFruit.Six.Api/Requests/SeasonStatsRequest.cs b/DragonFruit.Six.Api/Requests/SeasonStatsRequest.cs index f9244aee..c6d69f2e 100644 --- a/DragonFruit.Six.Api/Requests/SeasonStatsRequest.cs +++ b/DragonFruit.Six.Api/Requests/SeasonStatsRequest.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Entities; #pragma warning disable 628 diff --git a/DragonFruit.Six.Api/Requests/ServerStatusRequest.cs b/DragonFruit.Six.Api/Requests/ServerStatusRequest.cs index fb7f6964..083deff6 100644 --- a/DragonFruit.Six.Api/Requests/ServerStatusRequest.cs +++ b/DragonFruit.Six.Api/Requests/ServerStatusRequest.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Parameters; +using DragonFruit.Data; +using DragonFruit.Data.Parameters; using DragonFruit.Six.Api.Utils; namespace DragonFruit.Six.Api.Requests diff --git a/DragonFruit.Six.Api/Requests/TokenRequest.cs b/DragonFruit.Six.Api/Requests/TokenRequest.cs index eec6260b..80538285 100644 --- a/DragonFruit.Six.Api/Requests/TokenRequest.cs +++ b/DragonFruit.Six.Api/Requests/TokenRequest.cs @@ -4,8 +4,8 @@ using System; using System.Net.Http; using System.Text; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Extensions; +using DragonFruit.Data; +using DragonFruit.Data.Extensions; namespace DragonFruit.Six.Api.Requests { diff --git a/DragonFruit.Six.Api/Requests/UbiApiRequest.cs b/DragonFruit.Six.Api/Requests/UbiApiRequest.cs index 491b6752..c5b39454 100644 --- a/DragonFruit.Six.Api/Requests/UbiApiRequest.cs +++ b/DragonFruit.Six.Api/Requests/UbiApiRequest.cs @@ -1,7 +1,7 @@ // Dragon6 API Copyright 2020 DragonFruit Network // Licensed under Apache-2. Please refer to the LICENSE file for more info -using DragonFruit.Common.Data; +using DragonFruit.Data; #nullable enable diff --git a/DragonFruit.Six.Api/Utils/OperatorData.cs b/DragonFruit.Six.Api/Utils/OperatorData.cs index 86f76bc2..4264c531 100644 --- a/DragonFruit.Six.Api/Utils/OperatorData.cs +++ b/DragonFruit.Six.Api/Utils/OperatorData.cs @@ -2,8 +2,8 @@ // Licensed under Apache-2. Please refer to the LICENSE file for more info using System.Collections.Generic; -using DragonFruit.Common.Data; -using DragonFruit.Common.Data.Services; +using DragonFruit.Data; +using DragonFruit.Data.Serializers.Newtonsoft; using DragonFruit.Six.Api.Entities; using DragonFruit.Six.Api.Requests;