diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 31b393b4e..985ec0b61 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -41,16 +41,16 @@
-
+
-
+
-
+
@@ -58,9 +58,8 @@
-
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Artemis.Core/Services/PluginManagementService.cs b/src/Artemis.Core/Services/PluginManagementService.cs
index 20eabb802..e8bd9fb95 100644
--- a/src/Artemis.Core/Services/PluginManagementService.cs
+++ b/src/Artemis.Core/Services/PluginManagementService.cs
@@ -34,6 +34,7 @@ namespace Artemis.Core.Services
private readonly IQueuedActionRepository _queuedActionRepository;
private readonly List _plugins;
private bool _isElevated;
+ private bool _disposed;
public PluginManagementService(IKernel kernel, ILogger logger, IPluginRepository pluginRepository, IDeviceRepository deviceRepository, IQueuedActionRepository queuedActionRepository)
{
@@ -196,6 +197,7 @@ namespace Artemis.Core.Services
public void Dispose()
{
+ _disposed = true;
UnloadPlugins();
}
@@ -675,7 +677,7 @@ namespace Artemis.Core.Services
Task.Run(async () =>
{
await Task.Delay(retryDelay);
- if (!pluginFeature.IsEnabled)
+ if (!pluginFeature.IsEnabled && !_disposed)
EnablePluginFeature(pluginFeature, saveState, true);
});
}
diff --git a/src/Artemis.Core/packages.lock.json b/src/Artemis.Core/packages.lock.json
index 21302efab..b1f64c01f 100644
--- a/src/Artemis.Core/packages.lock.json
+++ b/src/Artemis.Core/packages.lock.json
@@ -25,9 +25,9 @@
},
"LiteDB": {
"type": "Direct",
- "requested": "[5.0.11, )",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "requested": "[5.0.12, )",
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"McMaster.NETCore.Plugins": {
"type": "Direct",
@@ -47,9 +47,9 @@
},
"Ninject": {
"type": "Direct",
- "requested": "[3.3.4, )",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "requested": "[3.3.6, )",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -99,9 +99,9 @@
},
"Serilog": {
"type": "Direct",
- "requested": "[2.10.0, )",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "requested": "[2.11.0, )",
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Direct",
@@ -162,12 +162,6 @@
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
},
- "System.Reflection.Metadata": {
- "type": "Direct",
- "requested": "[5.0.0, )",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
- },
"System.ValueTuple": {
"type": "Direct",
"requested": "[4.5.0, )",
@@ -176,9 +170,9 @@
},
"Unclassified.NetRevisionTask": {
"type": "Direct",
- "requested": "[0.4.1, )",
- "resolved": "0.4.1",
- "contentHash": "N1B8XmgW7G75Z+1PhJ6kZ42DNCNzLFHSwrNWGdhczg9+ShJwq2tovvbjk8DYVhtI9tQHaPgOIbwEE8TrHBNGIw=="
+ "requested": "[0.4.3, )",
+ "resolved": "0.4.3",
+ "contentHash": "k61mpU58IWNHYoOOZVOmxIT1BMn2Y0QNbqKqLh00Hauh0cz5bHOWx3lMfFCDID74qTwl4lov//xs407EmiNRZA=="
},
"Castle.Core": {
"type": "Transitive",
@@ -1255,8 +1249,8 @@
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
}
}
diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj
index d867393eb..799752473 100644
--- a/src/Artemis.Storage/Artemis.Storage.csproj
+++ b/src/Artemis.Storage/Artemis.Storage.csproj
@@ -9,7 +9,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Artemis.Storage/packages.lock.json b/src/Artemis.Storage/packages.lock.json
index 83a92af9b..041a6995f 100644
--- a/src/Artemis.Storage/packages.lock.json
+++ b/src/Artemis.Storage/packages.lock.json
@@ -4,15 +4,15 @@
"net6.0": {
"LiteDB": {
"type": "Direct",
- "requested": "[5.0.11, )",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "requested": "[5.0.12, )",
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Serilog": {
"type": "Direct",
- "requested": "[2.10.0, )",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "requested": "[2.11.0, )",
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
}
}
}
diff --git a/src/Artemis.UI.Linux/packages.lock.json b/src/Artemis.UI.Linux/packages.lock.json
index bd9dcecf1..5c1ceadc6 100644
--- a/src/Artemis.UI.Linux/packages.lock.json
+++ b/src/Artemis.UI.Linux/packages.lock.json
@@ -200,8 +200,8 @@
},
"DynamicData": {
"type": "Transitive",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -293,8 +293,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Live.Avalonia": {
"type": "Transitive",
@@ -421,8 +421,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
- "resolved": "5.0.9",
- "contentHash": "grj0e6Me0EQsgaurV0fxP0xd8sz8eZVK+Jb816DPzNADHaqXaXJD3xZX9SFjyDl3ykAYvD0y77o5vRd9Hzsk9g=="
+ "resolved": "6.0.7",
+ "contentHash": "vItr+MUI5PPOo/HFk6p87v0+C8Zl7TLaFAyY543VJLYy/OKEWJCSiHIOLNFOpohR9QDr4d2BTUX8JiWXr3Y+4w=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -510,8 +510,8 @@
},
"Ninject": {
"type": "Transitive",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -544,10 +544,10 @@
},
"NoStringEvaluating": {
"type": "Transitive",
- "resolved": "2.2.2",
- "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
+ "resolved": "2.4.0",
+ "contentHash": "ByqsbLZqRoBBr1b46cCrUeqTWdTEJmxPBwfTCA1UnARZWtTQT1lrlFP+sDbkw0RfAl2J74ievSkC1GO0YZHsCQ==",
"dependencies": {
- "Microsoft.Extensions.ObjectPool": "5.0.9"
+ "Microsoft.Extensions.ObjectPool": "6.0.7"
}
},
"ReactiveUI.Validation": {
@@ -696,8 +696,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -770,16 +770,16 @@
},
"Splat": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "ayHdfTUklD5ci0s9m4uYMccjtkKVjZ9fVPT5q3PN+SnvyD6bjQVRozOfUHwdwh4LAz9ETZjR/tAgrm+IapXKrw=="
+ "resolved": "14.4.1",
+ "contentHash": "Z1Mncnzm9pNIaIbZ/EWH6x5ESnKsmAvu8HP4StBRw+yhz0lzE7LCbt22TNTPaFrYLYbYCbGQIc/61yuSnpLidg=="
},
"Splat.Ninject": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "aU851Yb7i4kLzzrpo3KxFZg/U0vd36ORza9nk51pvL/QE+Jkm3ROqoPMf+BPfugEub2J1hHDEuLKJtxU7TAt0w==",
+ "resolved": "14.4.1",
+ "contentHash": "qPW+EwY1ru3zLNHgfIO9u/HHLFpo1TziTTbT7JhhA/JrmUiUhXWEGF7VTWMRWTONKVGAJ38ozjlGiNdpvZt+vw==",
"dependencies": {
- "Ninject": "3.3.4",
- "Splat": "14.1.45"
+ "Ninject": "3.3.6",
+ "Splat": "14.4.1"
}
},
"System.AppContext": {
@@ -1286,8 +1286,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1739,16 +1739,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1756,15 +1756,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
},
"artemis.ui": {
@@ -1780,7 +1779,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Flurl.Http": "3.2.4",
"Live.Avalonia": "1.3.1",
@@ -1790,7 +1789,7 @@
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"SkiaSharp": "2.88.1-preview.108",
- "Splat.Ninject": "14.1.45"
+ "Splat.Ninject": "14.4.1"
}
},
"artemis.ui.shared": {
@@ -1801,7 +1800,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Material.Icons.Avalonia": "1.1.10",
"RGB.NET.Core": "1.0.0-prerelease.46",
@@ -1818,8 +1817,8 @@
"Avalonia": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "Ninject": "3.3.4",
- "NoStringEvaluating": "2.2.2",
+ "Ninject": "3.3.6",
+ "NoStringEvaluating": "2.4.0",
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"ScreenCapture.NET": "1.2.0",
diff --git a/src/Artemis.UI.MacOS/packages.lock.json b/src/Artemis.UI.MacOS/packages.lock.json
index bd9dcecf1..5c1ceadc6 100644
--- a/src/Artemis.UI.MacOS/packages.lock.json
+++ b/src/Artemis.UI.MacOS/packages.lock.json
@@ -200,8 +200,8 @@
},
"DynamicData": {
"type": "Transitive",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -293,8 +293,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Live.Avalonia": {
"type": "Transitive",
@@ -421,8 +421,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
- "resolved": "5.0.9",
- "contentHash": "grj0e6Me0EQsgaurV0fxP0xd8sz8eZVK+Jb816DPzNADHaqXaXJD3xZX9SFjyDl3ykAYvD0y77o5vRd9Hzsk9g=="
+ "resolved": "6.0.7",
+ "contentHash": "vItr+MUI5PPOo/HFk6p87v0+C8Zl7TLaFAyY543VJLYy/OKEWJCSiHIOLNFOpohR9QDr4d2BTUX8JiWXr3Y+4w=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -510,8 +510,8 @@
},
"Ninject": {
"type": "Transitive",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -544,10 +544,10 @@
},
"NoStringEvaluating": {
"type": "Transitive",
- "resolved": "2.2.2",
- "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
+ "resolved": "2.4.0",
+ "contentHash": "ByqsbLZqRoBBr1b46cCrUeqTWdTEJmxPBwfTCA1UnARZWtTQT1lrlFP+sDbkw0RfAl2J74ievSkC1GO0YZHsCQ==",
"dependencies": {
- "Microsoft.Extensions.ObjectPool": "5.0.9"
+ "Microsoft.Extensions.ObjectPool": "6.0.7"
}
},
"ReactiveUI.Validation": {
@@ -696,8 +696,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -770,16 +770,16 @@
},
"Splat": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "ayHdfTUklD5ci0s9m4uYMccjtkKVjZ9fVPT5q3PN+SnvyD6bjQVRozOfUHwdwh4LAz9ETZjR/tAgrm+IapXKrw=="
+ "resolved": "14.4.1",
+ "contentHash": "Z1Mncnzm9pNIaIbZ/EWH6x5ESnKsmAvu8HP4StBRw+yhz0lzE7LCbt22TNTPaFrYLYbYCbGQIc/61yuSnpLidg=="
},
"Splat.Ninject": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "aU851Yb7i4kLzzrpo3KxFZg/U0vd36ORza9nk51pvL/QE+Jkm3ROqoPMf+BPfugEub2J1hHDEuLKJtxU7TAt0w==",
+ "resolved": "14.4.1",
+ "contentHash": "qPW+EwY1ru3zLNHgfIO9u/HHLFpo1TziTTbT7JhhA/JrmUiUhXWEGF7VTWMRWTONKVGAJ38ozjlGiNdpvZt+vw==",
"dependencies": {
- "Ninject": "3.3.4",
- "Splat": "14.1.45"
+ "Ninject": "3.3.6",
+ "Splat": "14.4.1"
}
},
"System.AppContext": {
@@ -1286,8 +1286,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1739,16 +1739,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1756,15 +1756,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
},
"artemis.ui": {
@@ -1780,7 +1779,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Flurl.Http": "3.2.4",
"Live.Avalonia": "1.3.1",
@@ -1790,7 +1789,7 @@
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"SkiaSharp": "2.88.1-preview.108",
- "Splat.Ninject": "14.1.45"
+ "Splat.Ninject": "14.4.1"
}
},
"artemis.ui.shared": {
@@ -1801,7 +1800,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Material.Icons.Avalonia": "1.1.10",
"RGB.NET.Core": "1.0.0-prerelease.46",
@@ -1818,8 +1817,8 @@
"Avalonia": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "Ninject": "3.3.4",
- "NoStringEvaluating": "2.2.2",
+ "Ninject": "3.3.6",
+ "NoStringEvaluating": "2.4.0",
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"ScreenCapture.NET": "1.2.0",
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 5b71d26f1..229e3ed0e 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json
index c4d97fd6f..2a1592c73 100644
--- a/src/Artemis.UI.Shared/packages.lock.json
+++ b/src/Artemis.UI.Shared/packages.lock.json
@@ -53,9 +53,9 @@
},
"DynamicData": {
"type": "Direct",
- "requested": "[7.8.6, )",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "requested": "[7.9.14, )",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -298,8 +298,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Material.Icons": {
"type": "Transitive",
@@ -493,8 +493,8 @@
},
"Ninject": {
"type": "Transitive",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -650,8 +650,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -1209,8 +1209,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1629,16 +1629,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1646,15 +1646,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
}
}
diff --git a/src/Artemis.UI.Windows/packages.lock.json b/src/Artemis.UI.Windows/packages.lock.json
index 48ad90a28..4ce21430a 100644
--- a/src/Artemis.UI.Windows/packages.lock.json
+++ b/src/Artemis.UI.Windows/packages.lock.json
@@ -238,8 +238,8 @@
},
"DynamicData": {
"type": "Transitive",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -331,8 +331,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Live.Avalonia": {
"type": "Transitive",
@@ -459,8 +459,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
- "resolved": "5.0.9",
- "contentHash": "grj0e6Me0EQsgaurV0fxP0xd8sz8eZVK+Jb816DPzNADHaqXaXJD3xZX9SFjyDl3ykAYvD0y77o5vRd9Hzsk9g=="
+ "resolved": "6.0.7",
+ "contentHash": "vItr+MUI5PPOo/HFk6p87v0+C8Zl7TLaFAyY543VJLYy/OKEWJCSiHIOLNFOpohR9QDr4d2BTUX8JiWXr3Y+4w=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -557,8 +557,8 @@
},
"Ninject": {
"type": "Transitive",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -591,10 +591,10 @@
},
"NoStringEvaluating": {
"type": "Transitive",
- "resolved": "2.2.2",
- "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
+ "resolved": "2.4.0",
+ "contentHash": "ByqsbLZqRoBBr1b46cCrUeqTWdTEJmxPBwfTCA1UnARZWtTQT1lrlFP+sDbkw0RfAl2J74ievSkC1GO0YZHsCQ==",
"dependencies": {
- "Microsoft.Extensions.ObjectPool": "5.0.9"
+ "Microsoft.Extensions.ObjectPool": "6.0.7"
}
},
"ReactiveUI.Validation": {
@@ -743,8 +743,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -826,16 +826,16 @@
},
"Splat": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "ayHdfTUklD5ci0s9m4uYMccjtkKVjZ9fVPT5q3PN+SnvyD6bjQVRozOfUHwdwh4LAz9ETZjR/tAgrm+IapXKrw=="
+ "resolved": "14.4.1",
+ "contentHash": "Z1Mncnzm9pNIaIbZ/EWH6x5ESnKsmAvu8HP4StBRw+yhz0lzE7LCbt22TNTPaFrYLYbYCbGQIc/61yuSnpLidg=="
},
"Splat.Ninject": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "aU851Yb7i4kLzzrpo3KxFZg/U0vd36ORza9nk51pvL/QE+Jkm3ROqoPMf+BPfugEub2J1hHDEuLKJtxU7TAt0w==",
+ "resolved": "14.4.1",
+ "contentHash": "qPW+EwY1ru3zLNHgfIO9u/HHLFpo1TziTTbT7JhhA/JrmUiUhXWEGF7VTWMRWTONKVGAJ38ozjlGiNdpvZt+vw==",
"dependencies": {
- "Ninject": "3.3.4",
- "Splat": "14.1.45"
+ "Ninject": "3.3.6",
+ "Splat": "14.4.1"
}
},
"System.AppContext": {
@@ -1342,8 +1342,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1795,16 +1795,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1812,15 +1812,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
},
"artemis.ui": {
@@ -1836,7 +1835,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Flurl.Http": "3.2.4",
"Live.Avalonia": "1.3.1",
@@ -1846,7 +1845,7 @@
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"SkiaSharp": "2.88.1-preview.108",
- "Splat.Ninject": "14.1.45"
+ "Splat.Ninject": "14.4.1"
}
},
"artemis.ui.shared": {
@@ -1857,7 +1856,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Material.Icons.Avalonia": "1.1.10",
"RGB.NET.Core": "1.0.0-prerelease.46",
@@ -1874,8 +1873,8 @@
"Avalonia": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "Ninject": "3.3.4",
- "NoStringEvaluating": "2.2.2",
+ "Ninject": "3.3.6",
+ "NoStringEvaluating": "2.4.0",
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"ScreenCapture.NET": "1.2.0",
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index a596eaf5e..5740fe5e8 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -24,7 +24,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json
index 9b3c25d94..514e5a064 100644
--- a/src/Artemis.UI/packages.lock.json
+++ b/src/Artemis.UI/packages.lock.json
@@ -86,9 +86,9 @@
},
"DynamicData": {
"type": "Direct",
- "requested": "[7.8.6, )",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "requested": "[7.9.14, )",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -182,12 +182,12 @@
},
"Splat.Ninject": {
"type": "Direct",
- "requested": "[14.1.45, )",
- "resolved": "14.1.45",
- "contentHash": "aU851Yb7i4kLzzrpo3KxFZg/U0vd36ORza9nk51pvL/QE+Jkm3ROqoPMf+BPfugEub2J1hHDEuLKJtxU7TAt0w==",
+ "requested": "[14.4.1, )",
+ "resolved": "14.4.1",
+ "contentHash": "qPW+EwY1ru3zLNHgfIO9u/HHLFpo1TziTTbT7JhhA/JrmUiUhXWEGF7VTWMRWTONKVGAJ38ozjlGiNdpvZt+vw==",
"dependencies": {
- "Ninject": "3.3.4",
- "Splat": "14.1.45"
+ "Ninject": "3.3.6",
+ "Splat": "14.4.1"
}
},
"Avalonia.Angle.Windows.Natives": {
@@ -362,8 +362,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Material.Icons": {
"type": "Transitive",
@@ -473,8 +473,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
- "resolved": "5.0.9",
- "contentHash": "grj0e6Me0EQsgaurV0fxP0xd8sz8eZVK+Jb816DPzNADHaqXaXJD3xZX9SFjyDl3ykAYvD0y77o5vRd9Hzsk9g=="
+ "resolved": "6.0.7",
+ "contentHash": "vItr+MUI5PPOo/HFk6p87v0+C8Zl7TLaFAyY543VJLYy/OKEWJCSiHIOLNFOpohR9QDr4d2BTUX8JiWXr3Y+4w=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -562,8 +562,8 @@
},
"Ninject": {
"type": "Transitive",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -596,10 +596,10 @@
},
"NoStringEvaluating": {
"type": "Transitive",
- "resolved": "2.2.2",
- "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
+ "resolved": "2.4.0",
+ "contentHash": "ByqsbLZqRoBBr1b46cCrUeqTWdTEJmxPBwfTCA1UnARZWtTQT1lrlFP+sDbkw0RfAl2J74ievSkC1GO0YZHsCQ==",
"dependencies": {
- "Microsoft.Extensions.ObjectPool": "5.0.9"
+ "Microsoft.Extensions.ObjectPool": "6.0.7"
}
},
"RGB.NET.Presets": {
@@ -727,8 +727,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -792,8 +792,8 @@
},
"Splat": {
"type": "Transitive",
- "resolved": "14.1.45",
- "contentHash": "ayHdfTUklD5ci0s9m4uYMccjtkKVjZ9fVPT5q3PN+SnvyD6bjQVRozOfUHwdwh4LAz9ETZjR/tAgrm+IapXKrw=="
+ "resolved": "14.4.1",
+ "contentHash": "Z1Mncnzm9pNIaIbZ/EWH6x5ESnKsmAvu8HP4StBRw+yhz0lzE7LCbt22TNTPaFrYLYbYCbGQIc/61yuSnpLidg=="
},
"System.AppContext": {
"type": "Transitive",
@@ -1299,8 +1299,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1752,16 +1752,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1769,15 +1769,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
},
"artemis.ui.shared": {
@@ -1788,7 +1787,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Material.Icons.Avalonia": "1.1.10",
"RGB.NET.Core": "1.0.0-prerelease.46",
@@ -1805,8 +1804,8 @@
"Avalonia": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "Ninject": "3.3.4",
- "NoStringEvaluating": "2.2.2",
+ "Ninject": "3.3.6",
+ "NoStringEvaluating": "2.4.0",
"ReactiveUI": "17.1.50",
"ReactiveUI.Validation": "2.2.1",
"ScreenCapture.NET": "1.2.0",
diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index 7c2b838f8..843e51f3b 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs b/src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs
index b6178101a..63853cd60 100644
--- a/src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs
+++ b/src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs
@@ -38,17 +38,6 @@ namespace Artemis.VisualScripting.Ninject
// Evaluator
Bind().To().InSingletonScope();
-
- // If needed
- InjectUserDefinedFunctions();
- }
-
- private void InjectUserDefinedFunctions()
- {
- IFunctionReader? functionReader = (IFunctionReader?) Kernel?.GetService(typeof(IFunctionReader));
- if (functionReader == null)
- throw new Exception($"Could not get service of type {nameof(IFunctionReader)}.");
- NoStringFunctionsInitializer.InitializeFunctions(functionReader, typeof(NoStringNinjectModule));
}
}
}
\ No newline at end of file
diff --git a/src/Artemis.VisualScripting/packages.lock.json b/src/Artemis.VisualScripting/packages.lock.json
index 0dc4e7fda..54e2c950d 100644
--- a/src/Artemis.VisualScripting/packages.lock.json
+++ b/src/Artemis.VisualScripting/packages.lock.json
@@ -41,9 +41,9 @@
},
"Ninject": {
"type": "Direct",
- "requested": "[3.3.4, )",
- "resolved": "3.3.4",
- "contentHash": "CmbWW97FfJuh4LEOVZM/spqXl4KAulRUjqeMwRd5J9rDMQArmIYaDMU3pyzXXHT062tbF0OPIMwI7tSOtprPfg==",
+ "requested": "[3.3.6, )",
+ "resolved": "3.3.6",
+ "contentHash": "93avazUpbRL3IdwvTQF0DKSQB26TeqwMGhZsQNxi/RLSYewhxBkdGDhwWe9DAIRF1+zKDVMv3XkBk8HobKU6wA==",
"dependencies": {
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
@@ -51,11 +51,11 @@
},
"NoStringEvaluating": {
"type": "Direct",
- "requested": "[2.2.2, )",
- "resolved": "2.2.2",
- "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
+ "requested": "[2.4.0, )",
+ "resolved": "2.4.0",
+ "contentHash": "ByqsbLZqRoBBr1b46cCrUeqTWdTEJmxPBwfTCA1UnARZWtTQT1lrlFP+sDbkw0RfAl2J74ievSkC1GO0YZHsCQ==",
"dependencies": {
- "Microsoft.Extensions.ObjectPool": "5.0.9"
+ "Microsoft.Extensions.ObjectPool": "6.0.7"
}
},
"ReactiveUI": {
@@ -228,8 +228,8 @@
},
"DynamicData": {
"type": "Transitive",
- "resolved": "7.8.6",
- "contentHash": "u/w92NsBjg11Ga+UZRrdzKmQRKgJgQXPqkjw3P45XUG7IL7REX/kfwR6nesXujhK1xVtsRagvJQSisGFRLqlEg==",
+ "resolved": "7.9.14",
+ "contentHash": "KEgSU8dZoQXjbaR+z9o2l1H35jQh5yFywZ/Htmv4ZsTkWXwUBDCTSta/EWUZUuMxgNh/PM2u/W5UOo4TMdwgRA==",
"dependencies": {
"System.Reactive": "5.0.0"
}
@@ -307,8 +307,8 @@
},
"LiteDB": {
"type": "Transitive",
- "resolved": "5.0.11",
- "contentHash": "6cL4bOmVCUB0gIK+6qIr68HeqjjHZicPDGQjvJ87mIOvkFsEsJWkIps3yoKNeLpHhJQur++yoQ9Q8gxsdos0xQ=="
+ "resolved": "5.0.12",
+ "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw=="
},
"Material.Icons": {
"type": "Transitive",
@@ -427,8 +427,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
- "resolved": "5.0.9",
- "contentHash": "grj0e6Me0EQsgaurV0fxP0xd8sz8eZVK+Jb816DPzNADHaqXaXJD3xZX9SFjyDl3ykAYvD0y77o5vRd9Hzsk9g=="
+ "resolved": "6.0.7",
+ "contentHash": "vItr+MUI5PPOo/HFk6p87v0+C8Zl7TLaFAyY543VJLYy/OKEWJCSiHIOLNFOpohR9QDr4d2BTUX8JiWXr3Y+4w=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -669,8 +669,8 @@
},
"Serilog": {
"type": "Transitive",
- "resolved": "2.10.0",
- "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
+ "resolved": "2.11.0",
+ "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ=="
},
"Serilog.Sinks.Console": {
"type": "Transitive",
@@ -1241,8 +1241,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -1694,16 +1694,16 @@
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.14.1",
- "LiteDB": "5.0.11",
+ "LiteDB": "5.0.12",
"McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
- "Ninject": "3.3.4",
+ "Ninject": "3.3.6",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease.46",
"RGB.NET.Layout": "1.0.0-prerelease.46",
"RGB.NET.Presets": "1.0.0-prerelease.46",
- "Serilog": "2.10.0",
+ "Serilog": "2.11.0",
"Serilog.Sinks.Console": "4.0.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "5.0.0",
@@ -1711,15 +1711,14 @@
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
- "System.Reflection.Metadata": "5.0.0",
"System.ValueTuple": "4.5.0"
}
},
"artemis.storage": {
"type": "Project",
"dependencies": {
- "LiteDB": "5.0.11",
- "Serilog": "2.10.0"
+ "LiteDB": "5.0.12",
+ "Serilog": "2.11.0"
}
},
"artemis.ui.shared": {
@@ -1730,7 +1729,7 @@
"Avalonia.Diagnostics": "0.10.18",
"Avalonia.ReactiveUI": "0.10.18",
"Avalonia.Xaml.Behaviors": "0.10.18",
- "DynamicData": "7.8.6",
+ "DynamicData": "7.9.14",
"FluentAvaloniaUI": "1.4.1",
"Material.Icons.Avalonia": "1.1.10",
"RGB.NET.Core": "1.0.0-prerelease.46",