From a04ceb142e3f62ead71a5784f0a9ce74e4a938f3 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 31 Dec 2021 00:02:33 +0100
Subject: [PATCH] Meta - Use RGB.NET NuGet packages

---
 src/Artemis.ConsoleUI/packages.lock.json      | 24 +++++++++++++++++
 src/Artemis.Core/Artemis.Core.csproj          | 14 +++-------
 src/Artemis.Core/packages.lock.json           | 24 +++++++++++++++++
 .../Artemis.UI.Shared.csproj                  |  6 +----
 src/Artemis.UI.Shared/packages.lock.json      | 27 ++++++++++++++++++-
 src/Artemis.UI/Artemis.UI.csproj              |  8 ++----
 src/Artemis.UI/packages.lock.json             | 27 +++++++++++++++++++
 7 files changed, 107 insertions(+), 23 deletions(-)

diff --git a/src/Artemis.ConsoleUI/packages.lock.json b/src/Artemis.ConsoleUI/packages.lock.json
index feeaa74a8..54fea5121 100644
--- a/src/Artemis.ConsoleUI/packages.lock.json
+++ b/src/Artemis.ConsoleUI/packages.lock.json
@@ -204,6 +204,27 @@
           "Ninject": "3.3.3"
         }
       },
+      "RGB.NET.Core": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
+      },
+      "RGB.NET.Layout": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
+      "RGB.NET.Presets": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1223,6 +1244,9 @@
           "Ninject": "3.3.4",
           "Ninject.Extensions.ChildKernel": "3.3.0",
           "Ninject.Extensions.Conventions": "3.3.0",
+          "RGB.NET.Core": "1.0.0-prerelease1",
+          "RGB.NET.Layout": "1.0.0-prerelease1",
+          "RGB.NET.Presets": "1.0.0-prerelease1",
           "Serilog": "2.10.0",
           "Serilog.Sinks.Console": "4.0.0",
           "Serilog.Sinks.Debug": "2.0.0",
diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index a8b6dd96c..e80f308ce 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -47,6 +47,9 @@
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
     <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
+    <PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
+    <PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease1" />
+    <PackageReference Include="RGB.NET.Presets" Version="1.0.0-prerelease1" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
@@ -62,17 +65,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="RGB.NET.Core">
-      <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="RGB.NET.Layout">
-      <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll</HintPath>
-    </Reference>
-    <Reference Include="RGB.NET.Presets">
-      <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Presets.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <None Update="Resources\intro-profile.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Artemis.Core/packages.lock.json b/src/Artemis.Core/packages.lock.json
index ea7b5f80c..d6d49560e 100644
--- a/src/Artemis.Core/packages.lock.json
+++ b/src/Artemis.Core/packages.lock.json
@@ -73,6 +73,30 @@
           "Ninject.Extensions.Factory": "3.3.2"
         }
       },
+      "RGB.NET.Core": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
+      },
+      "RGB.NET.Layout": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
+      "RGB.NET.Presets": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
       "Serilog": {
         "type": "Direct",
         "requested": "[2.10.0, )",
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index aebafad56..253095749 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -39,6 +39,7 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
+    <PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
     <PackageReference Include="SharpVectors.Reloaded" Version="1.7.5" />
     <PackageReference Include="SkiaSharp" Version="2.80.3" />
     <PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />
@@ -69,11 +70,6 @@
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="RGB.NET.Core">
-      <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Fonts\RobotoMono-Regular.ttf" />
   </ItemGroup>
diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json
index 3ed7085b2..ae3665203 100644
--- a/src/Artemis.UI.Shared/packages.lock.json
+++ b/src/Artemis.UI.Shared/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v5.0": {
+    "net5.0-windows7.0": {
       "Humanizer.Core": {
         "type": "Direct",
         "requested": "[2.11.10, )",
@@ -52,6 +52,12 @@
           "Ninject.Extensions.Factory": "3.3.2"
         }
       },
+      "RGB.NET.Core": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
+      },
       "SharpVectors.Reloaded": {
         "type": "Direct",
         "requested": "[1.7.5, )",
@@ -264,6 +270,22 @@
           "Ninject": "3.3.3"
         }
       },
+      "RGB.NET.Layout": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
+      "RGB.NET.Presets": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1303,6 +1325,9 @@
           "Ninject": "3.3.4",
           "Ninject.Extensions.ChildKernel": "3.3.0",
           "Ninject.Extensions.Conventions": "3.3.0",
+          "RGB.NET.Core": "1.0.0-prerelease1",
+          "RGB.NET.Layout": "1.0.0-prerelease1",
+          "RGB.NET.Presets": "1.0.0-prerelease1",
           "Serilog": "2.10.0",
           "Serilog.Sinks.Console": "4.0.0",
           "Serilog.Sinks.Debug": "2.0.0",
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 409b3797d..da33f5fcb 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -57,12 +57,6 @@
     </ItemGroup>
     <ItemGroup>
         <!-- TODO: Remove when moving to Nuget, this is so the plugin templates have the DLL to reference -->
-        <Reference Include="RGB.NET.Core">
-            <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
-        </Reference>
-        <Reference Include="RGB.NET.Layout">
-            <HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll</HintPath>
-        </Reference>
         <Reference Include="System.Management" />
     </ItemGroup>
     <ItemGroup>
@@ -151,6 +145,8 @@
         <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
         <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
         <PackageReference Include="RawInput.Sharp" Version="0.0.4" />
+        <PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
+        <PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease1" />
         <PackageReference Include="Serilog" Version="2.10.0" />
         <PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />
         <PackageReference Include="SkiaSharp.Vulkan.SharpVk" Version="2.80.3" />
diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json
index 57c898322..c28d978da 100644
--- a/src/Artemis.UI/packages.lock.json
+++ b/src/Artemis.UI/packages.lock.json
@@ -122,6 +122,21 @@
           "NETStandard.Library": "1.6.1"
         }
       },
+      "RGB.NET.Core": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
+      },
+      "RGB.NET.Layout": {
+        "type": "Direct",
+        "requested": "[1.0.0-prerelease1, )",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
       "Serilog": {
         "type": "Direct",
         "requested": "[2.10.0, )",
@@ -377,6 +392,14 @@
           "Ninject": "3.3.3"
         }
       },
+      "RGB.NET.Presets": {
+        "type": "Transitive",
+        "resolved": "1.0.0-prerelease1",
+        "contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
+        "dependencies": {
+          "RGB.NET.Core": "1.0.0-prerelease1"
+        }
+      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1431,6 +1454,9 @@
           "Ninject": "3.3.4",
           "Ninject.Extensions.ChildKernel": "3.3.0",
           "Ninject.Extensions.Conventions": "3.3.0",
+          "RGB.NET.Core": "1.0.0-prerelease1",
+          "RGB.NET.Layout": "1.0.0-prerelease1",
+          "RGB.NET.Presets": "1.0.0-prerelease1",
           "Serilog": "2.10.0",
           "Serilog.Sinks.Console": "4.0.0",
           "Serilog.Sinks.Debug": "2.0.0",
@@ -1460,6 +1486,7 @@
           "Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
           "Ninject": "3.3.4",
           "Ninject.Extensions.Conventions": "3.3.0",
+          "RGB.NET.Core": "1.0.0-prerelease1",
           "SharpVectors.Reloaded": "1.7.5",
           "SkiaSharp": "2.80.3",
           "SkiaSharp.Views.WPF": "2.80.3",