diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 68c2ce582..86d6f2a97 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,6 +1,4 @@ - - - + net7.0 false @@ -38,36 +36,24 @@ - + - - + - - - - + + + + - - - - - - + - - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - \ No newline at end of file diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 8baf3a9c5..679f1c3c7 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,6 +1,4 @@  - - net7.0 false @@ -9,6 +7,6 @@ - + \ 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..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 @@ -17,14 +15,6 @@ - - - - - - - - diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index a32042c7e..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 @@ -16,14 +14,6 @@ - - - - - - - - diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 10c5f8842..1be9809f0 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,29 +10,19 @@ - + - - - - - - - - + + + + + + + + - - - - - ..\..\..\..\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..b0d0e9593 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,18 +21,13 @@ - - - - - - + + - - - + + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index e4a63012a..0048cffb7 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,6 +1,4 @@ - - Library net7.0 @@ -19,43 +17,22 @@ - - - - - - - - - + + + - - - - - + - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + - - - - ..\..\..\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..1e5aea19c 100644 --- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj +++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj @@ -1,6 +1,4 @@  - - net7.0 enable @@ -9,14 +7,7 @@ - - - - - - - diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index e9e495ca5..732b2c721 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 @@ -9,11 +7,10 @@ - + - - + diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index a4f710127..b81e3f37d 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 @@ -9,15 +7,11 @@ - - - - - - - + + + @@ -53,10 +47,4 @@ - - - - ..\..\..\RGB.NET\bin\net7.0\RGB.NET.Layout.dll - - diff --git a/src/Artemis.props b/src/Artemis.props deleted file mode 100644 index 9c3fae302..000000000 --- a/src/Artemis.props +++ /dev/null @@ -1,9 +0,0 @@ - - - 11.0.5 - 11.0.2 - 2.0.4 - 2.0.0-prerelease.101 - 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