From b85f692aee54fc39692eeb40b7f9a574e1cfda02 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Fri, 1 Mar 2024 12:05:59 +0000 Subject: [PATCH] update packages --- ...Artemis.Plugins.LayerBrushes.Chroma.csproj | 6 ++-- .../DefaultChromaLedMap.cs | 36 +++++++++---------- .../DownloadAndInstallChromaSdkAction.cs | 7 ++-- .../Artemis.Plugins.LayerBrushes.Gif.csproj | 2 +- .../Artemis.Plugins.Modules.Discord.csproj | 2 +- ...emis.Plugins.Modules.KeyboardLayout.csproj | 2 +- .../Artemis.Plugins.Modules.OBS.csproj | 2 +- .../Artemis.Plugins.Modules.Spotify.csproj | 2 +- ...Artemis.Plugins.Modules.VoiceMeeter.csproj | 2 +- .../Artemis.Plugins.Nodes.Ping.csproj | 2 +- 10 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/Artemis.Plugins.LayerBrushes.Chroma/Artemis.Plugins.LayerBrushes.Chroma.csproj b/src/Artemis.Plugins.LayerBrushes.Chroma/Artemis.Plugins.LayerBrushes.Chroma.csproj index a4dc7df..1202958 100644 --- a/src/Artemis.Plugins.LayerBrushes.Chroma/Artemis.Plugins.LayerBrushes.Chroma.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Chroma/Artemis.Plugins.LayerBrushes.Chroma.csproj @@ -1,14 +1,14 @@ - net8.0-windows + net8.0 x64 true enable - - + + diff --git a/src/Artemis.Plugins.LayerBrushes.Chroma/DefaultChromaLedMap.cs b/src/Artemis.Plugins.LayerBrushes.Chroma/DefaultChromaLedMap.cs index 4261a1e..fe7895f 100644 --- a/src/Artemis.Plugins.LayerBrushes.Chroma/DefaultChromaLedMap.cs +++ b/src/Artemis.Plugins.LayerBrushes.Chroma/DefaultChromaLedMap.cs @@ -9,7 +9,7 @@ namespace Artemis.Plugins.LayerBrushes.Chroma; public static class DefaultChromaLedMap { private static readonly LedId[] Keyboard = - { + [ LedId.Invalid, LedId.Keyboard_Escape, LedId.Invalid, @@ -141,11 +141,11 @@ public static class DefaultChromaLedMap LedId.Invalid, LedId.Keyboard_Num0, LedId.Keyboard_NumPeriodAndDelete, - LedId.Invalid, - }; + LedId.Invalid + ]; private static readonly LedId[] Mouse = - { + [ LedId.Invalid, LedId.Invalid, LedId.Invalid, @@ -208,11 +208,11 @@ public static class DefaultChromaLedMap LedId.Mouse20, LedId.Mouse21, LedId.Mouse22, - LedId.Invalid, - }; + LedId.Invalid + ]; private static readonly LedId[] Mousepad = - { + [ LedId.Mousepad20, LedId.Mousepad19, LedId.Mousepad18, @@ -232,20 +232,20 @@ public static class DefaultChromaLedMap LedId.Mousepad4, LedId.Mousepad3, LedId.Mousepad2, - LedId.Mousepad1, - }; + LedId.Mousepad1 + ]; private static readonly LedId[] Headset = - { + [ LedId.Headset1, LedId.Headset2, LedId.Headset3, LedId.Headset4, - LedId.Headset5, - }; + LedId.Headset5 + ]; private static readonly LedId[] Keypad = - { + [ LedId.Keypad1, LedId.Keypad2, LedId.Keypad3, @@ -265,17 +265,17 @@ public static class DefaultChromaLedMap LedId.Keypad17, LedId.Keypad18, LedId.Keypad19, - LedId.Keypad20, - }; + LedId.Keypad20 + ]; private static readonly LedId[] ChromaLink = - { + [ LedId.LedStripe1, LedId.LedStripe2, LedId.LedStripe3, LedId.LedStripe4, - LedId.LedStripe5, - }; + LedId.LedStripe5 + ]; public static LedId[] GetDeviceMap(RzDeviceType r) => r switch { diff --git a/src/Artemis.Plugins.LayerBrushes.Chroma/Prerequisites/DownloadAndInstallChromaSdkAction.cs b/src/Artemis.Plugins.LayerBrushes.Chroma/Prerequisites/DownloadAndInstallChromaSdkAction.cs index 7fa71e6..4545594 100644 --- a/src/Artemis.Plugins.LayerBrushes.Chroma/Prerequisites/DownloadAndInstallChromaSdkAction.cs +++ b/src/Artemis.Plugins.LayerBrushes.Chroma/Prerequisites/DownloadAndInstallChromaSdkAction.cs @@ -1,13 +1,12 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Text; +using System.Text.Json; using System.Threading; using System.Threading.Tasks; using System.Xml; using Artemis.Core; -using Newtonsoft.Json; namespace Artemis.Plugins.LayerBrushes.Chroma.Prerequisites; @@ -43,7 +42,7 @@ private async Task GetDownloadUrlAsync(HttpClient httpClient) //a bunch of nullable overrides here but i don't care const string ENDPOINT = "prod"; var endpointsJson = await httpClient.GetStringAsync("https://discovery.razerapi.com/user/endpoints"); - var endpoints = JsonConvert.DeserializeObject(endpointsJson); + var endpoints = JsonSerializer.Deserialize(endpointsJson); var prodEndpoint = endpoints!.Endpoints.Find(ep => ep.Name == ENDPOINT); const string PLATFORM_DATA = """ diff --git a/src/Artemis.Plugins.LayerBrushes.Gif/Artemis.Plugins.LayerBrushes.Gif.csproj b/src/Artemis.Plugins.LayerBrushes.Gif/Artemis.Plugins.LayerBrushes.Gif.csproj index 427ba55..9d9c17b 100644 --- a/src/Artemis.Plugins.LayerBrushes.Gif/Artemis.Plugins.LayerBrushes.Gif.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Gif/Artemis.Plugins.LayerBrushes.Gif.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Artemis.Plugins.Modules.Discord/Artemis.Plugins.Modules.Discord.csproj b/src/Artemis.Plugins.Modules.Discord/Artemis.Plugins.Modules.Discord.csproj index e35ec66..916f6c8 100644 --- a/src/Artemis.Plugins.Modules.Discord/Artemis.Plugins.Modules.Discord.csproj +++ b/src/Artemis.Plugins.Modules.Discord/Artemis.Plugins.Modules.Discord.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Artemis.Plugins.Modules.KeyboardLayout/Artemis.Plugins.Modules.KeyboardLayout.csproj b/src/Artemis.Plugins.Modules.KeyboardLayout/Artemis.Plugins.Modules.KeyboardLayout.csproj index 195eebf..752c9f3 100644 --- a/src/Artemis.Plugins.Modules.KeyboardLayout/Artemis.Plugins.Modules.KeyboardLayout.csproj +++ b/src/Artemis.Plugins.Modules.KeyboardLayout/Artemis.Plugins.Modules.KeyboardLayout.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Artemis.Plugins.Modules.OBS/Artemis.Plugins.Modules.OBS.csproj b/src/Artemis.Plugins.Modules.OBS/Artemis.Plugins.Modules.OBS.csproj index afac867..73adf84 100644 --- a/src/Artemis.Plugins.Modules.OBS/Artemis.Plugins.Modules.OBS.csproj +++ b/src/Artemis.Plugins.Modules.OBS/Artemis.Plugins.Modules.OBS.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Artemis.Plugins.Modules.Spotify/Artemis.Plugins.Modules.Spotify.csproj b/src/Artemis.Plugins.Modules.Spotify/Artemis.Plugins.Modules.Spotify.csproj index a74d791..19c58df 100644 --- a/src/Artemis.Plugins.Modules.Spotify/Artemis.Plugins.Modules.Spotify.csproj +++ b/src/Artemis.Plugins.Modules.Spotify/Artemis.Plugins.Modules.Spotify.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Artemis.Plugins.Modules.VoiceMeeter/Artemis.Plugins.Modules.VoiceMeeter.csproj b/src/Artemis.Plugins.Modules.VoiceMeeter/Artemis.Plugins.Modules.VoiceMeeter.csproj index c39ddec..7f09fa6 100644 --- a/src/Artemis.Plugins.Modules.VoiceMeeter/Artemis.Plugins.Modules.VoiceMeeter.csproj +++ b/src/Artemis.Plugins.Modules.VoiceMeeter/Artemis.Plugins.Modules.VoiceMeeter.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Artemis.Plugins.Nodes.Ping/Artemis.Plugins.Nodes.Ping.csproj b/src/Artemis.Plugins.Nodes.Ping/Artemis.Plugins.Nodes.Ping.csproj index 69c569a..5ee3f4e 100644 --- a/src/Artemis.Plugins.Nodes.Ping/Artemis.Plugins.Nodes.Ping.csproj +++ b/src/Artemis.Plugins.Nodes.Ping/Artemis.Plugins.Nodes.Ping.csproj @@ -7,7 +7,7 @@ - +