diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 22a877977..6732dfd6f 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,6 +1,6 @@  - + Debug @@ -40,17 +40,17 @@ ..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll - ..\packages\Ben.Demystifier.0.1.4\lib\net45\Ben.Demystifier.dll + ..\packages\Ben.Demystifier.0.1.6\lib\net45\Ben.Demystifier.dll ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - ..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll + + ..\packages\LiteDB.5.0.3\lib\net45\LiteDB.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll @@ -65,8 +65,8 @@ ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - ..\packages\PropertyChanged.Fody.3.1.3\lib\net40\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.3.2.6\lib\net40\PropertyChanged.dll False @@ -85,7 +85,7 @@ ..\..\..\RGB.NET\bin\net45\RGB.NET.Groups.dll - ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll + ..\packages\Serilog.2.9.0\lib\net46\Serilog.dll ..\packages\Serilog.Enrichers.Demystify.1.0.0-dev-00019\lib\net45\Serilog.Enrichers.Demystify.dll @@ -106,14 +106,11 @@ ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - ..\packages\System.Collections.Immutable.1.6.0-preview8.19405.3\lib\netstandard2.0\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -121,12 +118,15 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.Metadata.1.7.0-preview8.19405.3\lib\netstandard2.0\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.1.8.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -228,14 +228,14 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + + \ No newline at end of file diff --git a/src/Artemis.Core/app.config b/src/Artemis.Core/app.config index 29342a3c3..fc0c529af 100644 --- a/src/Artemis.Core/app.config +++ b/src/Artemis.Core/app.config @@ -13,7 +13,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/src/Artemis.Core/packages.config b/src/Artemis.Core/packages.config index 867b73146..9f6228789 100644 --- a/src/Artemis.Core/packages.config +++ b/src/Artemis.Core/packages.config @@ -1,29 +1,29 @@  - + - - - + + + - - + + - + - - - + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj b/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj index 619003f12..91e4da6bd 100644 --- a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj +++ b/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj @@ -45,10 +45,6 @@ - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - False - @@ -69,7 +65,6 @@ - PreserveNewest diff --git a/src/Artemis.Plugins.Devices.Corsair/app.config b/src/Artemis.Plugins.Devices.Corsair/app.config index 7567ab9a5..0427e7656 100644 --- a/src/Artemis.Plugins.Devices.Corsair/app.config +++ b/src/Artemis.Plugins.Devices.Corsair/app.config @@ -17,7 +17,7 @@ - + @@ -25,11 +25,11 @@ - + - + diff --git a/src/Artemis.Plugins.Devices.Corsair/packages.config b/src/Artemis.Plugins.Devices.Corsair/packages.config deleted file mode 100644 index 9ea274301..000000000 --- a/src/Artemis.Plugins.Devices.Corsair/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Logitech/app.config b/src/Artemis.Plugins.Devices.Logitech/app.config index be637eaeb..aed5d2184 100644 --- a/src/Artemis.Plugins.Devices.Logitech/app.config +++ b/src/Artemis.Plugins.Devices.Logitech/app.config @@ -9,11 +9,11 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/src/Artemis.Plugins.Devices.Wooting/app.config b/src/Artemis.Plugins.Devices.Wooting/app.config index be637eaeb..aed5d2184 100644 --- a/src/Artemis.Plugins.Devices.Wooting/app.config +++ b/src/Artemis.Plugins.Devices.Wooting/app.config @@ -9,11 +9,11 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj b/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj index 62d5b8bc8..2187950c7 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj @@ -38,10 +38,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll - False - ..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll False @@ -71,12 +67,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - False + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll diff --git a/src/Artemis.Plugins.LayerBrushes.Color/app.config b/src/Artemis.Plugins.LayerBrushes.Color/app.config index 983b4f4d9..9d3293c49 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/app.config +++ b/src/Artemis.Plugins.LayerBrushes.Color/app.config @@ -17,7 +17,7 @@ - + @@ -25,11 +25,11 @@ - + - + diff --git a/src/Artemis.Plugins.LayerBrushes.Color/packages.config b/src/Artemis.Plugins.LayerBrushes.Color/packages.config index 578bcdc05..ad8cefb67 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/packages.config +++ b/src/Artemis.Plugins.LayerBrushes.Color/packages.config @@ -1,12 +1,9 @@  - - - - + \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj b/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj index 0d1fbc9dd..1dd8085d2 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj @@ -71,8 +71,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/app.config b/src/Artemis.Plugins.LayerBrushes.Noise/app.config index 360ea34d1..733d2fa60 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/app.config +++ b/src/Artemis.Plugins.LayerBrushes.Noise/app.config @@ -5,11 +5,11 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/packages.config b/src/Artemis.Plugins.LayerBrushes.Noise/packages.config index 9f80be75e..ad8cefb67 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/packages.config +++ b/src/Artemis.Plugins.LayerBrushes.Noise/packages.config @@ -1,10 +1,9 @@  - - + \ No newline at end of file diff --git a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj b/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj index f35331001..545478b81 100644 --- a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj +++ b/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj @@ -1,5 +1,4 @@  - @@ -41,9 +40,6 @@ - - ..\packages\QRCoder.1.3.5\lib\net40\QRCoder.dll - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll @@ -66,12 +62,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - False + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll @@ -120,7 +112,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/Artemis.Plugins.Modules.General/app.config b/src/Artemis.Plugins.Modules.General/app.config index 983b4f4d9..9d3293c49 100644 --- a/src/Artemis.Plugins.Modules.General/app.config +++ b/src/Artemis.Plugins.Modules.General/app.config @@ -17,7 +17,7 @@ - + @@ -25,11 +25,11 @@ - + - + diff --git a/src/Artemis.Plugins.Modules.General/packages.config b/src/Artemis.Plugins.Modules.General/packages.config index 83271280c..ad8cefb67 100644 --- a/src/Artemis.Plugins.Modules.General/packages.config +++ b/src/Artemis.Plugins.Modules.General/packages.config @@ -1,13 +1,9 @@  - - - - - + \ No newline at end of file diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 4a42f4dc9..31e94738e 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -6,7 +6,7 @@ 7 - + diff --git a/src/Artemis.Storage/Repositories/ProfileRepository.cs b/src/Artemis.Storage/Repositories/ProfileRepository.cs index 42149d4f9..5ca90ea2e 100644 --- a/src/Artemis.Storage/Repositories/ProfileRepository.cs +++ b/src/Artemis.Storage/Repositories/ProfileRepository.cs @@ -23,7 +23,7 @@ namespace Artemis.Storage.Repositories public void Remove(ProfileEntity profileEntity) { - _repository.Delete(s => s.Id == profileEntity.Id); + _repository.Delete(profileEntity.Id); } public List GetAll() diff --git a/src/Artemis.Storage/Repositories/SurfaceRepository.cs b/src/Artemis.Storage/Repositories/SurfaceRepository.cs index c8d474c1c..8d58b7d39 100644 --- a/src/Artemis.Storage/Repositories/SurfaceRepository.cs +++ b/src/Artemis.Storage/Repositories/SurfaceRepository.cs @@ -22,7 +22,7 @@ namespace Artemis.Storage.Repositories public void Remove(SurfaceEntity surfaceEntity) { - _repository.Delete(s => s.Id == surfaceEntity.Id); + _repository.Delete(surfaceEntity.Id); } public SurfaceEntity GetByName(string name) diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index aff7d6759..85ed55959 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -41,29 +41,29 @@ ..\packages\Humanizer.Core.2.7.9\lib\netstandard2.0\Humanizer.dll - - ..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll + + ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll - - ..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll @@ -116,6 +116,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator @@ -130,5 +131,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/Artemis.UI.Shared/app.config b/src/Artemis.UI.Shared/app.config new file mode 100644 index 000000000..33ded1e89 --- /dev/null +++ b/src/Artemis.UI.Shared/app.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI.Shared/packages.config b/src/Artemis.UI.Shared/packages.config index 1d06c555d..545ceab0a 100644 --- a/src/Artemis.UI.Shared/packages.config +++ b/src/Artemis.UI.Shared/packages.config @@ -1,12 +1,11 @@  - - - + + - + - - + + \ No newline at end of file diff --git a/src/Artemis.UI/App.config b/src/Artemis.UI/App.config index 15f01e053..e9fe61c5e 100644 --- a/src/Artemis.UI/App.config +++ b/src/Artemis.UI/App.config @@ -12,7 +12,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 4414933e6..28cb0952f 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,6 +1,6 @@  - + Debug @@ -47,10 +47,10 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\FluentValidation.8.5.0\lib\net45\FluentValidation.dll + ..\packages\FluentValidation.8.6.1\lib\net45\FluentValidation.dll - ..\packages\gong-wpf-dragdrop.2.1.0\lib\net47\GongSolutions.WPF.DragDrop.dll + ..\packages\gong-wpf-dragdrop.2.2.0\lib\net47\GongSolutions.WPF.DragDrop.dll ..\packages\Humanizer.Core.2.7.9\lib\netstandard2.0\Humanizer.dll @@ -59,7 +59,7 @@ ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll - ..\packages\MaterialDesignExtensions.3.0.0-a03\lib\net45\MaterialDesignExtensions.dll + ..\packages\MaterialDesignExtensions.3.0.0\lib\net45\MaterialDesignExtensions.dll ..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll @@ -77,8 +77,8 @@ ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - ..\packages\PropertyChanged.Fody.3.1.3\lib\net40\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.3.2.6\lib\net40\PropertyChanged.dll False @@ -89,7 +89,7 @@ ..\..\..\RGB.NET\bin\net45\RGB.NET.Groups.dll - ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll + ..\packages\Serilog.2.9.0\lib\net46\Serilog.dll ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll @@ -108,7 +108,7 @@ ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - ..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll @@ -121,8 +121,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -573,15 +573,14 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + @@ -592,4 +591,5 @@ + \ No newline at end of file diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config index 3dd7a73e8..903d94bda 100644 --- a/src/Artemis.UI/packages.config +++ b/src/Artemis.UI/packages.config @@ -1,28 +1,27 @@  - - - - + + + - + - - + + - + - + \ No newline at end of file diff --git a/src/Artemis.sln.DotSettings b/src/Artemis.sln.DotSettings index 9b1efd82e..2016ed3fe 100644 --- a/src/Artemis.sln.DotSettings +++ b/src/Artemis.sln.DotSettings @@ -54,7 +54,7 @@ </Entry.SortBy> </Entry> <Entry DisplayName="All other members" /> - <Entry DisplayName="Test Methods" Priority="100"> + <Entry Priority="100" DisplayName="Test Methods"> <Entry.Match> <And> <Kind Is="Method" /> @@ -87,7 +87,7 @@ </Entry.Match> </Entry> <Entry DisplayName="All other members" /> - <Entry DisplayName="Test Methods" Priority="100"> + <Entry Priority="100" DisplayName="Test Methods"> <Entry.Match> <And> <Kind Is="Method" /> @@ -100,7 +100,7 @@ </Entry> </TypePattern> <TypePattern DisplayName="Default Pattern"> - <Entry DisplayName="Public Delegates" Priority="100"> + <Entry Priority="100" DisplayName="Public Delegates"> <Entry.Match> <And> <Access Is="Public" /> @@ -111,7 +111,7 @@ <Name /> </Entry.SortBy> </Entry> - <Entry DisplayName="Public Enums" Priority="100"> + <Entry Priority="100" DisplayName="Public Enums"> <Entry.Match> <And> <Access Is="Public" /> @@ -166,7 +166,7 @@ </Or> </Entry.Match> </Entry> - <Entry DisplayName="Interface Implementations" Priority="100"> + <Entry Priority="100" DisplayName="Interface Implementations"> <Entry.Match> <And> <Kind Is="Member" /> @@ -240,5 +240,6 @@ True True True + True True True \ No newline at end of file