diff --git a/.gitignore b/.gitignore index 23a7cdd5d..10351521f 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,7 @@ publish/ *.azurePubxml # TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted -*.pubxml +# *.pubxml *.publishproj # NuGet Packages diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 70cefcf48..78a9e7155 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -249,6 +249,9 @@ namespace Artemis.Core.Services public ProfileDescriptor GetLastActiveProfile(ProfileModule module) { var moduleProfiles = _profileRepository.GetByPluginGuid(module.PluginInfo.Guid); + if (!moduleProfiles.Any()) + return CreateProfileDescriptor(module, "Default"); + var profileEntity = moduleProfiles.FirstOrDefault(p => p.IsActive) ?? moduleProfiles.FirstOrDefault(); return profileEntity == null ? null : new ProfileDescriptor(module, profileEntity); } diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 63c0d330f..1921504c0 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -40,6 +40,11 @@ + + + false + + diff --git a/src/Artemis.UI/Properties/PublishProfiles/FolderProfile.pubxml b/src/Artemis.UI/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 000000000..907e7795e --- /dev/null +++ b/src/Artemis.UI/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,17 @@ + + + + + Release + x64 + publish\ + FileSystem + netcoreapp3.1 + win-x64 + false + False + True + + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj b/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj index 4705fe43a..e3afce867 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj @@ -30,6 +30,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Asus.dll @@ -43,6 +44,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj index 072923064..67cca4128 100644 --- a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj @@ -34,6 +34,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.CoolerMaster.dll @@ -47,6 +48,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj b/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj index 2e1e09e9c..f26b1ec04 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj @@ -30,6 +30,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Corsair.dll @@ -43,6 +44,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj b/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj index 8c0d51566..96f69e066 100644 --- a/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj @@ -19,7 +19,9 @@ - + + all + @@ -29,9 +31,11 @@ ..\..\..\..\..\.nuget\materialdesignthemes\3.0.1\lib\netcoreapp3.0\MaterialDesignThemes.Wpf.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.DMX.dll @@ -45,6 +49,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Debug/Artemis.Plugins.Devices.Debug.csproj b/src/Plugins/Artemis.Plugins.Devices.Debug/Artemis.Plugins.Devices.Debug.csproj index e479dfa3f..52d84ee9c 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Debug/Artemis.Plugins.Devices.Debug.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Debug/Artemis.Plugins.Devices.Debug.csproj @@ -19,7 +19,9 @@ - + + all + @@ -29,6 +31,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Debug.dll @@ -42,6 +45,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj b/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj index ed916d464..ae234ffa0 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj @@ -31,6 +31,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Logitech.dll @@ -44,6 +45,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj b/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj index e794b6bb7..bedc08853 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj @@ -34,6 +34,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Msi.dll @@ -50,6 +51,11 @@ + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj b/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj index b4c5ec674..52fa74a5b 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj @@ -35,6 +35,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Novation.dll @@ -48,6 +49,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj b/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj index 2c86134a3..b0c84e6a7 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj @@ -34,6 +34,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Razer.dll @@ -50,6 +51,11 @@ + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj b/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj index bbeafa40f..d7e69de27 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj @@ -34,6 +34,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Roccat.dll @@ -47,6 +48,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj index 7ced393ed..f60dc2dbb 100644 --- a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj @@ -25,6 +25,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.SteelSeries.dll @@ -38,6 +39,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj b/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj index d0bea1cff..5e62a5657 100644 --- a/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj @@ -19,7 +19,9 @@ - + + all + @@ -29,6 +31,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.WS281X.dll @@ -42,6 +45,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj b/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj index f2bfcfb7c..d2bb8752c 100644 --- a/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj +++ b/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj @@ -30,6 +30,7 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll + false ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Wooting.dll @@ -43,6 +44,11 @@ PreserveNewest + + + + + diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj index cc6e73e55..819c70a6f 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj @@ -15,7 +15,9 @@ - + + all + @@ -25,9 +27,15 @@ false + all + + + + + - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/app.config b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/app.config deleted file mode 100644 index 9d3293c49..000000000 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/app.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj index 5392302d7..eef8b16cf 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/Artemis.Plugins.LayerBrushes.ColorRgbNet.csproj @@ -16,7 +16,9 @@ - + + all + @@ -27,7 +29,9 @@ false - + + false + @@ -40,7 +44,12 @@ ..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Groups.dll + + + + + - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/app.config b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/app.config deleted file mode 100644 index 9d3293c49..000000000 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/app.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj index b0b9132ca..fa1c3971e 100644 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj +++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj @@ -15,8 +15,12 @@ - - + + all + + + all + @@ -28,7 +32,12 @@ false + + + + + - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/app.config b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/app.config deleted file mode 100644 index 733d2fa60..000000000 --- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/app.config +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj index e82e0383d..258a85d3f 100644 --- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj +++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/Artemis.Plugins.LayerEffects.Filter.csproj @@ -16,8 +16,12 @@ - - + + all + + + all + @@ -25,9 +29,16 @@ false - + + false + + + + + + - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj index afbcdd985..ff36f7f7b 100644 --- a/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj +++ b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj @@ -17,8 +17,12 @@ - - + + all + + + all + @@ -27,7 +31,12 @@ false + + + + + - + \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.Modules.General/app.config b/src/Plugins/Artemis.Plugins.Modules.General/app.config deleted file mode 100644 index 9d3293c49..000000000 --- a/src/Plugins/Artemis.Plugins.Modules.General/app.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Plugins/Artemis.Plugins.Modules.Overlay/Artemis.Plugins.Modules.Overlay.csproj b/src/Plugins/Artemis.Plugins.Modules.Overlay/Artemis.Plugins.Modules.Overlay.csproj index 1af05a4b6..80e61fda3 100644 --- a/src/Plugins/Artemis.Plugins.Modules.Overlay/Artemis.Plugins.Modules.Overlay.csproj +++ b/src/Plugins/Artemis.Plugins.Modules.Overlay/Artemis.Plugins.Modules.Overlay.csproj @@ -9,14 +9,25 @@ x64 + + + + + - - + + all + + + all + - + + false + @@ -25,10 +36,11 @@ - - - + + + + - + \ No newline at end of file