Merge pull request #832 from Artemis-RGB/feature/cleanup-deps

Meta - Clean up nuget package references
Workshop - Offer to apply layout to devices
2026-01-01 18:23:32 +00:00 · 2024-01-15 21:43:19 +00:00 · 2024-01-15 22:21:15 +01:00 · 2024-01-15 19:33:40 +00:00 · 2024-01-15 19:18:15 +00:00 · 2024-01-15 19:08:16 +00:00
21 changed files with 146 additions and 166 deletions
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
+<Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <PreserveCompilationContext>false</PreserveCompilationContext>
@ -38,36 +36,24 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="DryIoc.dll" Version="5.4.2" />
+        <PackageReference Include="DryIoc.dll" Version="5.4.3" />
        <PackageReference Include="EmbedIO" Version="3.5.2" />
        <PackageReference Include="HidSharp" Version="2.1.0" />
        <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-        <PackageReference Include="LiteDB" Version="5.0.17" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
        <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="RGB.NET.Core" Version="$(RGBDotNetVersion)" />
-        <PackageReference Include="RGB.NET.Presets" Version="$(RGBDotNetVersion)" />
-        <PackageReference Include="Serilog" Version="3.0.1" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+        <PackageReference Include="RGB.NET.Core" Version="2.0.4-prerelease.1" />
+        <PackageReference Include="RGB.NET.Layout" Version="2.0.4-prerelease.1" />
+        <PackageReference Include="RGB.NET.Presets" Version="2.0.4-prerelease.1" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
        <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
-        <PackageReference Include="System.Buffers" Version="4.5.1" />
-        <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-        <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="Unosquare.Swan.Lite" Version="3.1.0" />
+        <PackageReference Include="SkiaSharp" Version="2.88.7" />
    </ItemGroup>

    <ItemGroup>
        <None Include="Resources/intro-profile.json" CopyToOutputDirectory="PreserveNewest" />
        <None Include="DefaultLayouts/**" CopyToOutputDirectory="PreserveNewest" />
    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="RGB.NET.Layout">
-        <HintPath>..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
--- a/src/Artemis.Storage/Artemis.Storage.csproj
+++ b/src/Artemis.Storage/Artemis.Storage.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <PreserveCompilationContext>false</PreserveCompilationContext>
@ -9,6 +7,6 @@

    <ItemGroup>
        <PackageReference Include="LiteDB" Version="5.0.17" />
-        <PackageReference Include="Serilog" Version="3.0.1" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
    </ItemGroup>
 </Project>
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <OutputType>WinExe</OutputType>
        <TargetFramework>net7.0</TargetFramework>
@ -17,14 +15,6 @@
        <AvaloniaResource Include="Assets\**" />
        <None Remove=".gitignore" />
    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
-    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
        <ProjectReference Include="..\Artemis.UI\Artemis.UI.csproj" />
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <OutputType>WinExe</OutputType>
        <TargetFramework>net7.0</TargetFramework>
@ -16,14 +14,6 @@
        <AvaloniaResource Include="Assets\**" />
        <None Remove=".gitignore" />
    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
-    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
        <ProjectReference Include="..\Artemis.UI\Artemis.UI.csproj" />
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <OutputType>Library</OutputType>
        <TargetFramework>net7.0</TargetFramework>
@ -12,29 +10,19 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="11.0.6" />
        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
-        <PackageReference Include="DynamicData" Version="8.0.2" />
-        <PackageReference Include="FluentAvaloniaUI" Version="$(FluentAvaloniaVersion)" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.0.1" />
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.6" />
+        <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
+        <PackageReference Include="DynamicData" Version="8.3.27" />
+        <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
+        <PackageReference Include="ReactiveUI" Version="19.5.39" />
        <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-        <PackageReference Include="RGB.NET.Core" Version="$(RGBDotNetVersion)" />
-        <PackageReference Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
    </ItemGroup>
-    <ItemGroup>
-      <Reference Include="AsyncImageLoader.Avalonia">
-        <HintPath>..\..\..\..\Users\Robert\.nuget\packages\asyncimageloader.avalonia\3.2.1\lib\netstandard2.1\AsyncImageLoader.Avalonia.dll</HintPath>
-      </Reference>
-      <Reference Include="RGB.NET.Layout">
-        <HintPath>..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <OutputType>WinExe</OutputType>
        <TargetFramework>net7.0-windows10.0.17763.0</TargetFramework>
@ -23,18 +21,13 @@
        </None>
    </ItemGroup>
    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Win32" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Win32" Version="11.0.6" />
        <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
        <PackageReference Include="Microsoft.Win32" Version="2.0.1" />
+        <!-- Note: Do NOT upgrade this compatibility package to 8.X before updating to net8, it WILL break -->
        <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
-        <PackageReference Include="RawInput.Sharp" Version="0.1.1" />
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
-        <PackageReference Include="SkiaSharp.Vulkan.SharpVk" Version="$(SkiaSharpVersion)" />
+        <PackageReference Include="RawInput.Sharp" Version="0.1.3" />
+        <PackageReference Include="SkiaSharp.Vulkan.SharpVk" Version="2.88.7" />
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-
    <PropertyGroup>
        <OutputType>Library</OutputType>
        <TargetFramework>net7.0</TargetFramework>
@ -19,43 +17,22 @@

    <ItemGroup>
        <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.1" />
-        <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
+        <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
+        <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
        <PackageReference Include="Avalonia.Skia.Lottie" Version="11.0.0" />
-        <PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.1" />
-        <PackageReference Include="DryIoc.dll" Version="5.4.2" />
-        <PackageReference Include="DynamicData" Version="8.0.2" />
-        <PackageReference Include="FluentAvaloniaUI" Version="$(FluentAvaloniaVersion)" />
-        <PackageReference Include="Flurl.Http" Version="3.2.4" />
+        <PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.6" />
        <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.0.1" />
-        <PackageReference Include="Octopus.Octodiff" Version="2.0.468" />
-        <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.0.8">
+        <PackageReference Include="Octopus.Octodiff" Version="2.0.544" />
+        <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.0">
          <PrivateAssets>all</PrivateAssets>
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
-        <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-        <PackageReference Include="RGB.NET.Core" Version="$(RGBDotNetVersion)" />
-        <PackageReference Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
-        <PackageReference Include="Splat.DryIoc" Version="14.7.1" />
+        <PackageReference Include="Splat.DryIoc" Version="14.8.12" />
        <PackageReference Include="TextMateSharp.Grammars" Version="1.0.56" />
    </ItemGroup>

    <ItemGroup>
        <AvaloniaResource Include="Assets\**" />
    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="RGB.NET.Layout">
-        <HintPath>..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
--- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
+++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
@ -155,7 +155,7 @@ public class SidebarVmFactory : ISidebarVmFactory
 public interface ISurfaceVmFactory : IVmFactory
 {
    SurfaceDeviceViewModel SurfaceDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel);
-    ListDeviceViewModel ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel);
+    ListDeviceViewModel ListDeviceViewModel(ArtemisDevice device);
 }

 public class SurfaceVmFactory : ISurfaceVmFactory
@ -172,9 +172,9 @@ public class SurfaceVmFactory : ISurfaceVmFactory
        return _container.Resolve<SurfaceDeviceViewModel>(new object[] {device, surfaceEditorViewModel});
    }

-    public ListDeviceViewModel ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel)
+    public ListDeviceViewModel ListDeviceViewModel(ArtemisDevice device)
    {
-        return _container.Resolve<ListDeviceViewModel>(new object[] {device, surfaceEditorViewModel});
+        return _container.Resolve<ListDeviceViewModel>(new object[] {device});
    }
 }

--- a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml
@ -101,7 +101,7 @@
                            </Ellipse.Fill>
                        </Ellipse>
                        <TextBlock Grid.Row="0" Grid.Column="1" Padding="0">
-                            Diogo 'DrMeteor' Trindade
+                            Diogo Trindade
                        </TextBlock>
                        <TextBlock Classes="subtitle" Grid.Column="1" Grid.Row="1" Padding="0">
                            Main contributor
@ -176,7 +176,6 @@
                            <TextBlock Classes="library-name">DryIoc</TextBlock>
                            <TextBlock Classes="library-name">FluentAvalonia</TextBlock>
                            <TextBlock Classes="library-name">EmbedIO</TextBlock>
-                            <TextBlock Classes="library-name">Furl.Http</TextBlock>
                            <TextBlock Classes="library-name">Humanizer</TextBlock>
                            <TextBlock Classes="library-name">LiteDB</TextBlock>
                            <TextBlock Classes="library-name">McMaster.NETCore.Plugins</TextBlock>
@ -199,9 +198,6 @@
                            <controls:HyperlinkButton NavigateUri="https://unosquare.github.io/embedio/">
                                https://unosquare.github.io/embedio/
                            </controls:HyperlinkButton>
-                            <controls:HyperlinkButton NavigateUri="https://flurl.dev/">
-                                https://flurl.dev/
-                            </controls:HyperlinkButton>
                            <controls:HyperlinkButton NavigateUri="https://github.com/Humanizr/Humanizer">
                                https://github.com/Humanizr/Humanizer
                            </controls:HyperlinkButton>
--- a/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
@ -21,13 +21,12 @@ public partial class ListDeviceViewModel : ViewModelBase
    [Notify] private SKColor _color;
    [Notify] private bool _isSelected;

-    public ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IWindowService windowService, IDeviceService deviceService)
+    public ListDeviceViewModel(ArtemisDevice device, IWindowService windowService, IDeviceService deviceService)
    {
        _windowService = windowService;
        _deviceService = deviceService;

        Device = device;
-        SurfaceEditorViewModel = surfaceEditorViewModel;
        Color = SKColor.FromHsv(Random.NextSingle() * 360, 95, 100);
        DetectInput = ReactiveCommand.CreateFromTask(ExecuteDetectInput, this.WhenAnyValue(vm => vm.CanDetectInput));
    }
@ -35,7 +34,6 @@ public partial class ListDeviceViewModel : ViewModelBase
    public ReactiveCommand<Unit, Unit> DetectInput { get; }

    public ArtemisDevice Device { get; }
-    public SurfaceEditorViewModel SurfaceEditorViewModel { get; }
    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
    
    private async Task ExecuteDetectInput()
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
@ -50,7 +50,7 @@ public partial class SurfaceEditorViewModel : RoutableScreen, IMainScreenViewMod

        DisplayName = "Surface Editor";
        SurfaceDeviceViewModels = new ObservableCollection<SurfaceDeviceViewModel>(deviceService.EnabledDevices.OrderBy(d => d.ZIndex).Select(d => surfaceVmFactory.SurfaceDeviceViewModel(d, this)));
-        ListDeviceViewModels = new ObservableCollection<ListDeviceViewModel>(deviceService.EnabledDevices.OrderBy(d => d.ZIndex).Select(d => surfaceVmFactory.ListDeviceViewModel(d, this)));
+        ListDeviceViewModels = new ObservableCollection<ListDeviceViewModel>(deviceService.EnabledDevices.OrderBy(d => d.ZIndex).Select(d => surfaceVmFactory.ListDeviceViewModel(d)));

        AutoArrange = ReactiveCommand.CreateFromTask(ExecuteAutoArrange);
        IdentifyDevice = ReactiveCommand.Create<ArtemisDevice>(ExecuteIdentifyDevice);
@ -163,7 +163,7 @@ public partial class SurfaceEditorViewModel : RoutableScreen, IMainScreenViewMod
            return;

        SurfaceDeviceViewModels.Add(_surfaceVmFactory.SurfaceDeviceViewModel(e.Device, this));
-        ListDeviceViewModels.Add(_surfaceVmFactory.ListDeviceViewModel(e.Device, this));
+        ListDeviceViewModels.Add(_surfaceVmFactory.ListDeviceViewModel(e.Device));
        SurfaceDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
        ListDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
    }
--- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Net.Http;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Threading;
@ -10,7 +11,6 @@ using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Services;
 using Avalonia.Media.Imaging;
 using FluentAvalonia.UI.Controls;
-using Flurl.Http;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using Serilog;
@ -21,6 +21,7 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
 {
    private readonly IAuthenticationService _authenticationService;
    private readonly ObservableAsPropertyHelper<bool> _isAnonymous;
+    private readonly HttpClient _httpClient;
    private readonly ILogger _logger;
    private readonly IWindowService _windowService;
    [Notify] private bool _allowLogout = true;
@ -35,6 +36,7 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
        _logger = logger;
        _authenticationService = authenticationService;
        _windowService = windowService;
+        _httpClient = new HttpClient();
        Login = ReactiveCommand.CreateFromTask(ExecuteLogin);

        _isAnonymous = this.WhenAnyValue(vm => vm.Loading, vm => vm.Name, (l, n) => l || n == null).ToProperty(this, vm => vm.IsAnonymous);
@ -106,7 +108,7 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
        try
        {
            Avatar?.Dispose();
-            Avatar = new Bitmap(await $"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{userId}".GetStreamAsync());
+            Avatar = new Bitmap(await _httpClient.GetStreamAsync($"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{userId}"));
        }
        catch (Exception)
        {
--- a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogView.axaml
@ -0,0 +1,24 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:dialogs="clr-namespace:Artemis.UI.Screens.Workshop.Layout.Dialogs"
+             xmlns:surfaceEditor="clr-namespace:Artemis.UI.Screens.SurfaceEditor"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Workshop.Layout.Dialogs.DeviceSelectionDialogView"
+             x:DataType="dialogs:DeviceSelectionDialogViewModel">
+    <StackPanel>
+        <TextBlock>
+            Select the devices on which you would like to apply the downloaded layout.
+        </TextBlock>
+        <ItemsControl Name="EffectDescriptorsList" ItemsSource="{CompiledBinding Devices}" Margin="0 10 0 0">
+            <ItemsControl.DataTemplates>
+                <DataTemplate DataType="{x:Type surfaceEditor:ListDeviceViewModel}">
+                    <CheckBox IsChecked="{CompiledBinding IsSelected}">
+                        <TextBlock Text="{CompiledBinding Device.RgbDevice.DeviceInfo.DeviceName}"></TextBlock>
+                    </CheckBox>
+                </DataTemplate>
+            </ItemsControl.DataTemplates>
+        </ItemsControl>
+    </StackPanel>
+</UserControl>
--- a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogView.axaml.cs
@ -0,0 +1,11 @@
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.Workshop.Layout.Dialogs;
+
+public partial class DeviceSelectionDialogView : ReactiveUserControl<DeviceSelectionDialogViewModel>
+{
+    public DeviceSelectionDialogView()
+    {
+        InitializeComponent();
+    }
+}
--- a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs
@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive;
+using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.DryIoc.Factories;
+using Artemis.UI.Screens.SurfaceEditor;
+using Artemis.UI.Shared;
+using Artemis.WebClient.Workshop.Providers;
+using Artemis.WebClient.Workshop.Services;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Workshop.Layout.Dialogs;
+
+public class DeviceSelectionDialogViewModel : ContentDialogViewModelBase
+{
+    private readonly IDeviceService _deviceService;
+    private readonly WorkshopLayoutProvider _layoutProvider;
+
+    public DeviceSelectionDialogViewModel(List<ArtemisDevice> devices, InstalledEntry entry, ISurfaceVmFactory surfaceVmFactory, IDeviceService deviceService, WorkshopLayoutProvider layoutProvider)
+    {
+        _deviceService = deviceService;
+        _layoutProvider = layoutProvider;
+        Entry = entry;
+        Devices = new ObservableCollection<ListDeviceViewModel>(devices.Select(surfaceVmFactory.ListDeviceViewModel));
+        Apply = ReactiveCommand.Create(ExecuteApply);
+    }
+
+    public InstalledEntry Entry { get; }
+    public ObservableCollection<ListDeviceViewModel> Devices { get; }
+    public ReactiveCommand<Unit, Unit> Apply { get; }
+
+    private void ExecuteApply()
+    {
+        foreach (ListDeviceViewModel listDeviceViewModel in Devices.Where(d => d.IsSelected))
+        {
+            _layoutProvider.ConfigureDevice(listDeviceViewModel.Device, Entry);
+            _deviceService.SaveDevice(listDeviceViewModel.Device);
+            _deviceService.LoadDeviceLayout(listDeviceViewModel.Device);
+        }
+    }
+}
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
@ -1,10 +1,16 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.Workshop.Entries.Details;
+using Artemis.UI.Screens.Workshop.Layout.Dialogs;
 using Artemis.UI.Screens.Workshop.Parameters;
 using Artemis.UI.Shared.Routing;
+using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Services;
 using PropertyChanged.SourceGenerator;
@ -16,6 +22,7 @@ public partial class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParam
 {
    private readonly IWorkshopClient _client;
    private readonly IDeviceService _deviceService;
+    private readonly IWindowService _windowService;
    private readonly Func<IGetEntryById_Entry, EntryInfoViewModel> _getEntryInfoViewModel;
    private readonly Func<IGetEntryById_Entry, EntryReleasesViewModel> _getEntryReleasesViewModel;
    private readonly Func<IGetEntryById_Entry, EntryImagesViewModel> _getEntryImagesViewModel;
@ -26,12 +33,14 @@ public partial class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParam

    public LayoutDetailsViewModel(IWorkshopClient client,
        IDeviceService deviceService,
+        IWindowService windowService,
        Func<IGetEntryById_Entry, EntryInfoViewModel> getEntryInfoViewModel,
        Func<IGetEntryById_Entry, EntryReleasesViewModel> getEntryReleasesViewModel,
        Func<IGetEntryById_Entry, EntryImagesViewModel> getEntryImagesViewModel)
    {
        _client = client;
        _deviceService = deviceService;
+        _windowService = windowService;
        _getEntryInfoViewModel = getEntryInfoViewModel;
        _getEntryReleasesViewModel = getEntryReleasesViewModel;
        _getEntryImagesViewModel = getEntryImagesViewModel;
@ -59,17 +68,26 @@ public partial class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParam
            EntryInfoViewModel = _getEntryInfoViewModel(Entry);
            EntryReleasesViewModel = _getEntryReleasesViewModel(Entry);
            EntryImagesViewModel = _getEntryImagesViewModel(Entry);
-            
+
            EntryReleasesViewModel.OnInstallationFinished = OnInstallationFinished;
        }
    }

-    private Task OnInstallationFinished(InstalledEntry installedEntry)
+    private async Task OnInstallationFinished(InstalledEntry installedEntry)
    {
        // Find compatible devices
-        // If any are found, offer to apply
+        ArtemisLayout layout = new(Path.Combine(installedEntry.GetReleaseDirectory().FullName, "layout.xml"));
+        List<ArtemisDevice> devices = _deviceService.Devices.Where(d => d.RgbDevice.DeviceInfo.DeviceType == layout.RgbLayout.Type).ToList();

-        return Task.CompletedTask;
+        // If any are found, offer to apply
+        if (devices.Any())
+        {
+            await _windowService.CreateContentDialog()
+                .WithTitle("Apply layout to devices")
+                .WithViewModel(out DeviceSelectionDialogViewModel vm, devices, installedEntry)
+                .WithCloseButtonText(null)
+                .HavingPrimaryButton(b => b.WithText("Continue").WithCommand(vm.Apply))
+                .ShowAsync();
+        }
    }
-    
 }
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <ImplicitUsings>enable</ImplicitUsings>
@ -9,14 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehavioursVersion)" />
-        <PackageReference Include="DryIoc.dll" Version="5.4.2" />
        <PackageReference Include="NoStringEvaluating" Version="2.5.2" />
-        <PackageReference Include="ReactiveUI" Version="19.5.1" />
-        <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-        <PackageReference Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj
+++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <ImplicitUsings>enable</ImplicitUsings>
@ -9,11 +7,10 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="DryIoc.dll" Version="5.4.2" />
+      <PackageReference Include="DryIoc.dll" Version="5.4.3" />
      <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.2.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-      <PackageReference Include="StrawberryShake.Server" Version="13.5.1" />
+      <PackageReference Include="StrawberryShake.Server" Version="13.8.1" />
    </ItemGroup>

    <ItemGroup>
--- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj
+++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\Artemis.props" />
-    
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <ImplicitUsings>enable</ImplicitUsings>
@ -9,15 +7,11 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <PackageReference Include="DryIoc.dll" Version="5.4.2" />
      <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.2.0" />
      <PackageReference Include="IdentityModel" Version="6.2.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-      <PackageReference Include="ReactiveUI" Version="19.5.1" />
-      <PackageReference Include="StrawberryShake.Server" Version="13.7.0" />
-      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
-      <PackageReference Include="System.Reactive" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+      <PackageReference Include="StrawberryShake.Server" Version="13.8.1" />
+      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
    </ItemGroup>

    <ItemGroup>
@ -53,10 +47,4 @@
    <ItemGroup>
      <Folder Include="Handlers\" />
    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="RGB.NET.Layout">
-        <HintPath>..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
--- a/src/Artemis.props
+++ b/src/Artemis.props
@ -1,9 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <AvaloniaVersion>11.0.5</AvaloniaVersion>
-        <AvaloniaBehavioursVersion>11.0.2</AvaloniaBehavioursVersion>
-        <FluentAvaloniaVersion>2.0.4</FluentAvaloniaVersion>
-        <RGBDotNetVersion>2.0.0-prerelease.101</RGBDotNetVersion>
-        <SkiaSharpVersion>2.88.6</SkiaSharpVersion>
-    </PropertyGroup>
-</Project>
--- a/src/Artemis.sln
+++ b/src/Artemis.sln
@ -25,7 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.WebClient.Workshop"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{44482312-142F-44A4-992C-0AF0F26BAE54}"
 	ProjectSection(SolutionItems) = preProject
-		Artemis.props = Artemis.props
 		Artemis.sln.DotSettings = Artemis.sln.DotSettings
 		Artemis.sln.DotSettings.user = Artemis.sln.DotSettings.user
 	EndProjectSection
Author	SHA1	Message	Date
Diogo Trindade	7edaf709e6	Merge pull request #832 from Artemis-RGB/feature/cleanup-deps Meta - Clean up nuget package references	2024-01-15 21:43:19 +00:00
RobertBeekman	833ab7ac78	Workshop - Offer to apply layout to devices	2024-01-15 22:21:15 +01:00
Diogo Trindade	3ca3b6a18a	Update packages	2024-01-15 19:33:40 +00:00
Diogo Trindade	50b5f13051	remove another redundant	2024-01-15 19:18:15 +00:00
Diogo Trindade	b3dc12790c	Remove Artemis.props file	2024-01-15 19:08:16 +00:00
Diogo Trindade	0c107410d5	Meta - consolidate dependencies	2024-01-14 22:41:18 +00:00