Cheerpipe · diogotr7 · Nov 2, 2023 · Nov 2, 2023 · Dec 23, 2023 · Dec 26, 2023
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
@@ -7,26 +7,10 @@ jobs:
     runs-on: [windows-latest]
 
     steps:
-      - name: Setup .NET 7.0
+      - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.0.x'
-
-      - name: Clone Artemis
-        uses: actions/checkout@v3
-        with:
-          repository: Artemis-RGB/Artemis
-          ref: development
-          path: Artemis
-
-      - name: Build Artemis Core
-        run: dotnet build .\Artemis\src\Artemis.Core\Artemis.Core.csproj
-
-      - name: Build Artemis UI Shared
-        run: dotnet build .\Artemis\src\Artemis.UI.Shared\Artemis.UI.Shared.csproj
-
-      - name: Build Artemis UI Shared
-        run: dotnet build .\Artemis\src\Artemis.UI\Artemis.UI.csproj
+          dotnet-version: '8.0.x'
 
       - name: Clone Plugins
         uses: actions/checkout@v2
@@ -40,117 +24,117 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.ExtendedWebAPI
-          path: .\Plugins\src\Collections\Artemis.Plugins.ExtendedWebAPI\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\Collections\Artemis.Plugins.ExtendedWebAPI\bin\x64\Release\net8.0\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.DisplaySettings
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.DisplaySettings
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.DisplaySettings\bin\x64\Release\net6.0-windows\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.DisplaySettings\bin\x64\Release\net8.0-windows\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.Teams
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.Teams
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.Teams\bin\x64\Release\net6.0-windows\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.Teams\bin\x64\Release\net8.0-windows\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.OpenWeather
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.OpenWeather
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.OpenWeather\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.OpenWeather\bin\x64\Release\net8.0\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.PowerPlan
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.PowerPlan
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.PowerPlan\bin\x64\Release\net6.0-windows\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.PowerPlan\bin\x64\Release\net8.0-windows\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.Profiles
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.Profiles
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.Profiles\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.Profiles\bin\x64\Release\net8.0\publish
 
       - name: Upload Artemis.Plugins.DataModelExpansions.YTMdesktop
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.DataModelExpansions.YTMdesktop
-          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.YTMdesktop\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\DataModelExpansions\Artemis.Plugins.DataModelExpansions.YTMdesktop\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.Devices.PowerPlay
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.Devices.PowerPlay
-          path: .\Plugins\src\Device\PowerPlay\Artemis.Plugins.Devices.PowerPlay\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\Device\PowerPlay\Artemis.Plugins.Devices.PowerPlay\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.Devices.YeeLight
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.Devices.YeeLight
-          path: .\Plugins\src\Device\YeeLight\Artemis.Plugins.Devices.YeeLight\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\Device\YeeLight\Artemis.Plugins.Devices.YeeLight\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.LayerBrushes.ConnectingDots
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.ConnectingDots
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.ConnectingDots\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.ConnectingDots\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.LayerBrushes.DrippingPaint
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.DrippingPaint
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.DrippingPaint\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.DrippingPaint\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.LayerBrushes.Nexus
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.Nexus
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Nexus\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Nexus\bin\x64\Release\net8.0\publish
 
 
       - name: Artemis.Plugins.LayerBrushes.Ripples
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.Ripples
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Ripples\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Ripples\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.LayerBrushes.Shuffle
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.Shuffle
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Shuffle\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.Shuffle\bin\x64\Release\net8.0\publish
 
 
       - name: Artemis.Plugins.LayerBrushes.SolidPercentage
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.SolidPercentage
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.SolidPercentage\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.SolidPercentage\bin\x64\Release\net8.0\publish
 
 
       - name: Artemis.Plugins.LayerEffect.FlickeringLights
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerEffect.FlickeringLights
-          path: .\Plugins\src\LayerEffects\Artemis.Plugins.LayerEffect.FlickeringLights\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerEffects\Artemis.Plugins.LayerEffect.FlickeringLights\bin\x64\Release\net8.0\publish
 
 
       - name: Artemis.Plugins.Modules.Json
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.Modules.Json
-          path: .\Plugins\src\Modules\Artemis.Plugins.Modules.Json\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\Modules\Artemis.Plugins.Modules.Json\bin\x64\Release\net8.0\publish
 
 
       - name: Artemis.Plugins.LayerBrushes.ConnectingDots
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.LayerBrushes.ConnectingDots
-          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.ConnectingDots\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\LayerBrushes\Artemis.Plugins.LayerBrushes.ConnectingDots\bin\x64\Release\net8.0\publish
 
       - name: Artemis.Plugins.LayerBrushes.ConnectingDots
         uses: actions/upload-artifact@v2
         with:
           name: Artemis.Plugins.Nodes.Extra
-          path: .\Plugins\src\Nodes\Artemis.Plugins.Nodes.Extra\bin\x64\Release\net6.0\publish
+          path: .\Plugins\src\Nodes\Artemis.Plugins.Nodes.Extra\bin\x64\Release\net8.0\publish
diff --git a/.gitignore b/.gitignore
@@ -359,4 +359,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+src/.idea/
diff --git a/src/Collections/Artemis.Plugins.ExtendedWebAPI/Artemis.Plugins.ExtendedWebAPI.csproj b/src/Collections/Artemis.Plugins.ExtendedWebAPI/Artemis.Plugins.ExtendedWebAPI.csproj
@@ -1,42 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Platforms>x64</Platforms>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 	</PropertyGroup>
 
 	<ItemGroup>
-
-		<!--All packages Artemis already references are compile-only dependencies-->
-		<PackageReference Update="@(PackageReference)" IncludeAssets="compile;build" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="ReactiveUI" Version="18.3.1" />
-		<PackageReference Include="Serilog" Version="2.12.0" />
-		<PackageReference Include="SkiaSharp" Version="2.88.3" />
-		<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease.46" />
-	</ItemGroup>
-	<ItemGroup>
-		<Reference Include="Artemis.Core">
-			<HintPath>..\..\..\..\Artemis\src\Artemis.Core\bin\net6.0\Artemis.Core.dll</HintPath>
-			<Private>false</Private>
-		</Reference>
-		<Reference Include="Artemis.UI.Shared">
-			<HintPath>..\..\..\..\Artemis\src\Artemis.UI\bin\net6.0\Artemis.UI.dll</HintPath>
-			<Private>false</Private>
-		</Reference>
-		<Reference Include="Artemis.UI">
-			<HintPath>..\..\..\..\Artemis\src\Artemis.UI\bin\net6.0\Artemis.UI.Shared.dll</HintPath>
-			<Private>false</Private>
-		</Reference>
+		<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.225.4" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<Content Include="plugin.json" CopyToOutputDirectory="PreserveNewest" />
-		<PackageReference Include="ArtemisRGB.Plugins.BuildTask" Version="1.1.0" />
-		<PackageReference Include="Avalonia" Version="0.10.18" />
-		<PackageReference Include="EmbedIO" Version="3.5.2" />
+		<PackageReference Include="ArtemisRGB.Plugins.BuildTask" Version="2.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
-
 </Project>
diff --git a/src/Collections/Artemis.Plugins.ExtendedWebAPI/Controllers/ColorController.cs b/src/Collections/Artemis.Plugins.ExtendedWebAPI/Controllers/ColorController.cs
@@ -14,18 +14,18 @@ namespace Artemis.Plugins.ExtendedWebAPI.Controllers
 {
     internal class ColorController : WebApiController
     {
-        private IRgbService _rgbService;
+        private IDeviceService _deviceService;
         private ILogger _logger;
-        public ColorController(IRgbService rgbService, ILogger logger)
+        public ColorController(IDeviceService deviceService, ILogger logger)
         {
-            _rgbService = rgbService;
+            _deviceService = deviceService;
             _logger = logger;
         }
 
         [Route(HttpVerbs.Get, "/extended-rest-api/get-led-color/{deviceName}/{ledId}")]
         public async Task GetLedColor(string deviceName, string ledId)
         {
-            ArtemisDevice device = _rgbService.Devices.FirstOrDefault(d => d.RgbDevice.DeviceInfo.DeviceName == deviceName);
+            ArtemisDevice device = _deviceService.Devices.FirstOrDefault(d => d.RgbDevice.DeviceInfo.DeviceName == deviceName);
 
             if (device == null)
             {

diff --git a/src/Collections/Artemis.Plugins.ExtendedWebAPI/Controllers/WindowsController.cs b/src/Collections/Artemis.Plugins.ExtendedWebAPI/Controllers/WindowsController.cs
@@ -1,6 +1,6 @@
 using Artemis.Core.Services;
-using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.MainWindow;
+using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
 using EmbedIO;
 using EmbedIO.Routing;
@@ -10,17 +10,17 @@ namespace Artemis.Plugins.ExtendedWebAPI.Controllers
 {
     internal class WindowsController : WebApiController
     {
-        private readonly IDebugService _debugService;
+        //private readonly IDebugService _debugService;
         private readonly IMainWindowService _mainWindowService;
 
         private readonly IPluginManagementService _pluginManagementService;
 
         public WindowsController(
-            IDebugService debugService,
+            //IDebugService debugService,
             IPluginManagementService pluginManagementService,
             IMainWindowService mainWindowService)
         {
-            _debugService = debugService;
+            //_debugService = debugService;
             _pluginManagementService = pluginManagementService;
             _mainWindowService = mainWindowService;
         }
@@ -37,7 +37,7 @@ public string GetVersion()
         [Route(HttpVerbs.Any, "/windows/show-debugger")]
         public void PostShowDebugger()
         {
-            Dispatcher.UIThread.InvokeAsync(() => _debugService.ShowDebugger());
+            //Dispatcher.UIThread.InvokeAsync(() => _debugService.ShowDebugger());
         }
 
         [Route(HttpVerbs.Any, "/windows/show-workshop")]

diff --git a/src/Collections/Artemis.Plugins.ExtendedWebAPI/Features/WindowsWebApi.cs b/src/Collections/Artemis.Plugins.ExtendedWebAPI/Features/WindowsWebApi.cs
@@ -4,11 +4,11 @@
 
 namespace Artemis.Plugins.ExtendedWebAPI.Features
 {
-    [PluginFeature(Name = "Artemis Windows caller Web Api", Description = "Offers a web API to show specific Artemis Windows or UIs", Icon = "Application")]
+    [PluginFeature(Name = "Artemis Windows caller Web Api", Description = "Offers a web API to show specific Artemis Windows or UIs")]
     public class WindowsWebApi : PluginFeature
     {
         private readonly IWebServerService _webServerService;
-
+        
         public WindowsWebApi(IWebServerService webServerService)
         {
             _webServerService = webServerService;

diff --git a/...odelExpansions.DisplaySettings/Artemis.Plugins.DataModelExpansions.DisplaySettings.csproj b/...odelExpansions.DisplaySettings/Artemis.Plugins.DataModelExpansions.DisplaySettings.csproj
@@ -1,38 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net8.0-windows</TargetFramework>
 		<Platforms>x64</Platforms>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Serilog" Version="2.11.0" />
-
-		<!--All packages Artemis already references are compile-only dependencies-->
-		<PackageReference Update="@(PackageReference)" IncludeAssets="compile;build" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.225.4" />
+  </ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="WindowsDisplayAPI" Version="1.3.0.13" />
-		<PackageReference Include="Microsoft.Win32.SystemEvents" Version="6.0.1" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Reference Include="Artemis.Core">
-			<HintPath>..\..\..\..\Artemis\src\Artemis.Core\bin\net6.0\Artemis.Core.dll</HintPath>
-			<Private>false</Private>
-		</Reference>
+		<PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<Content Include="plugin.json" CopyToOutputDirectory="PreserveNewest" />
-		<PackageReference Include="ArtemisRGB.Plugins.BuildTask" Version="1.1.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Update="ConnectingDots.png">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
+		<PackageReference Include="ArtemisRGB.Plugins.BuildTask" Version="2.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 </Project>