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 branch 'development'

Browse Source
This commit is contained in:
Robert 2022-05-07 17:10:31 +02:00
commit 11b88a3917
8 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Artemis.ConsoleUI/packages.lock.json
View File

@ -206,23 +206,23 @@
},
"RGB.NET.Core": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "IIja5sC4QZ5pbSNckRCG7TlY4U6j/dRbrl4e2FZqsTGgsevaVB3IqonUQLFY1GGst4xNSl2oh0A23coXQxXGbQ=="
"resolved": "1.0.0-prerelease.32",
"contentHash": "HlhhikrkV7OQIRszn6RT6+6N4QGGHaN6NDHK1YssZEJTtE2MIdeRajeQFFziPc4OVOvMgxY13unw/v25r/YALw=="
},
"RGB.NET.Layout": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "S0kfWVa8EfMOAl2WPHsq98dwaO+SNz9TWr1AtMkdo8aZuYIVhaJ1c+mSAMMnH1V+mSbxDWPHWkNzi9ITszJucA==",
"resolved": "1.0.0-prerelease.32",
"contentHash": "O7I8zR5Hy+joSLCJW10lkIPNMDS1gXe8hQuwm+T5DEDDpykVyc4tnO55WlO5GDmDCS/cXhcwq+qNpLez5Th4Xw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "NgShvOPQM0miOsdqMKjkNunngJUZMwr8KR8ME2/Ksir7wgIQfgJj1YwZy8aIj+ar7fDo6VZJZenAshs/Ul+04A==",
"resolved": "1.0.0-prerelease.32",
"contentHash": "tqPUA/KUG1hw5pT4D7OLXI6buXxpUIUYNET90gHnVXbadYi0C0OJZ703XDsaPpj4Db8/B2k8f1T4tM4s2KCJhw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@ -1244,9 +1244,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease7",
"RGB.NET.Layout": "1.0.0-prerelease7",
"RGB.NET.Presets": "1.0.0-prerelease7",
"RGB.NET.Core": "1.0.0-prerelease.32",
"RGB.NET.Layout": "1.0.0-prerelease.32",
"RGB.NET.Presets": "1.0.0-prerelease.32",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",

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

@ -47,9 +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-prerelease7" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease7" />
<PackageReference Include="RGB.NET.Presets" Version="1.0.0-prerelease7" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease.32" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease.32" />
<PackageReference Include="RGB.NET.Presets" Version="1.0.0-prerelease.32" />
<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" />

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

@ -75,26 +75,26 @@
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "IIja5sC4QZ5pbSNckRCG7TlY4U6j/dRbrl4e2FZqsTGgsevaVB3IqonUQLFY1GGst4xNSl2oh0A23coXQxXGbQ=="
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "HlhhikrkV7OQIRszn6RT6+6N4QGGHaN6NDHK1YssZEJTtE2MIdeRajeQFFziPc4OVOvMgxY13unw/v25r/YALw=="
},
"RGB.NET.Layout": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "S0kfWVa8EfMOAl2WPHsq98dwaO+SNz9TWr1AtMkdo8aZuYIVhaJ1c+mSAMMnH1V+mSbxDWPHWkNzi9ITszJucA==",
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "O7I8zR5Hy+joSLCJW10lkIPNMDS1gXe8hQuwm+T5DEDDpykVyc4tnO55WlO5GDmDCS/cXhcwq+qNpLez5Th4Xw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"RGB.NET.Presets": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "NgShvOPQM0miOsdqMKjkNunngJUZMwr8KR8ME2/Ksir7wgIQfgJj1YwZy8aIj+ar7fDo6VZJZenAshs/Ul+04A==",
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "tqPUA/KUG1hw5pT4D7OLXI6buXxpUIUYNET90gHnVXbadYi0C0OJZ703XDsaPpj4Db8/B2k8f1T4tM4s2KCJhw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"Serilog": {

4
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<PreserveCompilationContext>false</PreserveCompilationContext>
@ -39,7 +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-prerelease7" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease.32" />
<PackageReference Include="SharpVectors.Reloaded" Version="1.7.5" />
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />

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

@ -54,9 +54,9 @@
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "IIja5sC4QZ5pbSNckRCG7TlY4U6j/dRbrl4e2FZqsTGgsevaVB3IqonUQLFY1GGst4xNSl2oh0A23coXQxXGbQ=="
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "HlhhikrkV7OQIRszn6RT6+6N4QGGHaN6NDHK1YssZEJTtE2MIdeRajeQFFziPc4OVOvMgxY13unw/v25r/YALw=="
},
"SharpVectors.Reloaded": {
"type": "Direct",
@ -272,18 +272,18 @@
},
"RGB.NET.Layout": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "S0kfWVa8EfMOAl2WPHsq98dwaO+SNz9TWr1AtMkdo8aZuYIVhaJ1c+mSAMMnH1V+mSbxDWPHWkNzi9ITszJucA==",
"resolved": "1.0.0-prerelease.32",
"contentHash": "O7I8zR5Hy+joSLCJW10lkIPNMDS1gXe8hQuwm+T5DEDDpykVyc4tnO55WlO5GDmDCS/cXhcwq+qNpLez5Th4Xw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "NgShvOPQM0miOsdqMKjkNunngJUZMwr8KR8ME2/Ksir7wgIQfgJj1YwZy8aIj+ar7fDo6VZJZenAshs/Ul+04A==",
"resolved": "1.0.0-prerelease.32",
"contentHash": "tqPUA/KUG1hw5pT4D7OLXI6buXxpUIUYNET90gHnVXbadYi0C0OJZ703XDsaPpj4Db8/B2k8f1T4tM4s2KCJhw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@ -1325,9 +1325,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease7",
"RGB.NET.Layout": "1.0.0-prerelease7",
"RGB.NET.Presets": "1.0.0-prerelease7",
"RGB.NET.Core": "1.0.0-prerelease.32",
"RGB.NET.Layout": "1.0.0-prerelease.32",
"RGB.NET.Presets": "1.0.0-prerelease.32",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",

6
src/Artemis.UI/Artemis.UI.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
@ -145,8 +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-prerelease7" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease7" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease.32" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease.32" />
<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" />

1
src/Artemis.UI/Screens/Settings/Device/Tabs/DeviceLedsTabView.xaml
View File

@ -36,6 +36,7 @@
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.RgbLed.Color}" Header="Color (ARGB)" Width="Auto" CanUserSort="False" />
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.Layout.Image, Converter={StaticResource UriToFileNameConverter}, Mode=OneWay}" Header="Image file" CanUserSort="False" />
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.RgbLed.Shape}" Header="Shape" />
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.RgbLed.Location}" Header="Location" Width="Auto" CanUserSort="False" />
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.RgbLed.Size}" Header="Size" Width="Auto" CanUserSort="False" />
<materialDesign:DataGridTextColumn Binding="{Binding ArtemisLed.RgbLed.CustomData}" Header="LED data" Width="Auto" />
</DataGrid.Columns>

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

@ -124,17 +124,17 @@
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "IIja5sC4QZ5pbSNckRCG7TlY4U6j/dRbrl4e2FZqsTGgsevaVB3IqonUQLFY1GGst4xNSl2oh0A23coXQxXGbQ=="
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "HlhhikrkV7OQIRszn6RT6+6N4QGGHaN6NDHK1YssZEJTtE2MIdeRajeQFFziPc4OVOvMgxY13unw/v25r/YALw=="
},
"RGB.NET.Layout": {
"type": "Direct",
"requested": "[1.0.0-prerelease7, )",
"resolved": "1.0.0-prerelease7",
"contentHash": "S0kfWVa8EfMOAl2WPHsq98dwaO+SNz9TWr1AtMkdo8aZuYIVhaJ1c+mSAMMnH1V+mSbxDWPHWkNzi9ITszJucA==",
"requested": "[1.0.0-prerelease.32, )",
"resolved": "1.0.0-prerelease.32",
"contentHash": "O7I8zR5Hy+joSLCJW10lkIPNMDS1gXe8hQuwm+T5DEDDpykVyc4tnO55WlO5GDmDCS/cXhcwq+qNpLez5Th4Xw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"Serilog": {
@ -394,10 +394,10 @@
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease7",
"contentHash": "NgShvOPQM0miOsdqMKjkNunngJUZMwr8KR8ME2/Ksir7wgIQfgJj1YwZy8aIj+ar7fDo6VZJZenAshs/Ul+04A==",
"resolved": "1.0.0-prerelease.32",
"contentHash": "tqPUA/KUG1hw5pT4D7OLXI6buXxpUIUYNET90gHnVXbadYi0C0OJZ703XDsaPpj4Db8/B2k8f1T4tM4s2KCJhw==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease7"
"RGB.NET.Core": "1.0.0-prerelease.32"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@ -1454,9 +1454,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease7",
"RGB.NET.Layout": "1.0.0-prerelease7",
"RGB.NET.Presets": "1.0.0-prerelease7",
"RGB.NET.Core": "1.0.0-prerelease.32",
"RGB.NET.Layout": "1.0.0-prerelease.32",
"RGB.NET.Presets": "1.0.0-prerelease.32",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
@ -1486,7 +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-prerelease7",
"RGB.NET.Core": "1.0.0-prerelease.32",
"SharpVectors.Reloaded": "1.7.5",
"SkiaSharp": "2.80.3",
"SkiaSharp.Views.WPF": "2.80.3",