[UI] Update avalonia 11.1.3 (WalletWasabi#12926)

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AvaloniaVersion>11.0.999-cibuild0044755-beta</AvaloniaVersion>
+	  <AvaloniaVersion>11.1.3</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- AspNetCore. -->
@@ -34,9 +34,9 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <!-- UI. -->
     <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.2" />
+    <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.0.5" />
+    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.1.0" />
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
@@ -60,4 +60,4 @@
     <PackageVersion Include="xunit" Version="2.6.6" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
   </ItemGroup>
-</Project>
+</Project>

NuGet.Config

@@ -3,13 +3,9 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="avalonia-all" value="https://nuget-feed-all.avaloniaui.net/v3/index.json" />
   </packageSources>
 
   <packageSourceMapping>
-    <packageSource key="avalonia-all">
-      <package pattern="*"/>
-    </packageSource>
     <packageSource key="nuget.org">
       <package pattern="*"/>
     </packageSource>

WalletWasabi.Fluent/ApplicationStateManager.cs

@@ -1,8 +1,10 @@
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform;
 using ReactiveUI;
 using WalletWasabi.Fluent.Extensions;
 using WalletWasabi.Fluent.Helpers;
@@ -27,14 +29,14 @@ public class ApplicationStateManager : IMainWindowService
 	private bool _hideRequest;
 	private bool _isShuttingDown;
 	private bool _restartRequest;
-	private IActivatableApplicationLifetime? _activatable;
+	private IActivatableLifetime? _activatable;
 
 	internal ApplicationStateManager(IClassicDesktopStyleApplicationLifetime lifetime, UiContext uiContext, bool startInBg)
 	{
 		_lifetime = lifetime;
 		_stateMachine = new StateMachine<State, Trigger>(State.InitialState);
 
-		if (_lifetime is IActivatableApplicationLifetime activatableLifetime)
+		if (Application.Current?.TryGetFeature<IActivatableLifetime>() is { } activatableLifetime)
 		{
 			if (startInBg)
 			{
@@ -150,7 +152,6 @@ private void ActivatableLifetimeOnActivated(object? sender, ActivatedEventArgs e
 	{
 		switch (e.Kind)
 		{
-			case ActivationKind.Background:
 			case ActivationKind.Reopen:
 				if (this is IMainWindowService service)
 				{
@@ -185,9 +186,9 @@ private void CreateAndShowMainWindow()
 
 		MainViewModel.Instance.ApplyUiConfigWindowState();
 
-		if (_lifetime is IActivatableApplicationLifetime activatable)
+		if (Application.Current?.TryGetFeature<IActivatableLifetime>() is { } activatableLifetime)
 		{
-			activatable.TryLeaveBackground();
+			activatableLifetime.TryLeaveBackground();
 		}
 
 		var result = new MainWindow