- tweak: Migrate v3 profiles

Nebula.Launcher/LauncherConVar.cs

@@ -2,8 +2,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using Nebula.Launcher.Models;
 using Nebula.Launcher.Models.Auth;
-using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Shared.Services;
+using Nebula.Shared.Services.ConfigMigrations;
 
 namespace Nebula.Launcher;
 
@@ -11,11 +11,16 @@ public static class LauncherConVar
 {
     public static readonly ConVar<bool> DoMigration =
         ConVarBuilder.Build("migration.doMigrate", true);
-    public static readonly ConVar<ProfileAuthCredentials[]> AuthProfiles =
-        ConVarBuilder.Build<ProfileAuthCredentials[]>("auth.profiles.v2", []);
     
-    public static readonly ConVar<CurrentAuthInfo?> AuthCurrent =
+    public static readonly ConVar<AuthTokenCredentials[]> AuthProfiles =
-        ConVarBuilder.Build<CurrentAuthInfo?>("auth.current.v2");
+        ConVarBuilder.BuildWithMigration<AuthTokenCredentials[]>("auth.profiles.v3", 
+            MigrationQueueBuilder.Instance
+                .With(new ProfileMigrationV2("auth.profiles.v2","auth.profiles.v3"))
+                .Build(), 
+            []);
+
+    public static readonly ConVar<AuthTokenCredentials?> AuthCurrent =
+        ConVarBuilder.Build<AuthTokenCredentials?>("auth.current.v2");
     
     public static readonly ConVar<string[]> Favorites =
         ConVarBuilder.Build<string[]>("server.favorites", []);

Nebula.Launcher/Models/Auth/ProfileAuthCredentials.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
 using System.Windows.Input;
+using Nebula.Shared.Services;
 
 namespace Nebula.Launcher.Models.Auth;
 
 public sealed record ProfileAuthCredentials(
-    string Login,
+    AuthTokenCredentials Credentials,
-    string Password,
-    string AuthServer,
     [property: JsonIgnore] ICommand OnSelect = default!,
     [property: JsonIgnore] ICommand OnDelete = default!);

Nebula.Launcher/ProcessHelper/GameProcessStartInfoProvider.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
@@ -10,7 +11,7 @@ using Nebula.Shared.Services;
 namespace Nebula.Launcher.ProcessHelper;
 
 [ServiceRegister(isSingleton:false)]
-public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AuthService authService) : 
+public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AccountInfoViewModel accountInfoViewModel) : 
     DotnetProcessStartInfoProviderBase(resolverService)
 {
     private string? _publicKey;
@@ -34,7 +35,7 @@ public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverS
     {
         var baseStart = await base.GetProcessStartInfo();
         
-        var authProv = authService.SelectedAuth;
+        var authProv = accountInfoViewModel.Credentials;
         if(authProv is null) 
             throw new Exception("Client is without selected auth");
 

Nebula.Launcher/ViewModels/MainViewModel.cs

@@ -41,17 +41,17 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty] private bool _popup;
     [ObservableProperty] private ListItemTemplate? _selectedListItem;
 
-    public bool IsLoggedIn => AuthService.SelectedAuth is not null;
+    public bool IsLoggedIn => AccountInfoViewModel.Credentials is not null;
-    public string LoginName => AuthService.SelectedAuth?.Login ?? string.Empty;
+    public string LoginName => AccountInfoViewModel.Credentials?.Login ?? string.Empty;
     
-    public string LoginText => Services.LocalisationService.GetString("auth-current-login-name", 
+    public string LoginText => LocalisationService.GetString("auth-current-login-name", 
         new Dictionary<string, object>
     {
         { "login", LoginName }
     });
 
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
+    [GenerateProperty] private LocalisationService LocalisationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
-    [GenerateProperty] private AuthService AuthService { get; }
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ContentService ContentService { get; } = default!;
@@ -66,7 +66,7 @@ public partial class MainViewModel : ViewModelBase
     {
         Items = new ObservableCollection<ListItemTemplate>(_templates.Select(a=>
         {
-            return new ListItemTemplate(a.ModelType, a.IconKey, LocalisationService.GetString(a.Label));
+            return a with { Label = LocalisationService.GetString(a.Label) };
         }
         ));
         RequirePage<AccountInfoViewModel>();
@@ -74,6 +74,15 @@ public partial class MainViewModel : ViewModelBase
 
     protected override void Initialise()
     {
+        AccountInfoViewModel.PropertyChanged += (sender, args) =>
+        {
+            if (args.PropertyName != nameof(AccountInfoViewModel.Credentials)) 
+                return;
+            
+            OnPropertyChanged(nameof(LoginText));
+            OnPropertyChanged(nameof(IsLoggedIn));
+        };
+        
         _logger = DebugService.GetLogger(this);
 
         using var stream = typeof(MainViewModel).Assembly
@@ -89,6 +98,11 @@ public partial class MainViewModel : ViewModelBase
         
         CheckMigration();
         
+        var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        loadingHandler.LoadingName = LocalisationService.GetString("migration-config-task");
+        loadingHandler.IsCancellable = false;
+        ConfigurationService.MigrateConfigs(loadingHandler);
+        
         if (!VCRuntimeDllChecker.AreVCRuntimeDllsPresent())
         {
             OnPopupRequired(LocalisationService.GetString("vcruntime-check-error"));
@@ -146,12 +160,6 @@ public partial class MainViewModel : ViewModelBase
         CurrentPage = obj;
     }
 
-    public void InvokeChangeAuth()
-    {
-        OnPropertyChanged(nameof(IsLoggedIn));
-        OnPropertyChanged(nameof(LoginText));
-    }
-
     public void PopupMessage(PopupViewModelBase viewModelBase)
     {
         if (CurrentPopup == null)
@@ -184,6 +192,11 @@ public partial class MainViewModel : ViewModelBase
         RequirePage<AccountInfoViewModel>();
     }
 
+    public void OpenRootPath()
+    {
+        ExplorerHelper.OpenFolder(FileService.RootPath);
+    }
+
     public void OpenLink()
     {
         Helper.OpenBrowser("https://durenko.tatar/nebula");

Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs

@@ -10,6 +10,7 @@ using Nebula.Launcher.Models.Auth;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
+using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
@@ -35,9 +36,9 @@ public partial class AccountInfoViewModel : ViewModelBase
 
     [ObservableProperty] private bool _isLogged;
     [ObservableProperty] private bool _doRetryAuth;
+    [ObservableProperty] private AuthTokenCredentials? _credentials;
 
     private bool _isProfilesEmpty;
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; }
@@ -54,8 +55,8 @@ public partial class AccountInfoViewModel : ViewModelBase
     //Design think
     protected override void InitialiseInDesignMode()
     {
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", ""));
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", ""));
         
         AuthUrls.Add(new AuthServerCredentials("Test",["example.com"]));
     }
@@ -67,13 +68,31 @@ public partial class AccountInfoViewModel : ViewModelBase
         Task.Run(ReadAuthConfig);
     }
 
-    public void AuthByProfile(ProfileAuthCredentials credentials)
+    public async void AuthByProfile(ProfileAuthCredentials credentials)
     {
-        CurrentLogin = credentials.Login;
+        var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
-        CurrentPassword = credentials.Password;
+        message.InfoText = LocalisationService.GetString("auth-try-auth-profile");
-        CurrentAuthServer = credentials.AuthServer;
+        message.IsInfoClosable = false;
+        PopupMessageService.Popup(message);
         
-        DoAuth();
+        try
+        {
+            await CatchAuthError(async () => await TryAuth(credentials.Credentials), () => message.Dispose());
+        }
+        catch (Exception ex)
+        {
+            CurrentLogin = credentials.Credentials.Login;
+            CurrentAuthServer = credentials.Credentials.AuthServer;
+            
+            var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
+            _logger.Error(unexpectedError);
+            PopupMessageService.Popup(unexpectedError);
+            return;
+        }
+        
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
+        
+        message.Dispose();
     }
 
     public void DoAuth(string? code = null)
@@ -117,22 +136,28 @@ public partial class AccountInfoViewModel : ViewModelBase
         });
     }
 
-    private async Task TryAuth(CurrentAuthInfo currentAuthInfo)
+    private async Task TryAuth(AuthTokenCredentials authTokenCredentials)
     {
-        CurrentLogin = currentAuthInfo.Login;
+        CurrentLogin = authTokenCredentials.Login;
-        CurrentAuthServer = currentAuthInfo.AuthServer;
+        CurrentAuthServer = authTokenCredentials.AuthServer;
-        await AuthService.SetAuth(currentAuthInfo);
+        await SetAuth(authTokenCredentials);
         IsLogged = true;
     }
 
+    private async Task SetAuth(AuthTokenCredentials authTokenCredentials)
+    {
+        await AuthService.EnsureToken(authTokenCredentials);
+        Credentials = authTokenCredentials;
+    }
+
     private async Task TryAuth(string login, string password, string authServer, string? code)
     {
-        await AuthService.Auth(new AuthLoginPassword(login, password, authServer), code);
+        Credentials = await AuthService.Auth(login, password, authServer, code);
         CurrentLogin = login;
         CurrentPassword = password;
         CurrentAuthServer = authServer;
         IsLogged = true;
-        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, AuthService.SelectedAuth);
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
     }
 
     private async Task CatchAuthError(Func<Task> a, Action? onError)
@@ -142,7 +167,6 @@ public partial class AccountInfoViewModel : ViewModelBase
         try
         {
             await a();
-            ViewHelperService.GetViewModel<MainViewModel>().InvokeChangeAuth();
         }
         catch (AuthException e)
         {
@@ -200,8 +224,7 @@ public partial class AccountInfoViewModel : ViewModelBase
     public void Logout()
     {
         IsLogged = false;
-        AuthService.ClearAuth();
+        Credentials = null;
-        ViewHelperService.GetViewModel<MainViewModel>().InvokeChangeAuth();
     }
 
     private void UpdateAuthMenu()
@@ -212,15 +235,13 @@ public partial class AccountInfoViewModel : ViewModelBase
             AuthViewSpan = 1;
     }
 
-    private void AddAccount(AuthLoginPassword authLoginPassword)
+    private void AddAccount(AuthTokenCredentials credentials)
     {
         var onDelete = new DelegateCommand<ProfileAuthCredentials>(OnDeleteProfile);
         var onSelect = new DelegateCommand<ProfileAuthCredentials>(AuthByProfile);
 
         var alpm = new ProfileAuthCredentials(
-            authLoginPassword.Login,
+            credentials,
-            authLoginPassword.Password,
-            authLoginPassword.AuthServer,
             onSelect,
             onDelete);
 
@@ -238,7 +259,7 @@ public partial class AccountInfoViewModel : ViewModelBase
         PopupMessageService.Popup(message);
         foreach (var profile in
                  ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
-            AddAccount(new AuthLoginPassword(profile.Login, profile.Password, profile.AuthServer));
+            AddAccount(profile);
 
         if (Accounts.Count == 0) UpdateAuthMenu();
 
@@ -281,7 +302,9 @@ public partial class AccountInfoViewModel : ViewModelBase
     [RelayCommand]
     private void OnSaveProfile()
     {
-        AddAccount(new AuthLoginPassword(CurrentLogin, CurrentPassword, CurrentAuthServer));
+        if(Credentials is null) return;
+        
+        AddAccount(Credentials);
         _isProfilesEmpty = Accounts.Count == 0;
         UpdateAuthMenu();
         DirtyProfile();
@@ -322,6 +345,6 @@ public partial class AccountInfoViewModel : ViewModelBase
     private void DirtyProfile()
     {
         ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
-            Accounts.ToArray());
+            Accounts.Select(a => a.Credentials).ToArray());
     }
 }

Nebula.Launcher/ViewModels/Popup/LoadingContextViewModel.cs

@@ -15,8 +15,8 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
     [GenerateProperty] public CancellationService CancellationService { get; }
     
     [ObservableProperty] private int _currJobs;
-
     [ObservableProperty] private int _resolvedJobs;
+    [ObservableProperty] private string _message = string.Empty;
 
     public string LoadingName { get; set; } = LocalisationService.GetString("popup-loading");
     public bool IsCancellable { get; set; } = true;
@@ -44,6 +44,11 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
         return ResolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        Message = message + "\n" + Message;
+    }
+
     public void Cancel(){
         if(!IsCancellable) return;
         CancellationService.Cancel();
@@ -56,5 +61,30 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
 
     protected override void InitialiseInDesignMode()
     {
+        SetJobsCount(5);
+        SetResolvedJobsCount(2);
+        string[] debugMessages = {
+            "Debug: Starting phase 1...",
+            "Debug: Loading assets...",
+            "Debug: Connecting to server...",
+            "Debug: Fetching user data...",
+            "Debug: Applying configurations...",
+            "Debug: Starting phase 2...",
+            "Debug: Rendering UI...",
+            "Debug: Preparing scene...",
+            "Debug: Initializing components...",
+            "Debug: Running diagnostics...",
+            "Debug: Checking dependencies...",
+            "Debug: Verifying files...",
+            "Debug: Cleaning up cache...",
+            "Debug: Finalizing setup...",
+            "Debug: Setup complete.",
+            "Debug: Ready for launch."
+        };
+
+        foreach (string message in debugMessages)
+        {
+            SetLoadingMessage(message);
+        }
     }
 }

Nebula.Launcher/ViewModels/ServerEntryModelView.cs

@@ -47,7 +47,7 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
 
     public LogPopupModelView CurrLog;
     public RobustUrl Address { get; private set; }
-    [GenerateProperty] private AuthService AuthService { get; }
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private CancellationService CancellationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
@@ -174,7 +174,7 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
 
     private async Task RunInstanceAsync(bool ignoreLoginCredentials = false)
     {
-        if (!ignoreLoginCredentials && AuthService.SelectedAuth is null)
+        if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials is null)
         {
             var warningContext = ViewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
                 .WithServerEntry(this);

Nebula.Launcher/Views/MainView.axaml

@@ -127,10 +127,30 @@
                                 Padding="0" 
                                 CornerRadius="0"
                                 Command="{Binding OpenAuthPage}">
+                                <StackPanel Spacing="5" Orientation="Horizontal">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/user.svg"
+                                        Width="10" />
                                     <Panel>
                                         <TextBlock Foreground="#777777" IsVisible="{Binding IsLoggedIn}" Text="{Binding LoginText}"/>
                                         <TextBlock Foreground="#777777" IsVisible="{Binding !IsLoggedIn}" Text="{services:LocaledText auth-current-login-no-name}"/>
                                     </Panel>
+                                </StackPanel>
+                            </Button>
+                            <TextBlock>|</TextBlock>
+                            <Button 
+                                Margin="0" 
+                                Padding="0" 
+                                CornerRadius="0"
+                                Command="{Binding OpenRootPath}">
+                                <StackPanel Orientation="Horizontal" Spacing="5">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/folder.svg"
+                                        Width="10" />
+                                    <TextBlock Foreground="#777777" Text="{services:LocaledText goto-path-home}"/>
+                                </StackPanel>
                             </Button>
                             <TextBlock>|</TextBlock>
                             <TextBlock Text="{Binding VersionInfo}"/>

Nebula.Launcher/Views/Pages/AccountInfoView.axaml

@@ -53,7 +53,7 @@
                                 <Panel>
                                     <StackPanel Margin="10,5,5,5" Orientation="Horizontal">
                                         <Label>
-                                            <TextBlock Text="{Binding Login}" />
+                                            <TextBlock Text="{Binding Credentials.Login}" />
                                         </Label>
                                     </StackPanel>
                                     <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
@@ -156,14 +156,6 @@
                                 <customControls:LocalizedLabel LocalId="account-auth-button"/>
                             </Button>
                         </Border>
-                        <Border BoxShadow="{StaticResource DefaultShadow}">
-                            <Button 
-                                Command="{Binding SaveProfileCommand}" 
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center">
-                                <customControls:LocalizedLabel LocalId="account-auth-save"/>
-                            </Button>
-                        </Border>
                         <Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
                             <Label>
                                 >

Nebula.Launcher/Views/Popup/LoadingContextView.axaml

@@ -33,5 +33,10 @@
                 <customControls:LocalizedLabel LocalId="task-cancel"/> 
             </Button>
         </Panel>
+        <Panel>
+            <Border Background="{StaticResource DefaultForeground}" MinHeight="210">
+                <TextBlock TextWrapping="Wrap" Text="{Binding Message}" MaxLines="10" Margin="15"/>
+            </Border>
+        </Panel>
     </StackPanel>
 </UserControl>

Nebula.Runner/App.cs

@@ -47,65 +47,3 @@ public sealed class App(RunnerService runnerService, ContentService contentServi
         await runnerService.Run(args.ToArray(), buildInfo, this, new ConsoleLoadingHandler(), cancelTokenSource.Token);
     }
 }
-
-public sealed class ConsoleLoadingHandler : ILoadingHandler
-{
-    private int _currJobs;
-
-    private float _percent;
-    private int _resolvedJobs;
-
-    public void SetJobsCount(int count)
-    {
-        _currJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetJobsCount()
-    {
-        return _currJobs;
-    }
-
-    public void SetResolvedJobsCount(int count)
-    {
-        _resolvedJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetResolvedJobsCount()
-    {
-        return _resolvedJobs;
-    }
-
-    private void UpdatePercent()
-    {
-        if (_currJobs == 0)
-        {
-            _percent = 0;
-            return;
-        }
-
-        if (_resolvedJobs > _currJobs) return;
-
-        _percent = _resolvedJobs / (float)_currJobs;
-    }
-
-    private void Draw()
-    {
-        var barCount = 10;
-        var fullCount = (int)(barCount * _percent);
-        var emptyCount = barCount - fullCount;
-
-        Console.Write("\r");
-
-        for (var i = 0; i < fullCount; i++) Console.Write("#");
-
-        for (var i = 0; i < emptyCount; i++) Console.Write(" ");
-
-        Console.Write($"\t {_resolvedJobs}/{_currJobs}");
-    }
-}

Nebula.Shared/Models/Auth/LoginToken.cs

@@ -1,3 +1,6 @@
 namespace Nebula.Shared.Models.Auth;
 
-public sealed record LoginToken(string Token, DateTimeOffset ExpireTime);
+public sealed record LoginToken(string Token, DateTimeOffset ExpireTime)
+{
+    public static LoginToken Empty = new(string.Empty, DateTimeOffset.Now);
+}

Nebula.Shared/Models/ILoadingHandler.cs

@@ -7,6 +7,7 @@ public interface ILoadingHandler
 
     public void SetResolvedJobsCount(int count);
     public int GetResolvedJobsCount();
+    public void SetLoadingMessage(string message);
 
     public void AppendJob(int count = 1)
     {

Nebula.Shared/Services/AuthService.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Http.Headers;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services.Logging;
@@ -15,15 +14,10 @@ public class AuthService(
     CancellationService cancellationService)
 {
     private readonly HttpClient _httpClient = new();
-    public CurrentAuthInfo? SelectedAuth { get; private set; }
     private readonly ILogger _logger = debugService.GetLogger("AuthService");
 
-    public async Task Auth(AuthLoginPassword authLoginPassword, string? code = null)
+    public async Task<AuthTokenCredentials> Auth(string login, string password, string authServer, string? code = null)
     {
-        var authServer = authLoginPassword.AuthServer;
-        var login = authLoginPassword.Login;
-        var password = authLoginPassword.Password;
-
         _logger.Debug($"Auth to {authServer}api/auth/authenticate {login}");
 
         var authUrl = new Uri($"{authServer}api/auth/authenticate");
@@ -34,8 +28,8 @@ public class AuthService(
                 await restService.PostAsync<AuthenticateResponse, AuthenticateRequest>(
                     new AuthenticateRequest(login, null, password, code), authUrl, cancellationService.Token);
 
-            SelectedAuth = new CurrentAuthInfo(result.UserId,
+            return new AuthTokenCredentials(result.UserId,
-                new LoginToken(result.Token, result.ExpireTime), authLoginPassword.Login, authLoginPassword.AuthServer);
+                new LoginToken(result.Token, result.ExpireTime), login, authServer);
         }
         catch (RestRequestException e)
         {
@@ -48,32 +42,17 @@ public class AuthService(
         }
     }
 
-    public void ClearAuth()
+    public async Task EnsureToken(AuthTokenCredentials tokenCredentials)
     {
-        SelectedAuth = null;
+        var authUrl = new Uri($"{tokenCredentials.AuthServer}api/auth/ping");
-    }
-
-    public async Task SetAuth(CurrentAuthInfo info)
-    {
-        SelectedAuth = info;
-        await EnsureToken();
-    }
-
-    public async Task EnsureToken()
-    {
-        if (SelectedAuth is null) throw new Exception("Auth info is not set!");
-
-        var authUrl = new Uri($"{SelectedAuth.AuthServer}api/auth/ping");
 
         using var requestMessage = new HttpRequestMessage(HttpMethod.Get, authUrl);
-        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", SelectedAuth.Token.Token);
+        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", tokenCredentials.Token.Token);
         using var resp = await _httpClient.SendAsync(requestMessage, cancellationService.Token);
     }
 }
 
-public sealed record CurrentAuthInfo(Guid UserId, LoginToken Token, string Login, string AuthServer);
+public sealed record AuthTokenCredentials(Guid UserId, LoginToken Token, string Login, string AuthServer);
-
-public record AuthLoginPassword(string Login, string Password, string AuthServer);
 
 public sealed record AuthDenyError(string[] Errors, AuthenticateDenyCode Code);
 

Nebula.Shared/Services/ConfigMigrations/ProfileMigration.cs

@@ -0,0 +1,38 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Models;
+
+namespace Nebula.Shared.Services.ConfigMigrations;
+
+public class ProfileMigrationV2(string oldName, string newName)
+    : BaseConfigurationMigration<ProfileAuthCredentialsV2[], AuthTokenCredentials[]>(oldName, newName)
+{
+    protected override async Task<AuthTokenCredentials[]> Migrate(IServiceProvider serviceProvider, ProfileAuthCredentialsV2[] oldValue, ILoadingHandler loadingHandler)
+    {
+        loadingHandler.SetLoadingMessage("Migrating Profile V2 -> V3");
+        var list = new List<AuthTokenCredentials>();
+        var authService = serviceProvider.GetRequiredService<AuthService>();
+        var logger = serviceProvider.GetRequiredService<DebugService>().GetLogger("ProfileMigrationV2");
+        foreach (var oldCredentials in oldValue)
+        {
+            try
+            {
+                loadingHandler.SetLoadingMessage($"Migrating {oldCredentials.Login}");
+                var newCred = await authService.Auth(oldCredentials.Login, oldCredentials.Password, oldCredentials.AuthServer);
+                list.Add(newCred);
+            }
+            catch (Exception e)
+            {
+                logger.Error(e);
+                loadingHandler.SetLoadingMessage(e.Message);
+            }
+        }
+
+        loadingHandler.SetLoadingMessage("Migration done!");
+        return list.ToArray();
+    }
+}
+
+public sealed record ProfileAuthCredentialsV2(
+    string Login,
+    string Password,
+    string AuthServer);

Nebula.Shared/Services/ConfigurationService.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using Microsoft.Extensions.DependencyInjection;
 using Nebula.Shared.FileApis.Interfaces;
+using Nebula.Shared.Models;
 using Nebula.Shared.Services.Logging;
 using Robust.LoaderApi;
 
@@ -30,23 +32,116 @@ public static class ConVarBuilder
 
         return new ConVar<T>(name, defaultValue);
     }
+
+    public static ConVar<T> BuildWithMigration<T>(string name, IConfigurationMigration migration, T? defaultValue = default)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("ConVar name cannot be null or whitespace.", nameof(name));
+        
+        ConfigurationService.AddConfigurationMigration(migration);
+
+        return new ConVar<T>(name, defaultValue);
+    }
+}
+
+public interface IConfigurationMigration
+{
+    public Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler);
+}
+
+public abstract class BaseConfigurationMigration<T1,T2> : IConfigurationMigration
+{
+    protected ConVar<T1> OldConVar;
+    protected ConVar<T2> NewConVar;
+    
+    public BaseConfigurationMigration(string oldName, string newName)
+    {
+        OldConVar = ConVarBuilder.Build<T1>(oldName);
+        NewConVar = ConVarBuilder.Build<T2>(newName);
+    }
+
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler)
+    {
+        var oldValue = configurationService.GetConfigValue(OldConVar);
+        if(oldValue == null) return;
+        
+        var newValue = await Migrate(serviceProvider, oldValue, loadingHandler);
+        configurationService.SetConfigValue(NewConVar, newValue);
+        configurationService.ClearConfigValue(OldConVar);
+    }
+
+    protected abstract Task<T2> Migrate(IServiceProvider serviceProvider, T1 oldValue, ILoadingHandler loadingHandler);
+}
+
+public class MigrationQueue(List<IConfigurationMigration> migrations) : IConfigurationMigration
+{
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider , ILoadingHandler loadingHandler)
+    {
+        foreach (var migration in migrations)
+        {
+            await migration.DoMigrate(configurationService, serviceProvider, loadingHandler);
+        }
+    }
+}
+
+public class MigrationQueueBuilder
+{
+    public static MigrationQueueBuilder Instance => new();
+    
+    private readonly List<IConfigurationMigration> _migrations = [];
+
+    public MigrationQueueBuilder With(IConfigurationMigration migration)
+    {
+        _migrations.Add(migration);
+        return this;
+    }
+
+    public MigrationQueue Build()
+    {
+        return new MigrationQueue(_migrations);
+    }
 }
 
 [ServiceRegister]
 public class ConfigurationService
 {
+    private readonly IServiceProvider _serviceProvider;
+    private static List<IConfigurationMigration> _migrations = [];
+
+    public static void AddConfigurationMigration(IConfigurationMigration configurationMigration)
+    {
+        _migrations.Add(configurationMigration);
+    }
+    
     public delegate void OnConfigurationChangedDelegate<in T>(T value);
     
-    public IReadWriteFileApi ConfigurationApi { get; init; }
+    public IReadWriteFileApi ConfigurationApi { get; }
     
     private readonly ILogger _logger;
 
-    public ConfigurationService(FileService fileService, DebugService debugService)
+    public ConfigurationService(FileService fileService, DebugService debugService, IServiceProvider serviceProvider)
     {
+        _serviceProvider = serviceProvider;
         _logger = debugService.GetLogger(this);
         ConfigurationApi = fileService.CreateFileApi("config");
     }
 
+    public void MigrateConfigs(ILoadingHandler loadingHandler)
+    {
+        Task.Run(async () =>
+        {
+            foreach (var migration in _migrations)
+            {
+                await migration.DoMigrate(this, _serviceProvider, loadingHandler);
+            }
+
+            if (loadingHandler is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+        });
+    }
+
     public ConfigChangeSubscriberDisposable<T> SubscribeVarChanged<T>(ConVar<T> convar, OnConfigurationChangedDelegate<T?> @delegate, bool invokeNow = false)
     {
         convar.OnValueChanged += @delegate;
@@ -112,12 +207,17 @@ public class ConfigurationService
         return false;
     }
 
+    public void ClearConfigValue<T>(ConVar<T> conVar)
+    {
+        ConfigurationApi.Remove(GetFileName(conVar));
+        conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
+    }
+
     public void SetConfigValue<T>(ConVar<T> conVar, T? value)
     {
         if (value == null)
         {
-            ConfigurationApi.Remove(GetFileName(conVar));
+            ClearConfigValue(conVar);
-            conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
             return;
         }
 

Nebula.Shared/Services/ContentService.Download.cs

@@ -52,6 +52,7 @@ public partial class ContentService
 
         items = allItems.Where(a=> !hashApi.Has(a)).ToList();
 
+        loadingHandler.SetLoadingMessage("Download Count:" + items.Count);
         _logger.Log("Download Count:" + items.Count);
         await Download(downloadUri, items, hashApi, loadingHandler, cancellationToken);
 
@@ -62,6 +63,7 @@ public partial class ContentService
         CancellationToken cancellationToken)
     {
         _logger.Log("Getting manifest: " + info.Hash);
+        loadingHandler.SetLoadingMessage("Getting manifest: " + info.Hash);
 
         if (ManifestFileApi.TryOpen(info.Hash, out var stream))
         {
@@ -72,6 +74,7 @@ public partial class ContentService
         SetServerHash(info.ManifestUri.ToString(), info.Hash);
 
         _logger.Log("Fetching manifest from: " + info.ManifestUri);
+        loadingHandler.SetLoadingMessage("Fetching manifest from: " + info.ManifestUri);
 
         var response = await _http.GetAsync(info.ManifestUri, cancellationToken);
         if (!response.IsSuccessStatusCode) throw new Exception();
@@ -127,6 +130,7 @@ public partial class ContentService
 
         var downloadJobWatch = loadingHandler.GetQueryJob();
 
+        loadingHandler.SetLoadingMessage("Downloading from: " + contentCdn);
         _logger.Log("Downloading from: " + contentCdn);
 
         var requestBody = new byte[toDownload.Count * 4];
@@ -151,7 +155,7 @@ public partial class ContentService
 
         if (cancellationToken.IsCancellationRequested)
         {
-            _logger.Log("Downloading is cancelled!");
+            _logger.Log("Downloading cancelled!");
             return;
         }
 
@@ -201,7 +205,7 @@ public partial class ContentService
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    _logger.Log("Downloading is cancelled!");
+                    _logger.Log("Downloading cancelled!");
                     decompressContext?.Dispose();
                     compressContext?.Dispose();
                     return;

Nebula.Shared/Services/FileService.cs

@@ -122,6 +122,11 @@ public sealed class ConsoleLoadingHandler : ILoadingHandler
         return _resolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        
+    }
+
     private void UpdatePercent()
     {
         if (_currJobs == 0)

Nebula.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArchiving_002EUtils_002EWindows_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F27e9f12ad1e4318b9b02849ec3e6a502fa3ee761c4f0522ba756ab30cde1c_003FArchiving_002EUtils_002EWindows_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAssembly_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F501151723a8d43558c75acbd334f26322066fa4b1c82b1297291314bf92ff_003FAssembly_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAuthenticationHeaderValue_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F88b338246f59cffdb6f3dc3d8dbcfc169599dc71d6f44a8f2732983db7f73a_003FAuthenticationHeaderValue_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAvaloniaXamlLoader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F80462644bd1cc7e0b229dc4f5752b48c01cb67b46ae563b1b5078cc2556b98_003FAvaloniaXamlLoader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABorder_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5fda7f1253ea19edc15f91b94a33322b857f1a9319fbffea8d26e9d304178_003FBorder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABrushes_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F86e7f7d5cebacb8f8e37f52cb9a1f6a4b8933239631e3d969a4bc881ae92f9_003FBrushes_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -26,6 +27,8 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageHandler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffcc079c54e9940c5ac59f0141dda9ad01b4928_003Fa7_003F885f5fd9_003FHttpMessageHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageHandler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5ec756ee3c4a8815819863993a738eedef67396d5517846a3eed524729bb9_003FHttpMessageHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageInvoker_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffcc079c54e9940c5ac59f0141dda9ad01b4928_003Fb5_003F70346b10_003FHttpMessageInvoker_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpRequestHeaders_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5f9b1c879b45ff7e03890c1477da12b182b50f33d473239e11396c66179557_003FHttpRequestHeaders_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpRequestMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F86529590f9604f327a3b1b19aec3ff2310f0654aa06bb8cef2e3d820ea3bfd_003FHttpRequestMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpResponseMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F4cfeb8b377bc81e1fbb5f7d7a02492cb6ac23e88c8c9d7155944f0716f3d4b_003FHttpResponseMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDispatcherImpl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F22d92db124764b1ab49745245c66f01b1e1a00_003F0f_003F01061787_003FIDispatcherImpl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDisposable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa6b7f037ba7b44df80b8d3aa7e58eeb2e8e938_003F98_003Fd1b23281_003FIDisposable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -33,6 +36,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt32_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fa882d183338544fdbcbdfc7b6d3dcb78916630765551644a221b5be9c45a121b_003FInt32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInterop_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc4d71b51722245ae8cde97bfd996e68386928_003F3a_003F004a1338_003FInterop_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonSerializer_002ERead_002EString_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F27c4858128168eda568c1334d70d5241efb9461e2a3209258a04deee5d9c367_003FJsonSerializer_002ERead_002EString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AKnownHeader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1079f3c57a31ec97cba3b6ebb3d45c5a4afcdf6fa483a4db57c3d58ea59d7a9_003FKnownHeader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AListBox_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3a6cdc26ff4d30986a9a16b6bbc9bb6a7f2657431c82cde5c66dd377cf51e2b_003FListBox_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMetricServer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb07ddb833489431aae882d295a4e94797e00_003Fcf_003F23af7cad_003FMetricServer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMetricServer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F66d3496ea2e7f3cbfb5f2ba1362869af0588ac72e87912659693443b5b7c3a_003FMetricServer_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
@@ -40,6 +44,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANativeLibrary_002ECoreCLR_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F88c2c65e1618f68cb5969f70dfc0986e9571015ac8d487b18d26e89c926264_003FNativeLibrary_002ECoreCLR_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANativeLibrary_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F49393f3cda2f9a5c2fa811fc9179dcbaf5bd94d9dc8afc76aaff2bc23287f3_003FNativeLibrary_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObservableCollection_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3e2c48e6b3ec8b39cf721287f93972c7f3df25d306753bcc539eaad73126c68_003FObservableCollection_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObservableObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3e432edeee9469b7cfdb81d6e6bd278cf57afb9e54ab75649b8bb2f52cdde69_003FObservableObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APanel_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F9b699722324e3615b57977447b25bf953fccb2d6e912ae584f16b7e691ad9d3_003FPanel_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AParallel_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F36fd1a9641998bb3afbf2091e26eafa6aaafabcb494bc746c0ba7471db513143_003FParallel_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AParallel_002EForEachAsync_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc1d1ed6be2d5d4de542b4af5b36e82f6d1d1a389a35a4e4f9748d137d1c651_003FParallel_002EForEachAsync_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>