DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 19:36:28 +00:00
Code Issues Releases Wiki Activity

Core - Don't retry loading plugins after shutdown has been initialized

Browse Source 
Meta - Update packages
This commit is contained in:
Robert committed 2022-08-20 10:43:44 +02:00
1 parent 34799fd440
commit 340a309f9a
15 files changed
+197 -219
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+2 -2
View File
@@ -11,8 +11,8 @@
<PackageReference Include="Avalonia" Version="0.10.18" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.18" />
<PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="NoStringEvaluating" Version="2.2.2" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="NoStringEvaluating" Version="2.4.0" />
<PackageReference Include="ReactiveUI" Version="17.1.50" />
<PackageReference Include="ReactiveUI.Validation" Version="2.2.1" />
<PackageReference Include="ScreenCapture.NET" Version="1.2.0" />
src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs
-11
View File
@@ -38,17 +38,6 @@ namespace Artemis.VisualScripting.Ninject
// Evaluator
Bind<INoStringEvaluator>().To<NoStringEvaluator>().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));
}
}
}
src/Artemis.VisualScripting/packages.lock.json
+23 -24
View File
@@ -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",