DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Added Nuget feed and updated Avalonia to CI build for now

Browse Source
This commit is contained in:
Robert 2023-04-30 20:58:30 +02:00
parent ebe7f68e9d
commit 33f375e608
9 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
View File

@ -16,11 +16,11 @@
<None Remove=".gitignore" /> <None Remove=".gitignore" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0034035-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="ReactiveUI" Version="18.4.26" /> <PackageReference Include="ReactiveUI" Version="18.4.26" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
View File

@ -15,11 +15,11 @@
<None Remove=".gitignore" /> <None Remove=".gitignore" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0034035-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="ReactiveUI" Version="18.4.26" /> <PackageReference Include="ReactiveUI" Version="18.4.26" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
View File

@ -10,13 +10,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" />
<PackageReference Include="DynamicData" Version="7.13.1" /> <PackageReference Include="DynamicData" Version="7.13.1" />
<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview7" /> <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview7.1" />
<PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" /> <PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" />
<PackageReference Include="ReactiveUI" Version="18.4.26" /> <PackageReference Include="ReactiveUI" Version="18.4.26" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" /> <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />

10
src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
View File

@ -21,12 +21,12 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0034035-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Win32" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Win32" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Microsoft.Win32" Version="2.0.1" /> <PackageReference Include="Microsoft.Win32" Version="2.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" /> <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />

10
src/Artemis.UI/Artemis.UI.csproj
View File

@ -15,17 +15,17 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0-preview6" /> <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Controls.Skia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Controls.Skia" Version="11.0.0-preview7" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0034035-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" />
<PackageReference Include="DryIoc.dll" Version="5.3.4" /> <PackageReference Include="DryIoc.dll" Version="5.3.4" />
<PackageReference Include="DynamicData" Version="7.13.1" /> <PackageReference Include="DynamicData" Version="7.13.1" />
<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview7" /> <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview7.1" />
<PackageReference Include="Flurl.Http" Version="3.2.4" /> <PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="Live.Avalonia" Version="1.3.1" /> <PackageReference Include="Live.Avalonia" Version="1.3.1" />
<PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.0-b1" /> <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.0-b1" />

8
src/Artemis.UI/Screens/Device/Tabs/InputMappingsTabViewModel.cs
View File

@ -6,8 +6,10 @@ using Artemis.Core;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Exceptions; using Artemis.UI.Exceptions;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using HidSharp.Reports.Units;
using ReactiveUI; using ReactiveUI;
using RGB.NET.Core; using RGB.NET.Core;
using Unit = System.Reactive.Unit;
namespace Artemis.UI.Screens.Device; namespace Artemis.UI.Screens.Device;
@ -30,13 +32,13 @@ public class InputMappingsTabViewModel : ActivatableViewModelBase
Device = device; Device = device;
DisplayName = "Input Mappings"; DisplayName = "Input Mappings";
InputMappings = new ObservableCollection<(ArtemisLed, ArtemisLed)>(); InputMappings = new ObservableCollection<(ArtemisLed, ArtemisLed)>();
DeleteMapping = ReactiveCommand.Create<(ArtemisLed, ArtemisLed)>(ExecuteDeleteMapping);
this.WhenActivated(d => this.WhenActivated(d =>
{ {
_selectedLeds.CollectionChanged += SelectedLedsOnCollectionChanged; _selectedLeds.CollectionChanged += SelectedLedsOnCollectionChanged;
_inputService.KeyboardKeyUp += InputServiceOnKeyboardKeyUp; _inputService.KeyboardKeyUp += InputServiceOnKeyboardKeyUp;
UpdateInputMappings(); UpdateInputMappings();
Disposable.Create(() => Disposable.Create(() =>
{ {
_selectedLeds.CollectionChanged -= SelectedLedsOnCollectionChanged; _selectedLeds.CollectionChanged -= SelectedLedsOnCollectionChanged;
@ -46,6 +48,8 @@ public class InputMappingsTabViewModel : ActivatableViewModelBase
}); });
} }
public ReactiveCommand<(ArtemisLed, ArtemisLed), Unit> DeleteMapping { get; }
public ArtemisDevice Device { get; } public ArtemisDevice Device { get; }
public ArtemisLed? SelectedLed public ArtemisLed? SelectedLed
@ -56,7 +60,7 @@ public class InputMappingsTabViewModel : ActivatableViewModelBase
public ObservableCollection<(ArtemisLed, ArtemisLed)> InputMappings { get; } public ObservableCollection<(ArtemisLed, ArtemisLed)> InputMappings { get; }
public void DeleteMapping((ArtemisLed, ArtemisLed) inputMapping) private void ExecuteDeleteMapping((ArtemisLed, ArtemisLed) inputMapping)
{ {
Device.InputMappings.Remove(inputMapping.Item1); Device.InputMappings.Remove(inputMapping.Item1);
UpdateInputMappings(); UpdateInputMappings();

2
src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
View File

@ -50,7 +50,7 @@ public class DataBindingViewModel : ActivatableViewModelBase
.DisposeWith(d); .DisposeWith(d);
_profileEditorService.Playing.CombineLatest(_profileEditorService.SuspendedEditing).Subscribe(tuple => _playing = tuple.First || tuple.Second).DisposeWith(d); _profileEditorService.Playing.CombineLatest(_profileEditorService.SuspendedEditing).Subscribe(tuple => _playing = tuple.First || tuple.Second).DisposeWith(d);
DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(25.0 / 1000), DispatcherPriority.Render, Update); DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(25.0 / 1000), DispatcherPriority.Background, Update);
// TODO: Remove in favor of saving each time a node editor command is executed // TODO: Remove in favor of saving each time a node editor command is executed
DispatcherTimer saveTimer = new(TimeSpan.FromMinutes(2), DispatcherPriority.Normal, Save); DispatcherTimer saveTimer = new(TimeSpan.FromMinutes(2), DispatcherPriority.Normal, Save);

4
src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0034035-beta" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview7" />
<PackageReference Include="DryIoc.dll" Version="5.3.4" /> <PackageReference Include="DryIoc.dll" Version="5.3.4" />
<PackageReference Include="NoStringEvaluating" Version="2.5.2" /> <PackageReference Include="NoStringEvaluating" Version="2.5.2" />

7
src/NuGet.config Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Avalonia" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
</packageSources>
</configuration>