Skip to content

Commit b4b3484

Browse files
committed
fix json context generators
1 parent a83899b commit b4b3484

6 files changed

Lines changed: 15 additions & 11 deletions

File tree

Project-Aurora/AuroraDeviceManager/ConfigManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Text.Json;
44
using AuroraDeviceManager.AuroraMigration;
55
using AuroraDeviceManager.Devices;
6-
using AuroraDeviceManager.Utils;
76
using Common;
87
using Common.Devices;
98
using Common.Utils;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.Text.Json.Serialization;
2+
using Common.Devices;
3+
using Common.Devices.RGBNet;
4+
5+
namespace AuroraDeviceManager;
6+
7+
[JsonSourceGenerationOptions(WriteIndented = true)]
8+
[JsonSerializable(typeof(DeviceConfig))]
9+
[JsonSerializable(typeof(CurrentDevices))]
10+
[JsonSerializable(typeof(DeviceMappingConfig))]
11+
[JsonSerializable(typeof(VariableRegistryItem))]
12+
public partial class DevicesJsonContext : JsonSerializerContext;

Project-Aurora/Project-Aurora/Settings/ApplicationSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace AuroraRgb.Settings;
77

8+
[JsonSerializable(typeof(SensitiveData))]
89
[JsonSerializable(typeof(ApplicationSettings))]
910
[JsonSerializable(typeof(FirstTimeApplicationSettings))]
1011
[JsonSerializable(typeof(NewJsonApplicationSettings))]

Project-Aurora/Project-Aurora/Settings/ConfigManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public static async Task<SensitiveData> LoadSensitiveData()
242242
{
243243
var encryptedContent = await File.ReadAllBytesAsync(SensitiveData.ConfigFile);
244244
var content = Encryption.Decrypt(encryptedContent);
245-
return JsonSerializer.Deserialize<SensitiveData>(content) ?? new SensitiveData();
245+
return JsonSerializer.Deserialize<SensitiveData>(content, SettingsJsonContext.Default.SensitiveData) ?? new SensitiveData();
246246
}
247247
catch (Exception e)
248248
{

Project-Aurora/AuroraCommon/Devices/DevicesJsonContext.cs renamed to Project-Aurora/Project-Aurora/Settings/DevicesJsonContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Common.Devices;
33
using Common.Devices.RGBNet;
44

5-
namespace Common.Utils;
5+
namespace AuroraRgb.Settings;
66

77
[JsonSourceGenerationOptions(WriteIndented = true)]
88
[JsonSerializable(typeof(DeviceConfig))]

Project-Aurora/Project-Aurora/Settings/SettingsJsonContext.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)