From 9cedeea2f09dee9166451bce877369fe58451476 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Sun, 20 Aug 2023 20:51:53 +0200
Subject: [PATCH 1/2] Nuget - Use separate version for Avalonia behaviours

---
 src/Artemis.UI.Shared/Artemis.UI.Shared.csproj             | 2 +-
 src/Artemis.UI/Artemis.UI.csproj                           | 2 +-
 src/Artemis.VisualScripting/Artemis.VisualScripting.csproj | 2 +-
 src/Artemis.props                                          | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 15b723fd5..d6c8ca8c9 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -16,7 +16,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
         <PackageReference Include="DynamicData" Version="7.13.1" />
         <PackageReference Include="FluentAvaloniaUI" Version="$(FluentAvaloniaVersion)" />
         <PackageReference Include="Material.Icons.Avalonia" Version="2.0.1" />
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 170dec4e1..914c45ccd 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -24,7 +24,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
         <PackageReference Include="DryIoc.dll" Version="5.4.0" />
         <PackageReference Include="DynamicData" Version="7.13.1" />
         <PackageReference Include="FluentAvaloniaUI" Version="$(FluentAvaloniaVersion)" />
diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index aa97126e1..913205f9b 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -11,7 +11,7 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
         <PackageReference Include="DryIoc.dll" Version="5.4.0" />
         <PackageReference Include="NoStringEvaluating" Version="2.5.2" />
         <PackageReference Include="ReactiveUI" Version="18.4.26" />
diff --git a/src/Artemis.props b/src/Artemis.props
index 1803d43e3..5ac28492e 100644
--- a/src/Artemis.props
+++ b/src/Artemis.props
@@ -1,6 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <AvaloniaVersion>11.0.3</AvaloniaVersion>
+        <AvaloniaVersion>11.0.4</AvaloniaVersion>
+        <AvaloniaBehavioursVersion>11.0.2</AvaloniaBehavioursVersion>
         <FluentAvaloniaVersion>2.0.1</FluentAvaloniaVersion>
         <RGBDotNetVersion>2.0.0-prerelease.101</RGBDotNetVersion>
         <SkiaSharpVersion>2.88.3</SkiaSharpVersion>

From e4c487e2de3ed13cf89981d0414070c08728639e Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Mon, 21 Aug 2023 20:08:25 +0200
Subject: [PATCH 2/2] Device providers - Fixed an exception when re-enabling
 device providers

---
 .../Plugins/DeviceProviders/DeviceProvider.cs         | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs
index 0c51a5cf4..843710370 100644
--- a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs
+++ b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs
@@ -11,19 +11,10 @@ namespace Artemis.Core.DeviceProviders;
 /// </summary>
 public abstract class DeviceProvider : PluginFeature
 {
-    /// <summary>
-    ///     Creates a new instance of the <see cref="DeviceProvider" /> class
-    /// </summary>
-    /// <param name="rgbDeviceProvider"></param>
-    protected DeviceProvider(IRGBDeviceProvider rgbDeviceProvider)
-    {
-        RgbDeviceProvider = rgbDeviceProvider ?? throw new ArgumentNullException(nameof(rgbDeviceProvider));
-    }
-
     /// <summary>
     ///     The RGB.NET device provider backing this Artemis device provider
     /// </summary>
-    public IRGBDeviceProvider RgbDeviceProvider { get; }
+    public abstract IRGBDeviceProvider RgbDeviceProvider { get; }
     
     /// <summary>
     ///     A boolean indicating whether this device provider detects the physical layout of connected keyboards.