From d3d0ac9c9af3142c9e5d1c129539c2f20e2760de Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Mon, 7 Dec 2020 19:40:14 +0100
Subject: [PATCH 1/2] Plugins - Prevent crash when multiple plugins use
 HidSharp

---
 src/Artemis.Core/Artemis.Core.csproj     | 1 +
 src/Artemis.Core/Services/CoreService.cs | 4 ++++
 src/Artemis.Core/packages.lock.json      | 6 ++++++
 src/Artemis.UI.Shared/packages.lock.json | 6 ++++++
 src/Artemis.UI/packages.lock.json        | 6 ++++++
 5 files changed, 23 insertions(+)

diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 724a5a9ea..d600cf1fd 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -39,6 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.1.6" />
+    <PackageReference Include="HidSharp" Version="2.1.0" />
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
     <PackageReference Include="LiteDB" Version="5.0.9" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs
index df78d2a3b..a0877da5f 100644
--- a/src/Artemis.Core/Services/CoreService.cs
+++ b/src/Artemis.Core/Services/CoreService.cs
@@ -12,6 +12,7 @@ using RGB.NET.Core;
 using Serilog;
 using Serilog.Events;
 using SkiaSharp;
+using HidSharp;
 using Module = Artemis.Core.Modules.Module;
 
 namespace Artemis.Core.Services
@@ -78,6 +79,9 @@ namespace Artemis.Core.Services
 
             AssemblyInformationalVersionAttribute? versionAttribute = typeof(CoreService).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
             _logger.Information("Initializing Artemis Core version {version}", versionAttribute?.InformationalVersion);
+            // This should prevent a certain someone from removing HidSharp as an unused dependency as well
+            _logger.Information("Forcing plugins to use HidSharp {hidSharpVersion}", Assembly.GetAssembly(typeof(HidDevice))!.GetName().Version);
+
             ApplyLoggingLevel();
 
             DeserializationLogger.Initialize(Kernel);
diff --git a/src/Artemis.Core/packages.lock.json b/src/Artemis.Core/packages.lock.json
index 0dc3418f5..03a69fcd6 100644
--- a/src/Artemis.Core/packages.lock.json
+++ b/src/Artemis.Core/packages.lock.json
@@ -12,6 +12,12 @@
           "System.Threading.Tasks.Extensions": "4.5.3"
         }
       },
+      "HidSharp": {
+        "type": "Direct",
+        "requested": "[2.1.0, )",
+        "resolved": "2.1.0",
+        "contentHash": "UTdxWvbgp2xzT1Ajaa2va+Qi3oNHJPasYmVhbKI2VVdu1VYP6yUG+RikhsHvpD7iM0S8e8UYb5Qm/LTWxx9QAA=="
+      },
       "Humanizer.Core": {
         "type": "Direct",
         "requested": "[2.8.26, )",
diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json
index e0b20721e..db871839a 100644
--- a/src/Artemis.UI.Shared/packages.lock.json
+++ b/src/Artemis.UI.Shared/packages.lock.json
@@ -142,6 +142,11 @@
           "System.Xml.XmlDocument": "4.3.0"
         }
       },
+      "HidSharp": {
+        "type": "Transitive",
+        "resolved": "2.1.0",
+        "contentHash": "UTdxWvbgp2xzT1Ajaa2va+Qi3oNHJPasYmVhbKI2VVdu1VYP6yUG+RikhsHvpD7iM0S8e8UYb5Qm/LTWxx9QAA=="
+      },
       "LiteDB": {
         "type": "Transitive",
         "resolved": "5.0.9",
@@ -1305,6 +1310,7 @@
         "dependencies": {
           "Artemis.Storage": "1.0.0",
           "Ben.Demystifier": "0.1.6",
+          "HidSharp": "2.1.0",
           "Humanizer.Core": "2.8.26",
           "LiteDB": "5.0.9",
           "McMaster.NETCore.Plugins": "1.3.1",
diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json
index 47e2097b1..83f215a37 100644
--- a/src/Artemis.UI/packages.lock.json
+++ b/src/Artemis.UI/packages.lock.json
@@ -195,6 +195,11 @@
           "System.Xml.XmlDocument": "4.3.0"
         }
       },
+      "HidSharp": {
+        "type": "Transitive",
+        "resolved": "2.1.0",
+        "contentHash": "UTdxWvbgp2xzT1Ajaa2va+Qi3oNHJPasYmVhbKI2VVdu1VYP6yUG+RikhsHvpD7iM0S8e8UYb5Qm/LTWxx9QAA=="
+      },
       "LiteDB": {
         "type": "Transitive",
         "resolved": "5.0.9",
@@ -1362,6 +1367,7 @@
         "dependencies": {
           "Artemis.Storage": "1.0.0",
           "Ben.Demystifier": "0.1.6",
+          "HidSharp": "2.1.0",
           "Humanizer.Core": "2.8.26",
           "LiteDB": "5.0.9",
           "McMaster.NETCore.Plugins": "1.3.1",

From d5ff979cbb87424ab2bdfe50f3f1dae093829f21 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Mon, 7 Dec 2020 20:08:16 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Added=20FUNDING.yml=20file=20=C2=AF\=5F(?=
 =?UTF-8?q?=E3=83=84)=5F/=C2=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..6b70ea0f6
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [spoinkynl]
\ No newline at end of file