From 0c107410d585ab92af94abb278657f292325acbb Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Sun, 14 Jan 2024 22:41:18 +0000 Subject: [PATCH 1/4] Meta - consolidate dependencies --- src/Artemis.Core/Artemis.Core.csproj | 15 ++----------- src/Artemis.UI.Linux/Artemis.UI.Linux.csproj | 8 ------- src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj | 8 ------- .../Artemis.UI.Shared.csproj | 9 ++------ .../Artemis.UI.Windows.csproj | 6 ------ src/Artemis.UI/Artemis.UI.csproj | 21 ------------------- .../Screens/Settings/Tabs/AboutTabView.axaml | 6 +----- .../CurrentUser/CurrentUserViewModel.cs | 6 ++++-- .../Artemis.VisualScripting.csproj | 7 ------- .../Artemis.WebClient.Workshop.csproj | 7 ------- src/Artemis.props | 4 +--- 11 files changed, 10 insertions(+), 87 deletions(-) diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 68c2ce582..3ea565da4 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,4 +1,4 @@ - + @@ -43,31 +43,20 @@ - + - - - - - - - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - \ No newline at end of file diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj index 1e02addc1..1e3f08b07 100644 --- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj +++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj @@ -17,14 +17,6 @@ - - - - - - - - diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index a32042c7e..3e7d54e11 100644 --- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj +++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj @@ -16,14 +16,6 @@ - - - - - - - - diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 10c5f8842..63c728d6f 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -17,22 +17,17 @@ - + - + - - - - ..\..\..\..\Users\Robert\.nuget\packages\asyncimageloader.avalonia\3.2.1\lib\netstandard2.1\AsyncImageLoader.Avalonia.dll - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index d7b3e08a7..81e5facd1 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -23,17 +23,11 @@ - - - - - - diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index e4a63012a..18dab508a 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -19,32 +19,17 @@ - - - - - - - - - - - all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - @@ -52,10 +37,4 @@ - - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml index 506c960d7..e29210098 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml +++ b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml @@ -101,7 +101,7 @@ - Diogo 'DrMeteor' Trindade + Diogo Trindade Main contributor @@ -176,7 +176,6 @@ DryIoc FluentAvalonia EmbedIO - Furl.Http Humanizer LiteDB McMaster.NETCore.Plugins @@ -199,9 +198,6 @@ https://unosquare.github.io/embedio/ - - https://flurl.dev/ - https://github.com/Humanizr/Humanizer diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs index a5dec1d4a..c17e40abe 100644 --- 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 _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) { diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj index a48111050..8f79fa6d8 100644 --- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj +++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj @@ -9,14 +9,7 @@ - - - - - - - diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index a4f710127..5ea3a3ec8 100644 --- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj +++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj @@ -9,7 +9,6 @@ - @@ -53,10 +52,4 @@ - - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - diff --git a/src/Artemis.props b/src/Artemis.props index 9c3fae302..b557fd378 100644 --- a/src/Artemis.props +++ b/src/Artemis.props @@ -1,9 +1,7 @@ 11.0.5 - 11.0.2 - 2.0.4 - 2.0.0-prerelease.101 + 2.0.0-prerelease.125 2.88.6 \ No newline at end of file From b3dc12790cf23f1d79c7b457d987c0f69bef1112 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Mon, 15 Jan 2024 19:08:16 +0000 Subject: [PATCH 2/4] Remove Artemis.props file --- src/Artemis.Core/Artemis.Core.csproj | 11 ++++------- src/Artemis.Storage/Artemis.Storage.csproj | 2 -- src/Artemis.UI.Linux/Artemis.UI.Linux.csproj | 2 -- src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj | 2 -- src/Artemis.UI.Shared/Artemis.UI.Shared.csproj | 15 ++++----------- src/Artemis.UI.Windows/Artemis.UI.Windows.csproj | 4 +--- src/Artemis.UI/Artemis.UI.csproj | 4 +--- .../Artemis.VisualScripting.csproj | 2 -- .../Artemis.WebClient.Updating.csproj | 2 -- .../Artemis.WebClient.Workshop.csproj | 5 ----- src/Artemis.props | 7 ------- src/Artemis.sln | 1 - 12 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 src/Artemis.props diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 3ea565da4..0cc0c4164 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,6 +1,4 @@ - - net7.0 false @@ -45,14 +43,13 @@ - - - - + + + - + diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 8baf3a9c5..0113e1492 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,6 +1,4 @@  - - net7.0 false diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj index 1e3f08b07..c346e5027 100644 --- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj +++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj @@ -1,6 +1,4 @@ - - WinExe net7.0 diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index 3e7d54e11..b5cc49ac7 100644 --- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj +++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj @@ -1,6 +1,4 @@  - - WinExe net7.0 diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 63c728d6f..c97faee10 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -1,6 +1,4 @@  - - Library net7.0 @@ -12,11 +10,11 @@ - + - - - + + + @@ -27,9 +25,4 @@ - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 81e5facd1..a21d685ae 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -1,6 +1,4 @@ - - WinExe net7.0-windows10.0.17763.0 @@ -23,7 +21,7 @@ - + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 18dab508a..f9e7015d9 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,6 +1,4 @@ - - Library net7.0 @@ -21,7 +19,7 @@ - + diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj index 8f79fa6d8..1e5aea19c 100644 --- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj +++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj @@ -1,6 +1,4 @@  - - net7.0 enable diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index e9e495ca5..1314be040 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -1,6 +1,4 @@ - - net7.0 enable diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index 5ea3a3ec8..67592b62d 100644 --- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj +++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj @@ -1,6 +1,4 @@ - - net7.0 enable @@ -11,12 +9,9 @@ - - - diff --git a/src/Artemis.props b/src/Artemis.props deleted file mode 100644 index b557fd378..000000000 --- a/src/Artemis.props +++ /dev/null @@ -1,7 +0,0 @@ - - - 11.0.5 - 2.0.0-prerelease.125 - 2.88.6 - - \ No newline at end of file diff --git a/src/Artemis.sln b/src/Artemis.sln index ce19ea4e3..cd0039bd1 100644 --- 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 From 50b5f130511c29fd4a967c9dca310be2055c9b31 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Mon, 15 Jan 2024 19:18:15 +0000 Subject: [PATCH 3/4] remove another redundant --- src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index 1314be040..0aeb725fb 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -9,7 +9,6 @@ - From 3ca3b6a18a845bf080ea79a392b7309653b66cf9 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Mon, 15 Jan 2024 19:33:40 +0000 Subject: [PATCH 4/4] Update packages --- src/Artemis.Core/Artemis.Core.csproj | 14 +++++++------- src/Artemis.Storage/Artemis.Storage.csproj | 2 +- src/Artemis.UI.Shared/Artemis.UI.Shared.csproj | 18 +++++++++--------- .../Artemis.UI.Windows.csproj | 7 ++++--- src/Artemis.UI/Artemis.UI.csproj | 14 +++++++------- .../Artemis.WebClient.Updating.csproj | 4 ++-- .../Artemis.WebClient.Workshop.csproj | 6 +++--- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 0cc0c4164..86d6f2a97 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -36,20 +36,20 @@ - + - + - - - - + + + + - + diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 0113e1492..679f1c3c7 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index c97faee10..1be9809f0 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -10,16 +10,16 @@ - + - - - - - - - - + + + + + + + + diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index a21d685ae..b0d0e9593 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -21,12 +21,13 @@ - + + - - + + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index f9e7015d9..0048cffb7 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -17,18 +17,18 @@ - - - + + + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index 0aeb725fb..732b2c721 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -7,10 +7,10 @@ - + - + diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index 67592b62d..b81e3f37d 100644 --- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj +++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj @@ -9,9 +9,9 @@ - - - + + +