DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
SpoinkyNL 2020-12-07 23:56:55 +01:00
commit 18359c443f
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1 @@
github: [spoinkynl]

1
src/Artemis.Core/Artemis.Core.csproj
View File

@ -39,6 +39,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.1.6" /> <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="Humanizer.Core" Version="2.8.26" />
<PackageReference Include="LiteDB" Version="5.0.9" /> <PackageReference Include="LiteDB" Version="5.0.9" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" /> <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />

4
src/Artemis.Core/Services/CoreService.cs
View File

@ -12,6 +12,7 @@ using RGB.NET.Core;
using Serilog; using Serilog;
using Serilog.Events; using Serilog.Events;
using SkiaSharp; using SkiaSharp;
using HidSharp;
using Module = Artemis.Core.Modules.Module; using Module = Artemis.Core.Modules.Module;
namespace Artemis.Core.Services namespace Artemis.Core.Services
@ -78,6 +79,9 @@ namespace Artemis.Core.Services
AssemblyInformationalVersionAttribute? versionAttribute = typeof(CoreService).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>(); AssemblyInformationalVersionAttribute? versionAttribute = typeof(CoreService).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
_logger.Information("Initializing Artemis Core version {version}", versionAttribute?.InformationalVersion); _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(); ApplyLoggingLevel();
DeserializationLogger.Initialize(Kernel); DeserializationLogger.Initialize(Kernel);

6
src/Artemis.Core/packages.lock.json
View File

@ -12,6 +12,12 @@
"System.Threading.Tasks.Extensions": "4.5.3" "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": { "Humanizer.Core": {
"type": "Direct", "type": "Direct",
"requested": "[2.8.26, )", "requested": "[2.8.26, )",

6
src/Artemis.UI.Shared/packages.lock.json
View File

@ -142,6 +142,11 @@
"System.Xml.XmlDocument": "4.3.0" "System.Xml.XmlDocument": "4.3.0"
} }
}, },
"HidSharp": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "UTdxWvbgp2xzT1Ajaa2va+Qi3oNHJPasYmVhbKI2VVdu1VYP6yUG+RikhsHvpD7iM0S8e8UYb5Qm/LTWxx9QAA=="
},
"LiteDB": { "LiteDB": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.9", "resolved": "5.0.9",
@ -1305,6 +1310,7 @@
"dependencies": { "dependencies": {
"Artemis.Storage": "1.0.0", "Artemis.Storage": "1.0.0",
"Ben.Demystifier": "0.1.6", "Ben.Demystifier": "0.1.6",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.8.26", "Humanizer.Core": "2.8.26",
"LiteDB": "5.0.9", "LiteDB": "5.0.9",
"McMaster.NETCore.Plugins": "1.3.1", "McMaster.NETCore.Plugins": "1.3.1",

6
src/Artemis.UI/packages.lock.json
View File

@ -195,6 +195,11 @@
"System.Xml.XmlDocument": "4.3.0" "System.Xml.XmlDocument": "4.3.0"
} }
}, },
"HidSharp": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "UTdxWvbgp2xzT1Ajaa2va+Qi3oNHJPasYmVhbKI2VVdu1VYP6yUG+RikhsHvpD7iM0S8e8UYb5Qm/LTWxx9QAA=="
},
"LiteDB": { "LiteDB": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.9", "resolved": "5.0.9",
@ -1362,6 +1367,7 @@
"dependencies": { "dependencies": {
"Artemis.Storage": "1.0.0", "Artemis.Storage": "1.0.0",
"Ben.Demystifier": "0.1.6", "Ben.Demystifier": "0.1.6",
"HidSharp": "2.1.0",
"Humanizer.Core": "2.8.26", "Humanizer.Core": "2.8.26",
"LiteDB": "5.0.9", "LiteDB": "5.0.9",
"McMaster.NETCore.Plugins": "1.3.1", "McMaster.NETCore.Plugins": "1.3.1",