fix enum deserialization with System.Text.Json

MingweiSamuel · Nov 1, 2019 · 4f6a27e · 4f6a27e
1 parent 5e8e472
commit 4f6a27e
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 13 deletions.
diff --git a/Camille/Camille.csproj b/Camille/Camille.csproj
@@ -52,7 +52,7 @@
     <PackageReference Include="System.Text.Json" Version="4.6.0" />
   </ItemGroup>
   <!-- System.ComponentModel.DataAnnotations from Nuget. -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netstandard2.1k '">
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
   </ItemGroup>
 

diff --git a/Camille/gen/Enums/Champion.cs.dt b/Camille/gen/Enums/Champion.cs.dt
@@ -23,6 +23,9 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// Champion enum based on ChampionIds.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Champion : int
     {
 {{

diff --git a/Camille/gen/Enums/GameMode.cs.dt b/Camille/gen/Enums/GameMode.cs.dt
@@ -13,12 +13,15 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// GameModes enum based on gameModes.json.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum GameMode
     {
 {{
     for (let { gameMode, description } of gameModes) {
 }}
-        [Display(Name = "{{= gameMode}}", Description = "{{= description}}")]
+        [Display(Name = "{{= gameMode }}", Description = "{{= description }}")]
         {{= enumName(gameMode) }},
 {{
     }

diff --git a/Camille/gen/Enums/GameType.cs.dt b/Camille/gen/Enums/GameType.cs.dt
@@ -13,6 +13,9 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// GameTypes enum based on gameTypes.json.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum GameType
     {
 {{

diff --git a/Camille/gen/Enums/Map.cs.dt b/Camille/gen/Enums/Map.cs.dt
@@ -13,6 +13,9 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// Maps enum based on maps.json.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Map
     {
 {{

diff --git a/Camille/gen/Enums/Queue.cs.dt b/Camille/gen/Enums/Queue.cs.dt
@@ -13,6 +13,9 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// Queues enum based on queues.json.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Queue
     {
 {{

diff --git a/Camille/gen/Enums/Season.cs.dt b/Camille/gen/Enums/Season.cs.dt
@@ -14,6 +14,9 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// Seasons enum based on Seasons.json.
     /// </summary>
+#if USE_SYSTEXTJSON
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Season
     {
 {{

diff --git a/Camille/src/Enums/Division.cs b/Camille/src/Enums/Division.cs
@@ -2,13 +2,15 @@
 
 namespace MingweiSamuel.Camille.Enums
 {
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Division : byte
     {
         I = 1,
         II = 2,
         III = 3,
         IV = 4,
-        [Obsolete]
-        V = 5
+        [Obsolete] V = 5
     }
 }
diff --git a/Camille/src/Enums/GameResult.cs b/Camille/src/Enums/GameResult.cs
@@ -1,5 +1,8 @@
 namespace MingweiSamuel.Camille.Enums
 {
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum GameResult
     {
         /// <summary>Win string for TeamStats#win. "Win".</summary>

diff --git a/Camille/src/Enums/Locale.cs b/Camille/src/Enums/Locale.cs
@@ -3,6 +3,9 @@
 
 namespace MingweiSamuel.Camille.Enums
 {
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Locale
     {
         en_US,

diff --git a/Camille/src/Enums/Position.cs b/Camille/src/Enums/Position.cs
@@ -5,7 +5,8 @@ namespace MingweiSamuel.Camille.Enums
     /// <summary>
     /// Roles used for positional ranks.
     /// </summary>
-    [Obsolete("Check: https://riot-api-libraries.readthedocs.io/en/latest/roleid.html for a better way to figure out where somebody played")]
+    [Obsolete(
+        "Check: https://riot-api-libraries.readthedocs.io/en/latest/roleid.html for a better way to figure out where somebody played")]
     public static class Position
     {
         /// <summary>

diff --git a/Camille/src/Enums/QueueType.cs b/Camille/src/Enums/QueueType.cs
@@ -1,8 +1,13 @@
-namespace MingweiSamuel.Camille.Enums {
-  public enum QueueType {
-    RANKED_SOLO_5x5 = 420,
-    RANKED_TFT = 1100,
-    RANKED_FLEX_SR = 440,
-    RANKED_FLEX_TT = 470
-  }
-}
+namespace MingweiSamuel.Camille.Enums
+{
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
+    public enum QueueType
+    {
+        RANKED_SOLO_5x5 = 420,
+        RANKED_TFT = 1100,
+        RANKED_FLEX_SR = 440,
+        RANKED_FLEX_TT = 470
+    }
+}
diff --git a/Camille/src/Enums/Region.cs b/Camille/src/Enums/Region.cs
@@ -3,6 +3,9 @@
 
 namespace MingweiSamuel.Camille.Enums
 {
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Region
     {
         /// <summary>Brazil.</summary>

diff --git a/Camille/src/Enums/Team.cs b/Camille/src/Enums/Team.cs
@@ -1,5 +1,8 @@
 namespace MingweiSamuel.Camille.Enums
 {
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Team
     {
         /// <summary>Team ID for Summoner's Rift blue side (100).</summary>

diff --git a/Camille/src/Enums/Tier.cs b/Camille/src/Enums/Tier.cs
@@ -3,6 +3,9 @@
     /// <summary>
     /// Contains tier names (CHALLENGER, MASTER, etc.)
     /// </summary>
+#if USE_SYSTEXTJSON
+  [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
+#endif
     public enum Tier
     {
         CHALLENGER,