refactor appcenter

YaeAchievement.csproj

@@ -24,13 +24,11 @@
         <PackageReference Include="Google.Protobuf" Version="3.22.1" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta">
           <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Grpc.Tools" Version="2.53.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     </ItemGroup>
 
     <ItemGroup>

src/AppCenterSDK/AppCenter.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
+using System.Net;
-using System.Net;
+using System.Net.Http.Json;
 using YaeAchievement.AppCenterSDK.Models;
 using YaeAchievement.AppCenterSDK.Models.Serialization;
 
@@ -39,12 +39,6 @@ public static class AppCenter {
         AppDomain.CurrentDomain.ProcessExit += (_, _) => {
             running = false;
         };
-        LogSerializer.AddLogType(PageLog.JsonIdentifier, typeof(PageLog));
-        LogSerializer.AddLogType(EventLog.JsonIdentifier, typeof(EventLog));
-        LogSerializer.AddLogType(HandledErrorLog.JsonIdentifier, typeof(HandledErrorLog));
-        LogSerializer.AddLogType(ManagedErrorLog.JsonIdentifier, typeof(ManagedErrorLog));
-        LogSerializer.AddLogType(StartServiceLog.JsonIdentifier, typeof(StartServiceLog));
-        LogSerializer.AddLogType(StartSessionLog.JsonIdentifier, typeof(StartSessionLog));
     }
     
     // ReSharper restore InconsistentNaming
@@ -59,8 +53,8 @@ public static class AppCenter {
             using var uploadContent = new StringContent(Queue.ToJson());
             try {
                 using var response = httpClient.Value.PostAsync(ApiUrl, uploadContent).Result;
-                var result = response.Content.ReadAsStringAsync().Result;
+                var result = response.Content.ReadFromJsonAsync<LogUploadResult>().GetAwaiter().GetResult();
-                uploadStatus = JsonConvert.DeserializeObject<LogUploadResult>(result)!.Status;
+                uploadStatus = result!.Status;
             } catch (Exception) {
                 // ignored
             }

src/AppCenterSDK/Models/Device.cs

@@ -1,51 +1,36 @@
 using System.Globalization;
 using System.Reflection;
-using Newtonsoft.Json;
 
 namespace YaeAchievement.AppCenterSDK.Models;
 
 public class Device {
     
-    [JsonProperty(PropertyName = "sdkName")]
     public string SdkName { get; set; } = "appcenter.wpf.netcore";
 
-    [JsonProperty(PropertyName = "sdkVersion")]
     public string SdkVersion { get; set; } = "4.5.0";
 
-    [JsonProperty(PropertyName = "osName")]
     public string OsName { get; set; } = "WINDOWS";
 
-    [JsonProperty(PropertyName = "osVersion")]
     public string OsVersion { get; set; } = DeviceHelper.GetSystemVersion();
 
-    [JsonProperty(PropertyName = "osBuild")]
     public string OsBuild { get; set; } = $"{DeviceHelper.GetSystemVersion()}.{DeviceHelper.GetSystemBuild()}";
 
-    [JsonProperty(PropertyName = "model")] 
     public string? Model { get; set; } = DeviceHelper.GetModel();
 
-    [JsonProperty(PropertyName = "oemName")]
     public string? OemName { get; set; } = DeviceHelper.GetOem();
 
-    [JsonProperty(PropertyName = "screenSize")]
     public string ScreenSize { get; set; } = DeviceHelper.GetScreenSize();
 
-    [JsonProperty(PropertyName = "carrierCountry")]
+    public string CarrierCountry { get; set; } = DeviceHelper.GetCountry() ?? "CN";
-    public string Country { get; set; } = DeviceHelper.GetCountry() ?? "CN";
 
-    [JsonProperty(PropertyName = "locale")]
     public string Locale { get; set; } = CultureInfo.CurrentCulture.Name;
 
-    [JsonProperty(PropertyName = "timeZoneOffset")]
     public int TimeZoneOffset { get; set; } = (int) TimeZoneInfo.Local.BaseUtcOffset.TotalMinutes;
 
-    [JsonProperty(PropertyName = "appVersion")]
     public string AppVersion { get; set; } = GlobalVars.AppVersionName;
 
-    [JsonProperty(PropertyName = "appBuild")]
     public string AppBuild { get; set; } = GlobalVars.AppVersionCode.ToString();
 
-    [JsonProperty(PropertyName = "appNamespace")]
     public string AppNamespace { get; set; } = Assembly.GetEntryAssembly()?.EntryPoint?.DeclaringType?.Namespace ?? string.Empty;
     
 }

src/AppCenterSDK/Models/EventLog.cs

@@ -1,20 +1,14 @@
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
-public class EventLog : LogWithProperties {
+public class EventLog(string name) : LogWithProperties {
     
     public const string JsonIdentifier = "event";
 
-    public EventLog(string name) {
+    public Guid Id { get; set; } = Guid.NewGuid();
-        Name = name;
-    }
-
-    [JsonProperty(PropertyName = "id")]
-    private Guid Id { get; set; } = Guid.NewGuid();
-
-    [JsonProperty(PropertyName = "name")]
-    private string Name { get; set; }
 
+    public string Name { get; set; } = name;
+    
 }

src/AppCenterSDK/Models/HandledErrorLog.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
 public class HandledErrorLog : LogWithProperties {
     
     public const string JsonIdentifier = "handledError";
@@ -12,10 +12,8 @@ public class HandledErrorLog : LogWithProperties {
         Exception = exception;
     }
 
-    [JsonProperty(PropertyName = "id")]
     public Guid? Id { get; set; }
     
-    [JsonProperty(PropertyName = "exception")]
     public MException Exception { get; set; }
     
 }

src/AppCenterSDK/Models/Log.cs

@@ -1,17 +1,15 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
 public abstract class Log {
 
-    [JsonProperty(PropertyName = "sid")]
+    [JsonPropertyName("sid")]
-    private Guid? Session { get; set; } = AppCenter.SessionID;
+    public Guid? Session { get; set; } = AppCenter.SessionID;
     
-    [JsonProperty(PropertyName = "timestamp")]
+    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
-    private DateTime Timestamp { get; set; } = DateTime.UtcNow;
     
-    [JsonProperty(PropertyName = "device")]
+    public Device Device { get; set; } = AppCenter.DeviceInfo;
-    private Device Device { get; set; } = AppCenter.DeviceInfo;
 
     [JsonIgnore]
     internal LogStatus Status = LogStatus.Pending;

src/AppCenterSDK/Models/LogContainer.cs

@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
+namespace YaeAchievement.AppCenterSDK.Models; 
-
-namespace YaeAchievement.AppCenterSDK.Models; 
 
 public class LogContainer {
     
@@ -8,7 +6,6 @@ public class LogContainer {
         Logs = logs;
     }
 
-    [JsonProperty(PropertyName = "logs")]
     public IEnumerable<Log> Logs { get; set; }
     
 }

src/AppCenterSDK/Models/LogUploadResult.cs

@@ -1,19 +1,13 @@
-using Newtonsoft.Json;
+namespace YaeAchievement.AppCenterSDK.Models; 
-
-namespace YaeAchievement.AppCenterSDK.Models; 
 
 public class LogUploadResult {
     
-    [JsonProperty(PropertyName = "status")]
     public string Status { get; set; } = null!;
 
-    [JsonProperty(PropertyName = "validDiagnosticsIds")]
     public Guid[] ValidDiagnosticsIds { get; set; } = Array.Empty<Guid>();
 
-    [JsonProperty(PropertyName = "throttledDiagnosticsIds")]
     public Guid[] ThrottledDiagnosticsIds { get; set; } = Array.Empty<Guid>();
 
-    [JsonProperty(PropertyName = "correlationId")]
     public Guid CorrelationId { get; set; }
 
 }

src/AppCenterSDK/Models/LogWithProperties.cs

@@ -1,10 +1,7 @@
-using Newtonsoft.Json;
+namespace YaeAchievement.AppCenterSDK.Models; 
-
-namespace YaeAchievement.AppCenterSDK.Models; 
 
 public class LogWithProperties : Log {
     
-    [JsonProperty(PropertyName = "properties")]
     public IDictionary<string, string> Properties { get; set; } = new Dictionary<string, string>();
 
 }

src/AppCenterSDK/Models/MException.cs

@@ -1,22 +1,15 @@
-using Newtonsoft.Json;
+namespace YaeAchievement.AppCenterSDK.Models; 
-
-namespace YaeAchievement.AppCenterSDK.Models; 
 
 public class MException {
 
-    [JsonProperty(PropertyName = "type")]
     public string Type { get; set; } = "UnknownType";
 
-    [JsonProperty(PropertyName = "message")]
     public string? Message { get; set; }
 
-    [JsonProperty(PropertyName = "stackTrace")]
     public string? StackTrace { get; set; }
 
-    [JsonProperty(PropertyName = "frames")]
     public IList<StackFrame>? Frames { get; set; }
 
-    [JsonProperty(PropertyName = "innerExceptions")]
     public IList<MException>? InnerExceptions { get; set; }
 
 }

src/AppCenterSDK/Models/ManagedErrorLog.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics;
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
 public class ManagedErrorLog : Log {
     
     public const string JsonIdentifier = "managedError";
@@ -23,28 +23,20 @@ public class ManagedErrorLog : Log {
         AppLaunchTimestamp = p.StartTime.ToUniversalTime();
     }
 
-    [JsonProperty(PropertyName = "id")] 
     public Guid Id { get; set; }
 
-    [JsonProperty(PropertyName = "userId")]
     public string? UserId { get; set; }
 
-    [JsonProperty(PropertyName = "processId")]
     public int ProcessId { get; set; }
 
-    [JsonProperty(PropertyName = "processName")]
     public string ProcessName { get; set; }
 
-    [JsonProperty(PropertyName = "fatal")]
     public bool Fatal { get; set; }
 
-    [JsonProperty(PropertyName = "appLaunchTimestamp")]
     public DateTime? AppLaunchTimestamp { get; set; }
 
-    [JsonProperty(PropertyName = "architecture")]
     public string? Architecture { get; set; }
 
-    [JsonProperty(PropertyName = "exception")]
     public MException Exception { get; set; }
 
 }

src/AppCenterSDK/Models/PageLog.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
 public class PageLog : LogWithProperties {
     
     public const string JsonIdentifier = "page";
@@ -11,7 +11,6 @@ public class PageLog : LogWithProperties {
         Name = name;
     }
 
-    [JsonProperty(PropertyName = "name")]
     public string Name { get; set; }
     
 }

src/AppCenterSDK/Models/Serialization/Attributes.cs

@@ -0,0 +1,8 @@
+namespace YaeAchievement.AppCenterSDK.Models.Serialization;
+
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class LogIdAttribute(string id) : Attribute {
+    
+    public string Id { get; } = id;
+    
+}

src/AppCenterSDK/Models/Serialization/LogJsonConverter.cs

@@ -1,60 +1,49 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+using System.Reflection;
-// Licensed under the MIT License.
+using System.Text.Json;
-
+using System.Text.Json.Serialization;
-using System.Reflection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace YaeAchievement.AppCenterSDK.Models.Serialization;
 
-#pragma warning disable CS8604, CS8765
+public class GuidConverter : JsonConverter<Guid> {
-public class LogJsonConverter : JsonConverter {
+
+    public static GuidConverter Instance { get; } = new ();
     
-    private readonly Dictionary<string, Type> _logTypes = new ();
+    public override Guid Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
-    private readonly object _jsonConverterLock = new ();
+        throw new NotSupportedException();
-    private static readonly JsonSerializerSettings SerializationSettings;
+    }
+
+    public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options) {
+        writer.WriteStringValue(value.ToString("D"));
+    }
+}
+
+public class LogJsonConverter : JsonConverter<Log> {
+    
+    public static LogJsonConverter Instance { get; } = new ();
+
+    private static readonly JsonSerializerOptions SerializationSettings;
 
     static LogJsonConverter() {
-        SerializationSettings = new JsonSerializerSettings {
+        SerializationSettings = new JsonSerializerOptions {
-            Formatting = Formatting.None,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            NullValueHandling = NullValueHandling.Ignore,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            ReferenceHandler = ReferenceHandler.IgnoreCycles,
-            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
-            ReferenceLoopHandling = ReferenceLoopHandling.Serialize
         };
     }
 
-    public void AddLogType(string typeName, Type type) {
+    public override bool CanConvert(Type objectType) => typeof(Log).IsAssignableFrom(objectType);
-        lock (_jsonConverterLock) {
+
-            _logTypes[typeName] = type;
+    public override Log Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
-        }
+        throw new NotSupportedException();
     }
 
-    public override bool CanConvert(Type objectType) {
+    public override void Write(Utf8JsonWriter writer, Log value, JsonSerializerOptions options) {
-        return typeof(Log).IsAssignableFrom(objectType);
+        var attr = value.GetType().GetCustomAttribute<LogIdAttribute>();
-    }
+        if (attr == null) {
-
+            throw new JsonException("Log type is missing LogTypeAttribute");
-    public override object? ReadJson(JsonReader reader, Type t, object o, JsonSerializer s) {
-        Type logType;
-        var jsonObject = JObject.Load(reader);
-        var typeName = jsonObject.GetValue("type")?.ToString();
-        lock (_jsonConverterLock) {
-            if (typeName == null || !_logTypes.ContainsKey(typeName)) {
-                throw new JsonReaderException("Could not identify type of log");
-            }
-            logType = _logTypes[typeName];
-            jsonObject.Remove("type");
         }
-        return jsonObject.ToObject(logType);
+        var cNode = JsonSerializer.SerializeToNode((object) value, SerializationSettings)!;
-    }
+        cNode["type"] = attr.Id;
-
+        writer.WriteRawValue(cNode.ToString());
-    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) {
-        var info = value.GetType().GetTypeInfo();
-        if (info.GetCustomAttribute(typeof(JsonObjectAttribute)) is not JsonObjectAttribute attribute) {
-            throw new JsonWriterException("Log type is missing JsonObjectAttribute");
-        }
-        var jsonObject = JObject.FromObject(value, JsonSerializer.CreateDefault(SerializationSettings));
-        jsonObject.Add("type", JToken.FromObject(attribute.Id));
-        writer.WriteRawValue(jsonObject.ToString(Formatting.None));
     }
 }

src/AppCenterSDK/Models/Serialization/LogSerializer.cs

@@ -1,40 +1,25 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+using System.Text.Json;
-// Licensed under the MIT License.
+using System.Text.Json.Serialization;
-
-using Newtonsoft.Json;
 
 namespace YaeAchievement.AppCenterSDK.Models.Serialization;
 
-#pragma warning disable CS8604, CS8765, CS8603
 public static class LogSerializer {
     
-    private static readonly JsonSerializerSettings SerializationSettings;
+    private static readonly JsonSerializerOptions SerializationSettings;
-    private static readonly LogJsonConverter Converter = new ();
 
     static LogSerializer() {
-        SerializationSettings = new JsonSerializerSettings {
+        SerializationSettings = new JsonSerializerOptions {
-            Formatting = Formatting.None,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            NullValueHandling = NullValueHandling.Ignore,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            ReferenceHandler = ReferenceHandler.IgnoreCycles,
-            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            Converters = {
-            ReferenceLoopHandling = ReferenceLoopHandling.Serialize,
+                GuidConverter.Instance,
-            Converters = { Converter }
+                LogJsonConverter.Instance,
+            }
         };
     }
-
-    public static void AddLogType(string typeName, Type type) {
-        Converter.AddLogType(typeName, type);
-    }
     
     public static string Serialize(LogContainer logContainer) {
-        return JsonConvert.SerializeObject(logContainer, SerializationSettings);
+        return JsonSerializer.Serialize(logContainer, SerializationSettings);
-    }
-
-    public static string Serialize(Log log) {
-        return JsonConvert.SerializeObject(log, SerializationSettings);
-    }
-    
-    public static LogContainer? DeserializeLogs(string json) {
-        return JsonConvert.DeserializeObject<LogContainer>(json, SerializationSettings);
     }
 }

src/AppCenterSDK/Models/StackFrame.cs

@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
+namespace YaeAchievement.AppCenterSDK.Models; 
-
-namespace YaeAchievement.AppCenterSDK.Models; 
 
 public class StackFrame {
     
@@ -13,22 +11,16 @@ public class StackFrame {
         FileName = fileName;
     }
 
-    [JsonProperty(PropertyName = "address")]
     public string Address { get; set; }
 
-    [JsonProperty(PropertyName = "code")]
     public string Code { get; set; }
 
-    [JsonProperty(PropertyName = "className")]
     public string ClassName { get; set; }
 
-    [JsonProperty(PropertyName = "methodName")]
     public string MethodName { get; set; }
 
-    [JsonProperty(PropertyName = "lineNumber")]
     public int? LineNumber { get; set; }
 
-    [JsonProperty(PropertyName = "fileName")]
     public string FileName { get; set; }
     
 }

src/AppCenterSDK/Models/StartServiceLog.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
 public class StartServiceLog : Log {
     
     public const string JsonIdentifier = "startService";
@@ -11,7 +11,6 @@ public class StartServiceLog : Log {
         Services = services;
     }
     
-    [JsonProperty(PropertyName = "services")]
     public string[] Services { get; set; }
     
 }

src/AppCenterSDK/Models/StartSessionLog.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using YaeAchievement.AppCenterSDK.Models.Serialization;
 
 namespace YaeAchievement.AppCenterSDK.Models; 
 
-[JsonObject(JsonIdentifier)]
+[LogId(JsonIdentifier)]
 public class StartSessionLog : Log {
     public const string JsonIdentifier = "startSession";
 }