diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index a6bc2a87c..b9e5de52a 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -47,7 +47,6 @@ - diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs index 2d3855246..e4bc733cf 100644 --- a/src/Artemis.Core/Services/CoreService.cs +++ b/src/Artemis.Core/Services/CoreService.cs @@ -77,8 +77,8 @@ namespace Artemis.Core.Services ApplyLoggingLevel(); // Initialize the services - _pluginService.CopyBuiltInPlugins(); - _pluginService.LoadPlugins(); + // _pluginService.CopyBuiltInPlugins(); + // _pluginService.LoadPlugins(); var surfaceConfig = _surfaceService.ActiveSurface; if (surfaceConfig != null) diff --git a/src/Artemis.Core/app.config b/src/Artemis.Core/app.config deleted file mode 100644 index fc0c529af..000000000 --- a/src/Artemis.Core/app.config +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index d003a657a..4a1745b00 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -24,7 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -35,7 +35,6 @@ - diff --git a/src/Artemis.UI.Shared/FodyWeavers.xml b/src/Artemis.UI.Shared/FodyWeavers.xml index d5abfed81..ef627f96d 100644 --- a/src/Artemis.UI.Shared/FodyWeavers.xml +++ b/src/Artemis.UI.Shared/FodyWeavers.xml @@ -1,3 +1,5 @@ - + + + \ No newline at end of file diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index e76803bc8..57e6a4c77 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -133,8 +133,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + @@ -150,7 +150,6 @@ - all diff --git a/src/Artemis.UI/PropertyInput/SKPointPropertyInputViewModel.cs b/src/Artemis.UI/PropertyInput/SKPointPropertyInputViewModel.cs index 9465fb7c4..911445cf9 100644 --- a/src/Artemis.UI/PropertyInput/SKPointPropertyInputViewModel.cs +++ b/src/Artemis.UI/PropertyInput/SKPointPropertyInputViewModel.cs @@ -4,7 +4,7 @@ using Artemis.Core.Models.Profile.LayerProperties; using Artemis.UI.Shared.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; using FluentValidation; -using PropertyChanged; +// using PropertyChanged; using SkiaSharp; using Stylet; @@ -18,14 +18,14 @@ namespace Artemis.UI.PropertyInput } // Since SKPoint is immutable we need to create properties that replace the SKPoint entirely - [DependsOn(nameof(InputValue))] + // [DependsOn(nameof(InputValue))] public float X { get => InputValue.X; set => InputValue = new SKPoint(value, Y); } - [DependsOn(nameof(InputValue))] + // [DependsOn(nameof(InputValue))] public float Y { get => InputValue.Y; diff --git a/src/Artemis.UI/PropertyInput/SKSizePropertyInputViewModel.cs b/src/Artemis.UI/PropertyInput/SKSizePropertyInputViewModel.cs index 4165dff5e..b4f371222 100644 --- a/src/Artemis.UI/PropertyInput/SKSizePropertyInputViewModel.cs +++ b/src/Artemis.UI/PropertyInput/SKSizePropertyInputViewModel.cs @@ -4,7 +4,7 @@ using Artemis.Core.Models.Profile.LayerProperties; using Artemis.UI.Shared.PropertyInput; using Artemis.UI.Shared.Services.Interfaces; using FluentValidation; -using PropertyChanged; +// using PropertyChanged; using SkiaSharp; using Stylet; @@ -18,14 +18,14 @@ namespace Artemis.UI.PropertyInput } // Since SKSize is immutable we need to create properties that replace the SKSize entirely - [DependsOn(nameof(InputValue))] + // [DependsOn(nameof(InputValue))] public float Width { get => InputValue.Width; set => InputValue = new SKSize(value, Height); } - [DependsOn(nameof(InputValue))] + // [DependsOn(nameof(InputValue))] public float Height { get => InputValue.Height; diff --git a/src/Artemis.UI/Screens/Settings/Debug/DeviceDebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/DeviceDebugViewModel.cs index 7d980fc49..ef3e83cd8 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/DeviceDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Debug/DeviceDebugViewModel.cs @@ -5,7 +5,7 @@ using System.IO; using Artemis.Core.Models.Surface; using Artemis.Core.Services; using Artemis.UI.Shared.Services.Interfaces; -using PropertyChanged; +// using PropertyChanged; using Stylet; namespace Artemis.UI.Screens.Settings.Debug @@ -22,7 +22,7 @@ namespace Artemis.UI.Screens.Settings.Debug Device = device; } - [DependsOn(nameof(SelectedLed))] + // [DependsOn(nameof(SelectedLed))] public List SelectedLeds => SelectedLed != null ? new List {SelectedLed} : null; public ArtemisDevice Device { get; } diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll index aaa4030f0..40e14cd47 100644 Binary files a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll and b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll differ diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll index 8490e4041..86d8ce8fe 100644 Binary files a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll and b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll differ diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj index 69f924a12..aa3a7c8f5 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj index fe7e89e03..a692d2b5d 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj index 32073afb0..840db3461 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj @@ -27,7 +27,6 @@ - diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj index d29a8e43a..5daba2276 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj @@ -27,7 +27,6 @@ - @@ -36,7 +35,6 @@ - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj index 6336fe8ac..f2d8420b8 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj +++ b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj @@ -27,7 +27,6 @@ -