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 @@
+
+
+
@@ -62,17 +65,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll
-
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll
-
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Presets.dll
-
-
PreserveNewest
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 @@
+
@@ -69,11 +70,6 @@
false
-
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll
-
-
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 @@
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll
-
-
- ..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll
-
@@ -151,6 +145,8 @@
+
+
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",