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