Skip to content

Commit 7ae5c30

Browse files
AytackydlnAytackydln
committed
use EasyAF.NewtonsoftJson.Compatibility wıth config loads/saves
1 parent b5ceb29 commit 7ae5c30

3 files changed

Lines changed: 56 additions & 45 deletions

File tree

‎Project-Aurora/Project-Aurora/Project-Aurora.csproj‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -60,55 +60,56 @@
6060

6161
<ItemGroup>
6262
<PackageReference Include="ByteSize" Version="2.1.2" />
63-
<PackageReference Include="Colore" Version="6.0.0"/>
64-
<PackageReference Include="Debounce.Core" Version="1.0.0"/>
63+
<PackageReference Include="Colore" Version="6.0.0" />
64+
<PackageReference Include="Debounce.Core" Version="1.0.0" />
6565
<PackageReference Include="Doner.Wrap" Version="0.1.1" />
66-
<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.0"/>
67-
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1"/>
68-
<PackageReference Include="FastMember" Version="1.5.0"/>
69-
<PackageReference Include="FluentWPF" Version="0.10.2"/>
66+
<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.0" />
67+
<PackageReference Include="EasyAF.NewtonsoftJson.Compatibility" Version="4.0.0" />
68+
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
69+
<PackageReference Include="FastMember" Version="1.5.0" />
70+
<PackageReference Include="FluentWPF" Version="0.10.2" />
7071
<PackageReference Include="Fody" Version="6.9.3">
7172
<PrivateAssets>all</PrivateAssets>
7273
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7374
</PackageReference>
7475
<PackageReference Include="iCUE-ReverseEngineeredServer" Version="0.2.9" />
7576
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
76-
<PackageReference Include="JsonSubTypes" Version="2.0.1"/>
77+
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
7778
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.5-pre454" />
7879
<PackageReference Include="LibUsbDotNet" Version="2.2.75" />
79-
<PackageReference Include="MdXaml" Version="1.27.0"/>
80+
<PackageReference Include="MdXaml" Version="1.27.0" />
8081
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
81-
<PackageReference Include="Microsoft.Experimental.Collections" Version="1.0.6-e190117-3"/>
82-
<PackageReference Include="NAudio.Core" Version="2.2.1"/>
83-
<PackageReference Include="NAudio.Wasapi" Version="22.0.0"/>
82+
<PackageReference Include="Microsoft.Experimental.Collections" Version="1.0.6-e190117-3" />
83+
<PackageReference Include="NAudio.Core" Version="2.2.1" />
84+
<PackageReference Include="NAudio.Wasapi" Version="22.0.0" />
8485
<PackageReference Include="NAudio.WinMM" Version="2.2.1" />
8586
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
8687
<PackageReference Include="obs-websocket-dotnet" Version="5.0.1" />
87-
<PackageReference Include="Octokit" Version="7.1.0"/>
88-
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0"/>
89-
<PackageReference Include="RawInput.Sharp" Version="0.1.3"/>
90-
<PackageReference Include="RGB.NET.Devices.CorsairLegacy" Version="2.0.4-prerelease.14"/>
91-
<PackageReference Include="RGB.NET.Devices.Logitech" Version="2.0.4-prerelease.14"/>
92-
<PackageReference Include="SemanticVersioning" Version="2.0.2"/>
93-
<PackageReference Include="Serilog.Aggregating.Filter" Version="1.1.0"/>
94-
<PackageReference Include="Serilog.Exceptions" Version="8.4.0"/>
88+
<PackageReference Include="Octokit" Version="7.1.0" />
89+
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
90+
<PackageReference Include="RawInput.Sharp" Version="0.1.3" />
91+
<PackageReference Include="RGB.NET.Devices.CorsairLegacy" Version="2.0.4-prerelease.14" />
92+
<PackageReference Include="RGB.NET.Devices.Logitech" Version="2.0.4-prerelease.14" />
93+
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
94+
<PackageReference Include="Serilog.Aggregating.Filter" Version="1.1.0" />
95+
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
9596
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
9697
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
9798
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
98-
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0"/>
99-
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0"/>
100-
<PackageReference Include="SharpZipLib" Version="1.4.2"/>
99+
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
100+
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
101+
<PackageReference Include="SharpZipLib" Version="1.4.2" />
101102
<PackageReference Include="SkiaSharp" Version="3.119.0" />
102103
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
103104
<PackageReference Include="System.Management" Version="9.0.9" />
104-
<PackageReference Include="System.Net.NameResolution" Version="4.3.0"/>
105+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
105106
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.4" />
106107
<PackageReference Include="System.Threading.AccessControl" Version="9.0.4" />
107-
<PackageReference Include="TaskScheduler" Version="2.10.1"/>
108-
<PackageReference Include="VdfConverter" Version="1.0.3"/>
109-
<PackageReference Include="Vortice.XInput" Version="3.5.0"/>
110-
<PackageReference Include="WPFToolkits" Version="3.5.50211.1"/>
111-
<PackageReference Include="CoordinateSharp" Version="2.20.1.1"/>
108+
<PackageReference Include="TaskScheduler" Version="2.10.1" />
109+
<PackageReference Include="VdfConverter" Version="1.0.3" />
110+
<PackageReference Include="Vortice.XInput" Version="3.5.0" />
111+
<PackageReference Include="WPFToolkits" Version="3.5.50211.1" />
112+
<PackageReference Include="CoordinateSharp" Version="2.20.1.1" />
112113

113114
<Reference Include="RGB.NET.Core, Version=2.0.1.2">
114115
<HintPath>.\RGB.NET.Core.dll</HintPath>
@@ -127,11 +128,9 @@
127128
</ItemGroup>
128129

129130
<ItemGroup>
130-
<ProjectReference Include="..\AuroraSourceGenerator\AuroraSourceGenerator\AuroraSourceGenerator.csproj"
131-
OutputItemType="Analyzer"
132-
ReferenceOutputAssembly="false"/>
133-
<ProjectReference Include="..\AuroraCommon\AuroraCommon.csproj"/>
134-
<ProjectReference Include="..\ColorBox\ColorBox.csproj"/>
131+
<ProjectReference Include="..\AuroraSourceGenerator\AuroraSourceGenerator\AuroraSourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
132+
<ProjectReference Include="..\AuroraCommon\AuroraCommon.csproj" />
133+
<ProjectReference Include="..\ColorBox\ColorBox.csproj" />
135134
<ProjectReference Include="..\AuroraCommon\AuroraCommon.csproj">
136135
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
137136
</ProjectReference>
@@ -144,8 +143,8 @@
144143
<Content Include="kb_layouts\Extra Features\images\*.png">
145144
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
146145
</Content>
147-
<None Remove="kb_layouts\Extra Features\images\*.psd"/>
148-
<None Remove="kb_layouts\Extra Features\images\*.pdn"/>
146+
<None Remove="kb_layouts\Extra Features\images\*.psd" />
147+
<None Remove="kb_layouts\Extra Features\images\*.pdn" />
149148

150149
<Content Include="x64\libusb-1.0.dll">
151150
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -160,19 +159,19 @@
160159
</ItemGroup>
161160

162161
<ItemGroup>
163-
<Resource Include="Profiles\CSGO\GSI\gamestate_integration_aurora.cfg"/>
164-
<Resource Include="Profiles\Dota 2\GSI\gamestate_integration_aurora.cfg"/>
165-
<Resource Include="Profiles\ETS2\GSI\ets2-telemetry-server-x64.dll"/>
166-
<Resource Include="Profiles\ETS2\GSI\ets2-telemetry-server-x86.dll"/>
167-
<Resource Include="Profiles\Osu\GSI\OsuSyncAuroraPlugin.dll"/>
168-
<Resource Include="Profiles\Payday 2\GSI\mod\Aurora.xml"/>
169-
<Resource Include="Profiles\Witcher3\GSI\Resources\witcher3-mod.zip"/>
162+
<Resource Include="Profiles\CSGO\GSI\gamestate_integration_aurora.cfg" />
163+
<Resource Include="Profiles\Dota 2\GSI\gamestate_integration_aurora.cfg" />
164+
<Resource Include="Profiles\ETS2\GSI\ets2-telemetry-server-x64.dll" />
165+
<Resource Include="Profiles\ETS2\GSI\ets2-telemetry-server-x86.dll" />
166+
<Resource Include="Profiles\Osu\GSI\OsuSyncAuroraPlugin.dll" />
167+
<Resource Include="Profiles\Payday 2\GSI\mod\Aurora.xml" />
168+
<Resource Include="Profiles\Witcher3\GSI\Resources\witcher3-mod.zip" />
170169
</ItemGroup>
171170

172171
<ItemGroup>
173-
<Resource Include="Resources\*.png"/>
174-
<Resource Include="Resources\aurora_icon.ico"/>
172+
<Resource Include="Resources\*.png" />
173+
<Resource Include="Resources\aurora_icon.ico" />
175174

176-
<Resource Include="Resources\Win64\Aurora-LightFXWrapper.dll"/>
175+
<Resource Include="Resources\Win64\Aurora-LightFXWrapper.dll" />
177176
</ItemGroup>
178177
</Project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using AuroraRgb.Modules.Razer;
1111
using AuroraRgb.Utils;
1212
using AuroraRgb.Utils.Json;
13+
using CloudNimble.EasyAF.NewtonsoftJson.Compatibility;
1314
using Common.Devices;
1415
using Common.Utils;
1516
using Newtonsoft.Json;
@@ -73,6 +74,7 @@ private static async Task<Configuration> Parse()
7374
{
7475
ObjectCreationHandling = ObjectCreationHandling.Replace,
7576
TypeNameHandling = TypeNameHandling.All,
77+
ContractResolver = new SystemTextJsonContractResolver(),
7678
}) ?? await CreateDefaultConfigurationFile();
7779
}
7880

@@ -257,6 +259,7 @@ private static async Task<DeviceConfig> MigrateDeviceConfig()
257259
{
258260
ObjectCreationHandling = ObjectCreationHandling.Replace,
259261
SerializationBinder = new AuroraSerializationBinder(),
262+
ContractResolver = new SystemTextJsonContractResolver(),
260263
}) ?? new DeviceConfig();
261264
File.Copy(Configuration.ConfigFile, Configuration.ConfigFile + ".v194", true);
262265
return config;

‎Project-Aurora/Project-Aurora/packages.lock.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@
5555
"Microsoft.Extensions.Logging.Abstractions": "7.0.0"
5656
}
5757
},
58+
"EasyAF.NewtonsoftJson.Compatibility": {
59+
"type": "Direct",
60+
"requested": "[4.0.0, )",
61+
"resolved": "4.0.0",
62+
"contentHash": "q0Tn1H85mz//VF2OaIG4avcmSl1vZ/JdgF01z5nmy4Vy3lLhMCLXfQdVLI1aVKlGU4W1X99KbUr1/ilFiB/unA==",
63+
"dependencies": {
64+
"Newtonsoft.Json": "[13.0.1, 14.0.0)"
65+
}
66+
},
5867
"Extended.Wpf.Toolkit": {
5968
"type": "Direct",
6069
"requested": "[4.5.1, )",

0 commit comments

Comments
 (0)