diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 6732dfd6f..90e552ee4 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,241 +1,61 @@ - - - - + - Debug - AnyCPU - {9B811F9B-86B9-4771-87AF-72BAE7078A36} - Library - Properties - Artemis.Core - Artemis.Core - v4.7.2 - 512 + netcoreapp3.1 false - - - + Artemis.Core + Artemis + Copyright © Robert Beekman - 2019 + MinimumRecommendedRules.ruleset + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - ..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.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.5.0.3\lib\net45\LiteDB.dll - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll - - - ..\packages\Ninject.Extensions.ChildKernel.3.3.0\lib\net45\Ninject.Extensions.ChildKernel.dll - - - ..\packages\Ninject.Extensions.Conventions.3.3.0\lib\net45\Ninject.Extensions.Conventions.dll - - - ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - - - ..\packages\PropertyChanged.Fody.3.2.6\lib\net40\PropertyChanged.dll - - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Brushes.dll + False - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll + False - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Decorators.dll + False - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Groups.dll + False - - ..\packages\Serilog.2.9.0\lib\net46\Serilog.dll - - - ..\packages\Serilog.Enrichers.Demystify.1.0.0-dev-00019\lib\net45\Serilog.Enrichers.Demystify.dll - - - ..\packages\Serilog.Sinks.Debug.1.0.1\lib\net46\Serilog.Sinks.Debug.dll - - - ..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll - - - ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - - ..\packages\Stylet.1.3.1\lib\net45\Stylet.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Reflection.Metadata.1.8.0\lib\netstandard2.0\System.Reflection.Metadata.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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65} - Artemis.Storage + true - - - - - 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/Extensions/RgbDeviceExtensions.cs b/src/Artemis.Core/Extensions/RgbDeviceExtensions.cs index 8e8a37c38..e4a637e37 100644 --- a/src/Artemis.Core/Extensions/RgbDeviceExtensions.cs +++ b/src/Artemis.Core/Extensions/RgbDeviceExtensions.cs @@ -4,17 +4,13 @@ namespace Artemis.Core.Extensions { public static class RgbDeviceExtensions { - public static int GetDeviceHashCode(this IRGBDevice rgbDevice) + public static string GetDeviceIdentifier(this IRGBDevice rgbDevice) { - unchecked - { - var hashCode = rgbDevice.DeviceInfo.DeviceName?.GetHashCode() ?? 0; - hashCode = (hashCode * 397) ^ (rgbDevice.DeviceInfo.Manufacturer?.GetHashCode() ?? 0); - hashCode = (hashCode * 397) ^ (rgbDevice.DeviceInfo.Model?.GetHashCode() ?? 0); - hashCode = (hashCode * 397) ^ (int) rgbDevice.DeviceInfo.DeviceType; - hashCode = (hashCode * 397) ^ (int) rgbDevice.DeviceInfo.Lighting; - return hashCode; - } + return rgbDevice.DeviceInfo.DeviceName + + "-" + rgbDevice.DeviceInfo.Manufacturer + + "-" + rgbDevice.DeviceInfo.Model + + "-" + rgbDevice.DeviceInfo.DeviceType + + "-" + rgbDevice.DeviceInfo.Lighting; } } } \ No newline at end of file diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs index cd55329db..eea5762ad 100644 --- a/src/Artemis.Core/Models/Profile/Layer.cs +++ b/src/Artemis.Core/Models/Profile/Layer.cs @@ -168,7 +168,7 @@ namespace Artemis.Core.Models.Profile { var ledEntity = new LedEntity { - DeviceHash = artemisLed.Device.RgbDevice.GetDeviceHashCode(), + DeviceIdentifier = artemisLed.Device.RgbDevice.GetDeviceIdentifier(), LedName = artemisLed.RgbLed.Id.ToString() }; LayerEntity.Leds.Add(ledEntity); @@ -406,7 +406,7 @@ namespace Artemis.Core.Models.Profile var availableLeds = surface.Devices.SelectMany(d => d.Leds).ToList(); foreach (var ledEntity in LayerEntity.Leds) { - var match = availableLeds.FirstOrDefault(a => a.Device.RgbDevice.GetDeviceHashCode() == ledEntity.DeviceHash && + var match = availableLeds.FirstOrDefault(a => a.Device.RgbDevice.GetDeviceIdentifier() == ledEntity.DeviceIdentifier && a.RgbLed.Id.ToString() == ledEntity.LedName); if (match != null) leds.Add(match); diff --git a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs index 066d2441d..9e46be114 100644 --- a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs +++ b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs @@ -91,7 +91,7 @@ namespace Artemis.Core.Models.Surface internal void ApplyToEntity() { // Other properties are computed - DeviceEntity.DeviceHashCode = RgbDevice.GetDeviceHashCode(); + DeviceEntity.DeviceIdentifier = RgbDevice.GetDeviceIdentifier(); } internal void ApplyToRgbDevice() diff --git a/src/Artemis.Core/Plugins/Models/PluginInfo.cs b/src/Artemis.Core/Plugins/Models/PluginInfo.cs index 654715475..3c070b2c2 100644 --- a/src/Artemis.Core/Plugins/Models/PluginInfo.cs +++ b/src/Artemis.Core/Plugins/Models/PluginInfo.cs @@ -1,7 +1,8 @@ using System; using System.IO; -using AppDomainToolkit; +using System.Reflection; using Artemis.Core.Plugins.Abstract; +using McMaster.NETCore.Plugins; using Newtonsoft.Json; namespace Artemis.Core.Plugins.Models @@ -55,10 +56,16 @@ namespace Artemis.Core.Plugins.Models public bool Enabled { get; internal set; } /// - /// The AppDomain context of this plugin + /// The PluginLoader backing this plugin /// [JsonIgnore] - internal AppDomainContext Context { get; set; } + internal PluginLoader PluginLoader { get; set; } + + /// + /// The assembly the plugin code lives in + /// + [JsonIgnore] + internal Assembly Assembly { get; set; } public override string ToString() { diff --git a/src/Artemis.Core/Properties/AssemblyInfo.cs b/src/Artemis.Core/Properties/AssemblyInfo.cs index 3c417c4e2..c5012b6bd 100644 --- a/src/Artemis.Core/Properties/AssemblyInfo.cs +++ b/src/Artemis.Core/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis")] -[assembly: AssemblyCopyright("Copyright © Robert Beekman - 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("9b811f9b-86b9-4771-87af-72bae7078a36")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Core/Services/PluginService.cs b/src/Artemis.Core/Services/PluginService.cs index 691c26674..ce6125ae3 100644 --- a/src/Artemis.Core/Services/PluginService.cs +++ b/src/Artemis.Core/Services/PluginService.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using AppDomainToolkit; using Artemis.Core.Events; using Artemis.Core.Exceptions; using Artemis.Core.Extensions; @@ -11,6 +10,7 @@ using Artemis.Core.Plugins.Abstract; using Artemis.Core.Plugins.Exceptions; using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; +using McMaster.NETCore.Plugins; using Newtonsoft.Json; using Ninject; using Ninject.Extensions.ChildKernel; @@ -198,17 +198,15 @@ namespace Artemis.Core.Services throw new ArtemisPluginException(pluginInfo, "Couldn't find the plugins main entry at " + mainFile); // Load the plugin, all types implementing Plugin and register them with DI - var setupInfo = new AppDomainSetup + pluginInfo.PluginLoader = PluginLoader.CreateFromAssemblyFile(mainFile, configure => { - ApplicationName = pluginInfo.Guid.ToString(), - ApplicationBase = AppDomain.CurrentDomain.BaseDirectory, - PrivateBinPath = pluginInfo.Directory.FullName - }; - pluginInfo.Context = AppDomainContext.Create(setupInfo); + configure.IsUnloadable = true; + configure.PreferSharedTypes = true; + }); try { - pluginInfo.Context.LoadAssemblyWithReferences(LoadMethod.LoadFrom, mainFile); + pluginInfo.Assembly = pluginInfo.PluginLoader.LoadDefaultAssembly(); } catch (Exception e) { @@ -217,12 +215,9 @@ namespace Artemis.Core.Services // Get the Plugin implementation from the main assembly and if there is only one, instantiate it List pluginTypes; - var mainAssembly = pluginInfo.Context.Domain.GetAssemblies().FirstOrDefault(a => a.Location == mainFile); - if (mainAssembly == null) - throw new ArtemisPluginException(pluginInfo, "Found no supported assembly in the plugins main file"); try { - pluginTypes = mainAssembly.GetTypes().Where(t => typeof(Plugin).IsAssignableFrom(t)).ToList(); + pluginTypes = pluginInfo.Assembly.GetTypes().Where(t => typeof(Plugin).IsAssignableFrom(t)).ToList(); } catch (ReflectionTypeLoadException e) { @@ -275,7 +270,7 @@ namespace Artemis.Core.Services _childKernel.Unbind(pluginInfo.Instance.GetType()); pluginInfo.Instance.Dispose(); - pluginInfo.Context.Dispose(); + pluginInfo.PluginLoader.Dispose(); _plugins.Remove(pluginInfo); OnPluginUnloaded(new PluginEventArgs(pluginInfo)); diff --git a/src/Artemis.Core/Services/Storage/Interfaces/ISurfaceService.cs b/src/Artemis.Core/Services/Storage/Interfaces/ISurfaceService.cs index e70192d96..d028f84d1 100644 --- a/src/Artemis.Core/Services/Storage/Interfaces/ISurfaceService.cs +++ b/src/Artemis.Core/Services/Storage/Interfaces/ISurfaceService.cs @@ -47,7 +47,7 @@ namespace Artemis.Core.Services.Storage.Interfaces /// /// Occurs when the active device entity has been changed /// - event EventHandler ActiveSurfaceConfigurationChanged; + event EventHandler ActiveSurfaceConfigurationSelected; /// /// Occurs when a surface configuration has been updated diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index b1a451cae..8434ea02b 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -33,7 +33,7 @@ namespace Artemis.Core.Services.Storage _layerService = layerService; _profileRepository = profileRepository; - _surfaceService.ActiveSurfaceConfigurationChanged += OnActiveSurfaceConfigurationChanged; + _surfaceService.ActiveSurfaceConfigurationSelected += OnActiveSurfaceConfigurationSelected; _surfaceService.SurfaceConfigurationUpdated += OnSurfaceConfigurationUpdated; _pluginService.PluginLoaded += OnPluginLoaded; } @@ -196,7 +196,7 @@ namespace Artemis.Core.Services.Storage #region Event handlers - private void OnActiveSurfaceConfigurationChanged(object sender, SurfaceConfigurationEventArgs e) + private void OnActiveSurfaceConfigurationSelected(object sender, SurfaceConfigurationEventArgs e) { ActiveProfilesPopulateLeds(e.Surface); } diff --git a/src/Artemis.Core/Services/Storage/SurfaceService.cs b/src/Artemis.Core/Services/Storage/SurfaceService.cs index 40704edf8..dc4dc2145 100644 --- a/src/Artemis.Core/Services/Storage/SurfaceService.cs +++ b/src/Artemis.Core/Services/Storage/SurfaceService.cs @@ -139,7 +139,7 @@ namespace Artemis.Core.Services.Storage var surfaceConfiguration = new ArtemisSurface(_rgbService.Surface, surfaceEntity, _renderScaleSetting.Value); foreach (var position in surfaceEntity.DeviceEntities) { - var device = _rgbService.Surface.Devices.FirstOrDefault(d => d.GetDeviceHashCode() == position.DeviceHashCode); + var device = _rgbService.Surface.Devices.FirstOrDefault(d => d.GetDeviceIdentifier() == position.DeviceIdentifier); if (device != null) { var plugin = _pluginService.GetDevicePlugin(device); @@ -174,14 +174,14 @@ namespace Artemis.Core.Services.Storage private void AddDeviceIfMissing(IRGBDevice rgbDevice, ArtemisSurface surface) { - var deviceHashCode = rgbDevice.GetDeviceHashCode(); - var device = surface.Devices.FirstOrDefault(d => d.DeviceEntity.DeviceHashCode == deviceHashCode); + var deviceIdentifier = rgbDevice.GetDeviceIdentifier(); + var device = surface.Devices.FirstOrDefault(d => d.DeviceEntity.DeviceIdentifier == deviceIdentifier); if (device != null) return; // Find an existing device config and use that - var existingDeviceConfig = surface.SurfaceEntity.DeviceEntities.FirstOrDefault(d => d.DeviceHashCode == deviceHashCode); + var existingDeviceConfig = surface.SurfaceEntity.DeviceEntities.FirstOrDefault(d => d.DeviceIdentifier == deviceIdentifier); if (existingDeviceConfig != null) { var plugin = _pluginService.GetDevicePlugin(rgbDevice); @@ -193,7 +193,7 @@ namespace Artemis.Core.Services.Storage _logger.Information( "No device config found for {deviceInfo}, device hash: {deviceHashCode}. Adding a new entry.", rgbDevice.DeviceInfo, - deviceHashCode + deviceIdentifier ); var plugin = _pluginService.GetDevicePlugin(rgbDevice); device = new ArtemisDevice(rgbDevice, plugin, surface); @@ -230,12 +230,12 @@ namespace Artemis.Core.Services.Storage #region Events - public event EventHandler ActiveSurfaceConfigurationChanged; + public event EventHandler ActiveSurfaceConfigurationSelected; public event EventHandler SurfaceConfigurationUpdated; protected virtual void OnActiveSurfaceConfigurationChanged(SurfaceConfigurationEventArgs e) { - ActiveSurfaceConfigurationChanged?.Invoke(this, e); + ActiveSurfaceConfigurationSelected?.Invoke(this, e); } protected virtual void OnSurfaceConfigurationUpdated(SurfaceConfigurationEventArgs e) diff --git a/src/Artemis.Core/packages.config b/src/Artemis.Core/packages.config deleted file mode 100644 index 9f6228789..000000000 --- a/src/Artemis.Core/packages.config +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 91e4da6bd..bbfa5adbb 100644 --- a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj +++ b/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj @@ -1,70 +1,35 @@ - - - + - Debug - AnyCPU - {A779B2F8-C253-4C4B-8634-6EB8F594E96D} - Library - Properties - Artemis.Plugins.Devices.Corsair - Artemis.Plugins.Devices.Corsair - v4.7.2 - 512 - true - - + netcoreapp3.1 + Artemis.Plugins.Devices.CorsairDevice + Artemis.Plugins.Devices.CorsairDevice + Copyright © 2019 + MinimumRecommendedRules.ruleset + 7.3 + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset + + + ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Corsair.dll + False - - - - - - - - - - + - - {9B811F9B-86B9-4771-87AF-72BAE7078A36} - Artemis.Core - False - - - - PreserveNewest @@ -77,16 +42,7 @@ PreserveNewest - - - echo Copying resources to plugin output directory -XCOPY "$(ProjectDir)Images" "$(TargetDir)Images" /s /q /i /y -XCOPY "$(ProjectDir)Layouts" "$(TargetDir)Layouts" /s /q /i /y -echo Copying plugin to Artemis.UI output directory -XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - - - - - + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs index e2749984a..5923714b1 100644 --- a/src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.Devices.CorsairDevice")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis.Plugins.Devices.CorsairDevice")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("a779b2f8-c253-4c4b-8634-6eb8f594e96d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Corsair/plugin.json b/src/Artemis.Plugins.Devices.Corsair/plugin.json index 9846e0d1f..4e455fd0c 100644 --- a/src/Artemis.Plugins.Devices.Corsair/plugin.json +++ b/src/Artemis.Plugins.Devices.Corsair/plugin.json @@ -1,10 +1,6 @@ { "Guid": "926629ab-8170-42f3-be18-22c694aa91cd", "Name": "Corsair Devices", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.Devices.Corsair.dll" } \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj b/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj index 0ea1a4bf3..fd405c96c 100644 --- a/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj +++ b/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj @@ -1,37 +1,18 @@ - - - + - Debug - AnyCPU - {235A45C7-24AD-4F47-B9D4-CD67E610A04D} - Library - Properties - Artemis.Plugins.Devices.Logitech - Artemis.Plugins.Devices.Logitech - v4.7.2 - 512 - true + netcoreapp3.1 + Artemis.Plugins.Devices.Logitech + Artemis.Plugins.Devices.Logitech + Copyright © 2019 + MinimumRecommendedRules.ruleset + 7.3 + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset @@ -40,25 +21,9 @@ ..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Logitech.dll - - - - - - - - - - - - - - {9B811F9B-86B9-4771-87AF-72BAE7078A36} - Artemis.Core - False - + @@ -69,17 +34,11 @@ - PreserveNewest - - - echo Copying resources to plugin output directory -XCOPY "$(ProjectDir)Images" "$(TargetDir)Images" /s /q /i /y -XCOPY "$(ProjectDir)Layouts" "$(TargetDir)Layouts" /s /q /i /y -echo Copying plugin to Artemis.UI output directory -XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs index a04c96540..59bea6ed1 100644 --- a/src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.Devices.Logitech")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis.Plugins.Devices.Logitech")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("235a45c7-24ad-4f47-b9d4-cd67e610a04d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Logitech/plugin.json b/src/Artemis.Plugins.Devices.Logitech/plugin.json index 1ffd798fa..4680d7fed 100644 --- a/src/Artemis.Plugins.Devices.Logitech/plugin.json +++ b/src/Artemis.Plugins.Devices.Logitech/plugin.json @@ -1,10 +1,6 @@ { "Guid": "62a45c0c-884c-4868-9fd7-3c5987fe07ca", "Name": "Logitech Devices", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.Devices.Logitech.dll" } \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj b/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj index 497643022..ea28096d7 100644 --- a/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj +++ b/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj @@ -1,37 +1,18 @@ - - - + - Debug - AnyCPU - {C6BDB6D9-062D-4C28-A280-F3BD6197F07F} - Library - Properties - Artemis.Plugins.Devices.Wooting - Artemis.Plugins.Devices.Wooting - v4.7.2 - 512 - true + netcoreapp3.1 + Artemis.Plugins.Devices.Wooting + Artemis.Plugins.Devices.Wooting + Copyright © 2019 + MinimumRecommendedRules.ruleset + 7.3 + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset @@ -40,33 +21,15 @@ ..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Wooting.dll - - - - - - - - - - - - - PreserveNewest - - {9b811f9b-86b9-4771-87af-72bae7078a36} - Artemis.Core - False - + - PreserveNewest @@ -75,12 +38,7 @@ PreserveNewest - - - echo Copying resources to plugin output directory -XCOPY "$(ProjectDir)Images" "$(TargetDir)Images" /s /q /i /y -XCOPY "$(ProjectDir)Layouts" "$(TargetDir)Layouts" /s /q /i /y -echo Copying plugin to Artemis.UI output directory -XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs index 27fe6aeeb..387240943 100644 --- a/src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.Devices.Wooting")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis.Plugins.Devices.Wooting")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.Devices.Wooting/plugin.json b/src/Artemis.Plugins.Devices.Wooting/plugin.json index 6851ed5be..62721a268 100644 --- a/src/Artemis.Plugins.Devices.Wooting/plugin.json +++ b/src/Artemis.Plugins.Devices.Wooting/plugin.json @@ -1,10 +1,6 @@ { "Guid": "e70fd5ba-9881-480a-8ff6-078ed5f747fa", "Name": "Wooting Devices", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.Devices.Wooting.dll" } \ No newline at end of file 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 2187950c7..581959106 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj @@ -1,119 +1,39 @@ - - - + - Debug - AnyCPU - {0F288A66-6EB0-4589-8595-E33A3A3EAEA2} - Library - Properties - Artemis.Plugins.LayerBrushes.Color - Artemis.Plugins.LayerBrushes.Color - v4.7.2 - 512 - true + netcoreapp3.1 false - - - + Artemis.Plugins.LayerBrushes.Color + Artemis + Copyright © Robert Beekman - 2019 + MinimumRecommendedRules.ruleset + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 7 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 7.3 - prompt - MinimumRecommendedRules.ruleset - - ..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll - False - - - - - False - ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll - False - - - ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - - ..\packages\Stylet.1.3.1\lib\net45\Stylet.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.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - - - {9b811f9b-86b9-4771-87af-72bae7078a36} - Artemis.Core - False - - - {adb357e6-151d-4d0d-87cb-68fd0bc29812} - Artemis.UI.Shared - - - - - PreserveNewest - - - - echo Copying plugin to Artemis.UI output directory -XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - - - - - 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.LayerBrushes.Color/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs index bdee98c07..a3ad5f4f3 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.LayerBrushes.Color")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis")] -[assembly: AssemblyCopyright("Copyright © Robert Beekman - 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("0f288a66-6eb0-4589-8595-e33a3a3eaea2")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerBrushes.Color/packages.config b/src/Artemis.Plugins.LayerBrushes.Color/packages.config deleted file mode 100644 index ad8cefb67..000000000 --- a/src/Artemis.Plugins.LayerBrushes.Color/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerBrushes.Color/plugin.json b/src/Artemis.Plugins.LayerBrushes.Color/plugin.json index 72b94b411..09791069e 100644 --- a/src/Artemis.Plugins.LayerBrushes.Color/plugin.json +++ b/src/Artemis.Plugins.LayerBrushes.Color/plugin.json @@ -1,10 +1,6 @@ { "Guid": "92a9d6ba-6f7a-4937-94d5-c1d715b4141a", "Name": "Color layer brush", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.LayerBrushes.Color.dll" } \ 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 1dd8085d2..6572acd4b 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj +++ b/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj @@ -1,128 +1,40 @@ - - - + - Debug - AnyCPU - {7F4C7AB0-4C9B-452D-AFED-34544C903DEF} - Library - Properties - Artemis.Plugins.LayerBrushes.Noise - Artemis.Plugins.LayerBrushes.Noise - v4.7.2 - 512 - true + netcoreapp3.1 false - - - + Artemis.Plugins.LayerBrushes.Noise + Artemis.Plugins.LayerBrushes.Noise + Copyright © 2019 + MinimumRecommendedRules.ruleset + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 7 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 7.3 - prompt - MinimumRecommendedRules.ruleset - - ..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll - False - - - ..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll - False - - - - - False - ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll - False - - - ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - - ..\packages\Stylet.1.3.1\lib\net45\Stylet.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.5.0\lib\net46\System.Numerics.Vectors.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 - False - - - - - - - - - - - - - - - - - - - - {9b811f9b-86b9-4771-87af-72bae7078a36} - Artemis.Core - False - - - {adb357e6-151d-4d0d-87cb-68fd0bc29812} - Artemis.UI.Shared - - - - - PreserveNewest - - - - echo Copying plugin to Artemis.UI output directory -XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - - - - - 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.LayerBrushes.Noise/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs index e02904abd..c730cc822 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.LayerBrushes.Noise")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis.Plugins.LayerBrushes.Noise")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("7f4c7ab0-4c9b-452d-afed-34544c903def")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/packages.config b/src/Artemis.Plugins.LayerBrushes.Noise/packages.config deleted file mode 100644 index ad8cefb67..000000000 --- a/src/Artemis.Plugins.LayerBrushes.Noise/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/plugin.json b/src/Artemis.Plugins.LayerBrushes.Noise/plugin.json index 361bd77b4..d148030d1 100644 --- a/src/Artemis.Plugins.LayerBrushes.Noise/plugin.json +++ b/src/Artemis.Plugins.LayerBrushes.Noise/plugin.json @@ -1,10 +1,6 @@ { "Guid": "61cbbf01-8d69-4ede-a972-f3f269da66d9", "Name": "Noise layer brush", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.LayerBrushes.Noise.dll" } \ 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 545478b81..7f1e54a5e 100644 --- a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj +++ b/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj @@ -1,117 +1,47 @@ - - - + - Debug - AnyCPU - {E592F239-FAA0-4840-9C85-46E5867D06D5} - Library - Properties - Artemis.Plugins.Modules.General - Artemis.Plugins.Modules.General - v4.7.2 - 512 - true + netcoreapp3.1 false - - - + Artemis.Plugins.Modules.General + Artemis + Copyright © Robert Beekman - 2019 + MinimumRecommendedRules.ruleset + bin\$(Platform)\$(Configuration)\ - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 7 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 7.3 - prompt - MinimumRecommendedRules.ruleset - - - - False - ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll - - - ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - - ..\packages\Stylet.1.3.1\lib\net45\Stylet.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.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - - - PreserveNewest - - - {9b811f9b-86b9-4771-87af-72bae7078a36} - Artemis.Core - False - - Designer MSBuild:Compile - - - - echo Copying plugin to Artemis.UI output directory - XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y - - - - - - 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/Properties/AssemblyInfo.cs b/src/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs index 2db588743..f9899c264 100644 --- a/src/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs +++ b/src/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.Plugins.Modules.General")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis")] -[assembly: AssemblyCopyright("Copyright © Robert Beekman - 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("e592f239-faa0-4840-9c85-46e5867d06d5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.Plugins.Modules.General/packages.config b/src/Artemis.Plugins.Modules.General/packages.config deleted file mode 100644 index ad8cefb67..000000000 --- a/src/Artemis.Plugins.Modules.General/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.Plugins.Modules.General/plugin.json b/src/Artemis.Plugins.Modules.General/plugin.json index bd33a88c6..256e5b80e 100644 --- a/src/Artemis.Plugins.Modules.General/plugin.json +++ b/src/Artemis.Plugins.Modules.General/plugin.json @@ -1,10 +1,6 @@ { "Guid": "0de2991a-d7b8-4f61-ae4e-6623849215b5", "Name": "General module", - "Version": { - "Major": 1, - "Minor": 0, - "Build": 0 - }, + "Version": "1.0.0.0", "Main": "Artemis.Plugins.Modules.General.dll" } \ No newline at end of file diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 31e94738e..461e90836 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,12 +1,10 @@  - - net472 - x64 + netcoreapp3.1 + x64;AnyCPU 7 - + - - + \ No newline at end of file diff --git a/src/Artemis.Storage/Entities/Profile/LedEntity.cs b/src/Artemis.Storage/Entities/Profile/LedEntity.cs index 74fd2d5dd..1b09e9111 100644 --- a/src/Artemis.Storage/Entities/Profile/LedEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/LedEntity.cs @@ -3,6 +3,6 @@ public class LedEntity { public string LedName { get; set; } - public int DeviceHash { get; set; } + public string DeviceIdentifier { get; set; } } } \ No newline at end of file diff --git a/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs b/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs index e49ab29d1..370aa8e45 100644 --- a/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs +++ b/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs @@ -4,9 +4,7 @@ namespace Artemis.Storage.Entities.Surface { public class DeviceEntity { - public Guid Id { get; set; } - - public int DeviceHashCode { get; set; } + public string DeviceIdentifier { get; set; } public double X { get; set; } public double Y { get; set; } public double Rotation { get; set; } diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 85ed55959..2510fabe7 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -1,137 +1,40 @@ - - - + - Debug - AnyCPU - {ADB357E6-151D-4D0D-87CB-68FD0BC29812} - library - Artemis.UI.Shared - Artemis.UI.Shared - v4.7.2 - 512 + netcoreapp3.1 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true false - - + Artemis.UI.Shared + HP Inc. + Artemis.UI.Shared + Copyright © HP Inc. 2019 + MinimumRecommendedRules.ruleset + 7.3 + bin\$(Platform)\$(Configuration)\ + true - true - bin\x64\Debug\ - DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - bin\x64\Release\ - TRACE - true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - - ..\packages\Humanizer.Core.2.7.9\lib\netstandard2.0\Humanizer.dll - - - ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.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.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.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - 4.0 - - - - + + + + + + - - DraggableFloat.xaml - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - ColorPicker.xaml - - - - + + + + + + + + + - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - 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/Properties/AssemblyInfo.cs b/src/Artemis.UI.Shared/Properties/AssemblyInfo.cs index 030e37330..6d2819a7a 100644 --- a/src/Artemis.UI.Shared/Properties/AssemblyInfo.cs +++ b/src/Artemis.UI.Shared/Properties/AssemblyInfo.cs @@ -2,18 +2,6 @@ using System.Runtime.InteropServices; using System.Windows; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis.UI.Shared")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HP Inc.")] -[assembly: AssemblyProduct("Artemis.UI.Shared")] -[assembly: AssemblyCopyright("Copyright © HP Inc. 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -37,17 +25,3 @@ using System.Windows; //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) )] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/src/Artemis.UI.Shared/packages.config b/src/Artemis.UI.Shared/packages.config deleted file mode 100644 index 545ceab0a..000000000 --- a/src/Artemis.UI.Shared/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI/App.config b/src/Artemis.UI/App.config deleted file mode 100644 index e9fe61c5e..000000000 --- a/src/Artemis.UI/App.config +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 28cb0952f..f30897f93 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,513 +1,64 @@ - - - - + - Debug - AnyCPU - {46B74153-77CF-4489-BDF9-D53FDB1F7ACB} WinExe - Artemis.UI - Artemis.UI - v4.7.2 - 512 + netcoreapp3.1 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 true - - - - - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset + Artemis + Artemis + en-US + Adds third-party support for RGB keyboards to games. + Copyright © Robert Beekman - 2019 + 2.0.0.0 + 2.0.0.0 true + MinimumRecommendedRules.ruleset + bin\$(Platform)\$(Configuration)\ + true + + + + + + full - bin\x64\Release\ - TRACE - true pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - logo-512.ico + Resources\logo-512.ico + + + + + + + + + - - ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\packages\FluentValidation.8.6.1\lib\net45\FluentValidation.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 - - - ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll - - - ..\packages\MaterialDesignExtensions.3.0.0\lib\net45\MaterialDesignExtensions.dll - - - ..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll - - - - ..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - - - ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll - - - ..\packages\Ninject.Extensions.Conventions.3.3.0\lib\net45\Ninject.Extensions.Conventions.dll - - - ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - - ..\packages\PropertyChanged.Fody.3.2.6\lib\net40\PropertyChanged.dll - - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll + False - False ..\..\..\RGB.NET\bin\net45\RGB.NET.Groups.dll + False - - ..\packages\Serilog.2.9.0\lib\net46\Serilog.dll - - - ..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll - - - ..\packages\SkiaSharp.Views.Desktop.Common.1.68.2-preview.29\lib\net45\SkiaSharp.Views.Desktop.Common.dll - - - ..\packages\SkiaSharp.Views.WPF.1.68.2-preview.29\lib\net45\SkiaSharp.Views.WPF.dll - - - ..\packages\Stylet.1.3.1\lib\net45\Stylet.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.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 - - - ..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll - - - - - 4.0 - - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - LayerPropertiesView.xaml - - - - - BrushPropertyInputView.xaml - - - - EnumPropertyInputView.xaml - - - - - - - SKColorPropertyInputView.xaml - - - - - - - - - - - - - - - - ProfileLayerView.xaml - - - - - SelectionRemoveToolView.xaml - - - - SelectionToolView.xaml - - - - ViewpointMoveToolView.xaml - - - - - LayerShapeControl.xaml - - - - SidebarView.xaml - - - - - - - - - - - - - - - - - - - ProfileElementRenameView.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.xaml - Code - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - True - Settings.settings - True - - + ResXFileCodeGenerator Designer Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - Designer - - - - - {9b811f9b-86b9-4771-87af-72bae7078a36} - Artemis.Core - - - {adb357e6-151d-4d0d-87cb-68fd0bc29812} - Artemis.UI.Shared - + + @@ -518,9 +69,6 @@ - - - @@ -554,42 +102,185 @@ - - - false - - - - - - - - - - - - - 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}. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + \ No newline at end of file diff --git a/src/Artemis.UI/Behaviors/TreeViewSelectionBehavior.cs b/src/Artemis.UI/Behaviors/TreeViewSelectionBehavior.cs index 2c05e51bd..f2e333196 100644 --- a/src/Artemis.UI/Behaviors/TreeViewSelectionBehavior.cs +++ b/src/Artemis.UI/Behaviors/TreeViewSelectionBehavior.cs @@ -1,7 +1,7 @@ using System.Collections.Specialized; using System.Windows; using System.Windows.Controls; -using System.Windows.Interactivity; +using Microsoft.Xaml.Behaviors; namespace Artemis.UI.Behaviors { diff --git a/src/Artemis.UI/Converters/ColorToDrawingColorConverter.cs b/src/Artemis.UI/Converters/ColorToDrawingColorConverter.cs deleted file mode 100644 index 4299912ab..000000000 --- a/src/Artemis.UI/Converters/ColorToDrawingColorConverter.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Drawing; -using System.Globalization; -using System.Windows.Data; - -namespace Artemis.UI.Converters -{ - /// - /// - /// Converts into . - /// - [ValueConversion(typeof(Color), typeof(System.Windows.Media.Color))] - public class ColorToDrawingColorConverter : IValueConverter - { - /// - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is Color drawingColor) - return System.Windows.Media.Color.FromArgb(drawingColor.A, drawingColor.R, drawingColor.G, drawingColor.B); - - return default(System.Windows.Media.Color); - } - - /// - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is System.Windows.Media.Color mediaColor) - return Color.FromArgb(mediaColor.A, mediaColor.R, mediaColor.G, mediaColor.B); - - return default(Color); - } - } -} \ No newline at end of file diff --git a/src/Artemis.UI/Properties/AssemblyInfo.cs b/src/Artemis.UI/Properties/AssemblyInfo.cs index bd367b9b2..d91c912d5 100644 --- a/src/Artemis.UI/Properties/AssemblyInfo.cs +++ b/src/Artemis.UI/Properties/AssemblyInfo.cs @@ -3,18 +3,6 @@ using System.Resources; using System.Runtime.InteropServices; using System.Windows; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Artemis")] -[assembly: AssemblyDescription("Adds third-party support for RGB keyboards to games.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Artemis")] -[assembly: AssemblyCopyright("Copyright © Robert Beekman - 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -38,18 +26,3 @@ using System.Windows; //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) )] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/src/Artemis.UI/Properties/Resources.Designer.cs b/src/Artemis.UI/Properties/Resources.Designer.cs index 39c8ffdae..a0fb0a67b 100644 --- a/src/Artemis.UI/Properties/Resources.Designer.cs +++ b/src/Artemis.UI/Properties/Resources.Designer.cs @@ -200,16 +200,6 @@ namespace Artemis.UI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap logo_512 { - get { - object obj = ResourceManager.GetObject("logo_512", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/src/Artemis.UI/Properties/Resources.resx b/src/Artemis.UI/Properties/Resources.resx index e75834b49..d1c0b5941 100644 --- a/src/Artemis.UI/Properties/Resources.resx +++ b/src/Artemis.UI/Properties/Resources.resx @@ -160,9 +160,6 @@ ..\Resources\bow.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\logo-512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\RobotoMono-Regular.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/Artemis.UI/SDK bug b/src/Artemis.UI/SDK bug deleted file mode 100644 index cbf620a34..000000000 --- a/src/Artemis.UI/SDK bug +++ /dev/null @@ -1,50 +0,0 @@ -Ok so with the following code: - -```cpp -bool errorCheck(const std::string &msg) { - auto error = CorsairGetLastError(); - if (error != CorsairError::CE_Success) { - std::cerr << msg << " (Error: " << toString(error) << ')' << std::endl; - return true; - } - - return false; -} - -int main(int argc, char *argv[]) -{ - CorsairPerformProtocolHandshake(); - if (errorCheck("Handshake error")) { - getchar(); - return -1; - } - - const auto devicesCount = CorsairGetDeviceCount(); - for (int i = 0; i < devicesCount; ++i) { - const auto info = CorsairGetDeviceInfo(i); - if (!info) { - errorCheck("Get device info error"); - continue; - } - - std::cout << "Model: " << info->model << "Logical layout: " << info->logicalLayout << std::endl; - } - - getchar(); - return 0; -} -``` - -I'm getting this output, which is as expected: -``` -Model: K95 RGB PLATINUMLogical layout: 13 -``` - -Then when I put the PC to full stand-by and wake it up again the code returns the following: -``` -Model: K95 RGB PLATINUMLogical layout: 0 -``` - -Windows 10 Home 1903 -iCUE v. 3.22.74 -SDK: 3.0.301 \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs index 4a1d2ca94..151b207a4 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs @@ -43,7 +43,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties PropertyTimeline = propertyTimelineVmFactory.Create(this); PopulateProperties(_profileEditorService.SelectedProfileElement, null); - _profileEditorService.SelectedProfileElementChanged += (sender, args) => PopulateProperties(args.ProfileElement, args.PreviousProfileElement); + _profileEditorService.ProfileElementSelected += (sender, args) => PopulateProperties(args.ProfileElement, args.PreviousProfileElement); _profileEditorService.CurrentTimeChanged += ProfileEditorServiceOnCurrentTimeChanged; } diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml index 49f05863a..7bc5e82cc 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml @@ -6,10 +6,10 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:s="https://github.com/canton7/Stylet" xmlns:dd="urn:gong-wpf-dragdrop" - xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:profileTree="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree" xmlns:treeItem="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem" xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors" + xmlns:b="http://schemas.microsoft.com/xaml/behaviors" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance {x:Type profileTree:ProfileTreeViewModel}}"> @@ -32,9 +32,9 @@ dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True" dd:DragDrop.DropHandler="{Binding}"> - + - + diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs index 484701d94..8bd77cedf 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs @@ -22,8 +22,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree _folderVmFactory = folderVmFactory; CreateRootFolderViewModel(); - _profileEditorService.SelectedProfileChanged += OnSelectedProfileChanged; - _profileEditorService.SelectedProfileElementChanged += OnSelectedElementChanged; + _profileEditorService.ProfileSelected += OnProfileSelected; + _profileEditorService.ProfileElementSelected += OnProfileElementSelected; } public FolderViewModel RootFolder { get; set; } @@ -137,7 +137,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree #region Event handlers - private void OnSelectedElementChanged(object sender, EventArgs e) + private void OnProfileElementSelected(object sender, EventArgs e) { if (_profileEditorService.SelectedProfileElement == SelectedTreeItem?.ProfileElement) return; @@ -161,7 +161,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree } } - private void OnSelectedProfileChanged(object sender, EventArgs e) + private void OnProfileSelected(object sender, EventArgs e) { CreateRootFolderViewModel(); } diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs index 39697831f..4def7f477 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs @@ -26,7 +26,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization Update(); Layer.RenderPropertiesUpdated += LayerOnRenderPropertiesUpdated; - _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged; + _profileEditorService.ProfileElementSelected += OnProfileElementSelected; _profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementUpdated; _profileEditorService.ProfilePreviewUpdated += ProfileEditorServiceOnProfilePreviewUpdated; } @@ -42,7 +42,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization public void Dispose() { Layer.RenderPropertiesUpdated -= LayerOnRenderPropertiesUpdated; - _profileEditorService.SelectedProfileElementChanged -= OnSelectedProfileElementChanged; + _profileEditorService.ProfileElementSelected -= OnProfileElementSelected; _profileEditorService.SelectedProfileElementUpdated -= OnSelectedProfileElementUpdated; _profileEditorService.ProfilePreviewUpdated -= ProfileEditorServiceOnProfilePreviewUpdated; } @@ -186,7 +186,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization Update(); } - private void OnSelectedProfileElementChanged(object sender, EventArgs e) + private void OnProfileElementSelected(object sender, EventArgs e) { IsSelected = _profileEditorService.SelectedProfileElement == Layer; } diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs index 8f01eae1c..3c2e20506 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs @@ -57,8 +57,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization CreateUpdateTrigger(); ActivateToolByIndex(0); - _profileEditorService.SelectedProfileChanged += OnSelectedProfileChanged; - _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged; + _profileEditorService.ProfileSelected += OnProfileSelected; + _profileEditorService.ProfileElementSelected += OnProfileElementSelected; _profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementUpdated; eventAggregator.Subscribe(this); } @@ -151,10 +151,10 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization _updateTrigger = new TimerUpdateTrigger {UpdateFrequency = 1.0 / targetFps}; _updateTrigger.Update += UpdateLeds; - _surfaceService.ActiveSurfaceConfigurationChanged += OnActiveSurfaceConfigurationChanged; + _surfaceService.ActiveSurfaceConfigurationSelected += OnActiveSurfaceConfigurationSelected; } - private void OnActiveSurfaceConfigurationChanged(object sender, SurfaceConfigurationEventArgs e) + private void OnActiveSurfaceConfigurationSelected(object sender, SurfaceConfigurationEventArgs e) { ApplySurfaceConfiguration(e.Surface); } @@ -349,12 +349,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization UpdateLedsDimStatus(); } - private void OnSelectedProfileChanged(object sender, EventArgs e) + private void OnProfileSelected(object sender, EventArgs e) { ApplyActiveProfile(); } - private void OnSelectedProfileElementChanged(object sender, EventArgs e) + private void OnProfileElementSelected(object sender, EventArgs e) { UpdateLedsDimStatus(); CanApplyToLayer = _profileEditorService.SelectedProfileElement is Layer; diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs index 828bf59c2..5a75152e8 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs @@ -25,8 +25,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools Cursor = Cursors.Arrow; Update(); - profileEditorService.SelectedProfileChanged += (sender, args) => Update(); - profileEditorService.SelectedProfileElementChanged += (sender, args) => Update(); + profileEditorService.ProfileSelected += (sender, args) => Update(); + profileEditorService.ProfileElementSelected += (sender, args) => Update(); profileEditorService.SelectedProfileElementUpdated += (sender, args) => Update(); profileEditorService.ProfilePreviewUpdated += (sender, args) => Update(); } diff --git a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs index ffe2b9329..2b348789a 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs @@ -22,7 +22,7 @@ namespace Artemis.UI.Screens.Settings.Debug _rgbService = rgbService; surfaceService.SurfaceConfigurationUpdated += (sender, args) => Execute.PostToUIThread(() => CurrentFrame = null); - surfaceService.ActiveSurfaceConfigurationChanged += (sender, args) => Execute.PostToUIThread(() => CurrentFrame = null); + surfaceService.ActiveSurfaceConfigurationSelected += (sender, args) => Execute.PostToUIThread(() => CurrentFrame = null); } public ImageSource CurrentFrame { get; set; } diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs index 06c247d1e..988ba4cb6 100644 --- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs @@ -28,7 +28,6 @@ namespace Artemis.UI.Screens.Settings private readonly ISettingsService _settingsService; private readonly ISurfaceService _surfaceService; private readonly IWindowManager _windowManager; - private object _test; public SettingsViewModel(IKernel kernel, ISurfaceService surfaceService, diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceLedViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceLedViewModel.cs index 668626e8f..74f261fc9 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceLedViewModel.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceLedViewModel.cs @@ -11,7 +11,7 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization Led = led; ApplyLedToViewModel(); - Led.PropertyChanged += OnLedOnPropertyChanged; + Led.PropertyChanged += ApplyViewModelOnLedChange; } public Led Led { get; set; } @@ -30,7 +30,7 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization Height = Led.ActualSize.Height; } - private void OnLedOnPropertyChanged(object sender, PropertyChangedEventArgs args) + private void ApplyViewModelOnLedChange(object sender, PropertyChangedEventArgs args) { if (args.PropertyName == "Location" || args.PropertyName == "ActualSize") ApplyLedToViewModel(); } diff --git a/src/Artemis.UI/Services/Interfaces/IProfileEditorService.cs b/src/Artemis.UI/Services/Interfaces/IProfileEditorService.cs index 01d389a45..453979079 100644 --- a/src/Artemis.UI/Services/Interfaces/IProfileEditorService.cs +++ b/src/Artemis.UI/Services/Interfaces/IProfileEditorService.cs @@ -22,7 +22,7 @@ namespace Artemis.UI.Services.Interfaces /// /// Occurs when a new profile is selected /// - event EventHandler SelectedProfileChanged; + event EventHandler ProfileSelected; /// /// Occurs then the currently selected profile is updated @@ -32,7 +32,7 @@ namespace Artemis.UI.Services.Interfaces /// /// Occurs when a new profile element is selected /// - event EventHandler SelectedProfileElementChanged; + event EventHandler ProfileElementSelected; /// /// Occurs when the currently selected profile element is updated diff --git a/src/Artemis.UI/Services/ProfileEditorService.cs b/src/Artemis.UI/Services/ProfileEditorService.cs index e9e6262f9..f552f8ac2 100644 --- a/src/Artemis.UI/Services/ProfileEditorService.cs +++ b/src/Artemis.UI/Services/ProfileEditorService.cs @@ -125,9 +125,9 @@ namespace Artemis.UI.Services UpdateProfilePreview(); } - public event EventHandler SelectedProfileChanged; + public event EventHandler ProfileSelected; public event EventHandler SelectedProfileUpdated; - public event EventHandler SelectedProfileElementChanged; + public event EventHandler ProfileElementSelected; public event EventHandler SelectedProfileElementUpdated; public event EventHandler CurrentTimeChanged; public event EventHandler ProfilePreviewUpdated; @@ -144,7 +144,7 @@ namespace Artemis.UI.Services protected virtual void OnSelectedProfileChanged(ProfileElementEventArgs e) { - SelectedProfileChanged?.Invoke(this, e); + ProfileSelected?.Invoke(this, e); } protected virtual void OnSelectedProfileUpdated(ProfileElementEventArgs e) @@ -154,7 +154,7 @@ namespace Artemis.UI.Services protected virtual void OnSelectedProfileElementChanged(ProfileElementEventArgs e) { - SelectedProfileElementChanged?.Invoke(this, e); + ProfileElementSelected?.Invoke(this, e); } protected virtual void OnSelectedProfileElementUpdated(ProfileElementEventArgs e) diff --git a/src/Artemis.UI/logo-512.ico b/src/Artemis.UI/logo-512.ico deleted file mode 100644 index 015d1ffa8..000000000 Binary files a/src/Artemis.UI/logo-512.ico and /dev/null differ diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config deleted file mode 100644 index 903d94bda..000000000 --- a/src/Artemis.UI/packages.config +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI/packages.config.new.20190410002817 b/src/Artemis.UI/packages.config.new.20190410002817 deleted file mode 100644 index 92f751e98..000000000 --- a/src/Artemis.UI/packages.config.new.20190410002817 +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Artemis.sln b/src/Artemis.sln index 0c35a0086..ced090c6d 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28729.10 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.UI", "Artemis.UI\Artemis.UI.csproj", "{46B74153-77CF-4489-BDF9-D53FDB1F7ACB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI", "Artemis.UI\Artemis.UI.csproj", "{46B74153-77CF-4489-BDF9-D53FDB1F7ACB}" ProjectSection(ProjectDependencies) = postProject {E592F239-FAA0-4840-9C85-46E5867D06D5} = {E592F239-FAA0-4840-9C85-46E5867D06D5} {0F288A66-6EB0-4589-8595-E33A3A3EAEA2} = {0F288A66-6EB0-4589-8595-E33A3A3EAEA2} @@ -15,70 +15,112 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.UI", "Artemis.UI\Ar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Storage", "Artemis.Storage\Artemis.Storage.csproj", "{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Core", "Artemis.Core\Artemis.Core.csproj", "{9B811F9B-86B9-4771-87AF-72BAE7078A36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Core", "Artemis.Core\Artemis.Core.csproj", "{9B811F9B-86B9-4771-87AF-72BAE7078A36}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{E830A02B-A7E5-4A6B-943F-76B0A542630C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.Modules.General", "Artemis.Plugins.Modules.General\Artemis.Plugins.Modules.General.csproj", "{E592F239-FAA0-4840-9C85-46E5867D06D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Modules.General", "Artemis.Plugins.Modules.General\Artemis.Plugins.Modules.General.csproj", "{E592F239-FAA0-4840-9C85-46E5867D06D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.LayerBrushes.Color", "Artemis.Plugins.LayerBrushes.Color\Artemis.Plugins.LayerBrushes.Color.csproj", "{0F288A66-6EB0-4589-8595-E33A3A3EAEA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Color", "Artemis.Plugins.LayerBrushes.Color\Artemis.Plugins.LayerBrushes.Color.csproj", "{0F288A66-6EB0-4589-8595-E33A3A3EAEA2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.Devices.Corsair", "Artemis.Plugins.Devices.Corsair\Artemis.Plugins.Devices.Corsair.csproj", "{A779B2F8-C253-4C4B-8634-6EB8F594E96D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Corsair", "Artemis.Plugins.Devices.Corsair\Artemis.Plugins.Devices.Corsair.csproj", "{A779B2F8-C253-4C4B-8634-6EB8F594E96D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.Devices.Logitech", "Artemis.Plugins.Devices.Logitech\Artemis.Plugins.Devices.Logitech.csproj", "{235A45C7-24AD-4F47-B9D4-CD67E610A04D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Logitech", "Artemis.Plugins.Devices.Logitech\Artemis.Plugins.Devices.Logitech.csproj", "{235A45C7-24AD-4F47-B9D4-CD67E610A04D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.LayerBrushes.Noise", "Artemis.Plugins.LayerBrushes.Noise\Artemis.Plugins.LayerBrushes.Noise.csproj", "{7F4C7AB0-4C9B-452D-AFED-34544C903DEF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Noise", "Artemis.Plugins.LayerBrushes.Noise\Artemis.Plugins.LayerBrushes.Noise.csproj", "{7F4C7AB0-4C9B-452D-AFED-34544C903DEF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.UI.Shared", "Artemis.UI.Shared\Artemis.UI.Shared.csproj", "{ADB357E6-151D-4D0D-87CB-68FD0BC29812}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI.Shared", "Artemis.UI.Shared\Artemis.UI.Shared.csproj", "{ADB357E6-151D-4D0D-87CB-68FD0BC29812}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.Devices.Wooting", "Artemis.Plugins.Devices.Wooting\Artemis.Plugins.Devices.Wooting.csproj", "{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Wooting", "Artemis.Plugins.Devices.Wooting\Artemis.Plugins.Devices.Wooting.csproj", "{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|x64.ActiveCfg = Debug|x64 - {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|x64.Build.0 = Debug|x64 - {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|x64.ActiveCfg = Release|x64 - {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|x64.Build.0 = Release|x64 + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|x64.ActiveCfg = Debug|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Debug|x64.Build.0 = Debug|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|Any CPU.Build.0 = Release|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|x64.ActiveCfg = Release|Any CPU + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|x64.Build.0 = Release|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.Build.0 = Debug|Any CPU {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.ActiveCfg = Debug|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.Build.0 = Debug|x64 + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.Build.0 = Release|Any CPU {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|x64.ActiveCfg = Release|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|x64.Build.0 = Release|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.ActiveCfg = Debug|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.Build.0 = Debug|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.ActiveCfg = Release|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.Build.0 = Release|x64 - {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|x64.ActiveCfg = Debug|x64 - {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|x64.Build.0 = Debug|x64 - {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|x64.ActiveCfg = Release|x64 - {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|x64.Build.0 = Release|x64 - {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|x64.ActiveCfg = Debug|x64 - {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|x64.Build.0 = Debug|x64 - {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|x64.ActiveCfg = Release|x64 - {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|x64.Build.0 = Release|x64 - {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|x64.ActiveCfg = Debug|x64 - {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|x64.Build.0 = Debug|x64 - {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|x64.ActiveCfg = Release|x64 - {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|x64.Build.0 = Release|x64 - {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|x64.ActiveCfg = Debug|x64 - {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|x64.Build.0 = Debug|x64 - {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|x64.ActiveCfg = Release|x64 - {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|x64.Build.0 = Release|x64 - {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|x64.ActiveCfg = Debug|x64 - {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|x64.Build.0 = Debug|x64 - {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|x64.ActiveCfg = Release|x64 - {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|x64.Build.0 = Release|x64 - {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|x64.ActiveCfg = Debug|x64 - {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|x64.Build.0 = Debug|x64 - {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|x64.ActiveCfg = Release|x64 - {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|x64.Build.0 = Release|x64 - {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|x64.ActiveCfg = Debug|x64 - {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|x64.Build.0 = Debug|x64 - {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.ActiveCfg = Release|x64 - {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.Build.0 = Release|x64 + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.ActiveCfg = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.Build.0 = Debug|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|Any CPU.Build.0 = Release|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.ActiveCfg = Release|Any CPU + {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.Build.0 = Release|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|x64.ActiveCfg = Debug|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Debug|x64.Build.0 = Debug|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|Any CPU.Build.0 = Release|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|x64.ActiveCfg = Release|Any CPU + {E592F239-FAA0-4840-9C85-46E5867D06D5}.Release|x64.Build.0 = Release|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|x64.ActiveCfg = Debug|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Debug|x64.Build.0 = Debug|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|Any CPU.Build.0 = Release|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|x64.ActiveCfg = Release|Any CPU + {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}.Release|x64.Build.0 = Release|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Debug|x64.Build.0 = Debug|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|Any CPU.Build.0 = Release|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|x64.ActiveCfg = Release|Any CPU + {A779B2F8-C253-4C4B-8634-6EB8F594E96D}.Release|x64.Build.0 = Release|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|x64.ActiveCfg = Debug|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Debug|x64.Build.0 = Debug|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|Any CPU.Build.0 = Release|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|x64.ActiveCfg = Release|Any CPU + {235A45C7-24AD-4F47-B9D4-CD67E610A04D}.Release|x64.Build.0 = Release|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|x64.ActiveCfg = Debug|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Debug|x64.Build.0 = Debug|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|Any CPU.Build.0 = Release|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|x64.ActiveCfg = Release|Any CPU + {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}.Release|x64.Build.0 = Release|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|x64.ActiveCfg = Debug|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Debug|x64.Build.0 = Debug|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|Any CPU.Build.0 = Release|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|x64.ActiveCfg = Release|Any CPU + {ADB357E6-151D-4D0D-87CB-68FD0BC29812}.Release|x64.Build.0 = Release|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|x64.ActiveCfg = Debug|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Debug|x64.Build.0 = Debug|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|Any CPU.Build.0 = Release|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.ActiveCfg = Release|Any CPU + {C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE