Reducing the Json type down to the base JToken object to support primitives as well (needed by Excel). Also, preventing the Microsoft.Graph.Json object from being generated at all.

Author: Robert Anderson

src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs

@@ -134,7 +134,7 @@ public static string GetTypeString(this string type)
                 case "date":
                     return "Date";
                 case "json":
-                    return "Newtonsoft.Json.Linq.JObject";
+                    return "Newtonsoft.Json.Linq.JToken";
                 default:
                     return type.ToCheckedCase();
             }

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -42,7 +42,7 @@ private static OdcmNamespace GetOdcmNamespace(OdcmModel model)
         public static IEnumerable<OdcmClass> GetComplexTypes(this OdcmModel model)
         {
             var @namespace = GetOdcmNamespace(model);
-            return @namespace.Classes.Where(x => x is OdcmComplexClass);
+            return @namespace.Classes.Where(x => x is OdcmComplexClass && x.CanonicalName() != "microsoft.graph.Json");
         }
 
         public static IEnumerable<OdcmClass> GetEntityTypes(this OdcmModel model)