deserialize string dictionary

GitTools · Jan 7, 2020 · b8b8858 · b8b8858
1 parent 21665b0
commit b8b8858
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/src/GitVersionExe.Tests/ExecutionResults.cs b/src/GitVersionExe.Tests/ExecutionResults.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using GitVersion.OutputVariables;
-using System.Text.Json;
+using GitVersionExe.Tests.Helpers;
 
 namespace GitVersionExe.Tests
 {
@@ -21,7 +21,7 @@ public virtual VersionVariables OutputVariables
         {
             get
             {
-                var outputVariables = JsonSerializer.Deserialize<Dictionary<string, string>>(Output);
+                var outputVariables = CustomJsonSerializer.Deserialize<Dictionary<string, string>>(Output);
                 return VersionVariables.FromDictionary(outputVariables);
             }
         }

diff --git a/src/GitVersionExe.Tests/Helpers/CustomJsonSerializer.cs b/src/GitVersionExe.Tests/Helpers/CustomJsonSerializer.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace GitVersionExe.Tests.Helpers
+{
+    public class CustomJsonSerializer
+    {
+        public static T Deserialize<T>(string json)
+        {
+            var data = JsonSerializer.Deserialize<T>(json);
+
+            if (data is Dictionary<string, object> odata)
+            {
+                var ndata = new Dictionary<string, object>();
+                foreach (var key in odata.Keys)
+                {
+                    var value = (JsonElement)odata[key];
+                    switch (value.ValueKind)
+                    {
+                        case JsonValueKind.Undefined:
+                            break;
+                        case JsonValueKind.Object:
+                            break;
+                        case JsonValueKind.Array:
+                            break;
+                        case JsonValueKind.String:
+                            ndata.Add(key, value.GetString());
+                            break;
+                        case JsonValueKind.Number:
+                            ndata.Add(key, value.GetInt64().ToString());
+                            break;
+                        case JsonValueKind.True:
+                            break;
+                        case JsonValueKind.False:
+                            break;
+                        case JsonValueKind.Null:
+                            break;
+                    }
+                }
+
+                if (ndata is T obj) return obj;
+            }
+
+            return data;
+        }
+    }
+}