Update dependencies (#750)

2026-07-24 03:56:30 +00:00 · 2024-06-06 13:32:53 +02:00
parent 0dc957a99d
commit 2a7e2c90fc
3 changed files with 77 additions and 72 deletions
@@ -100,72 +100,6 @@ public class ProjectConfiguration : PluginConfigurationBase
        serviceManager.RegisterOptionsManager<OptionsManager>();
        serviceManager.RegisterResolver(new LoggerResolver());
        serviceManager.RegisterResolver(new ClientWebSocketResolver());
-        serviceManager
-            .RegisterHttpClient<ApplicationUpdater>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<ApplicationUpdater>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<OnlinePictureClient>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<OnlinePictureClient>)
-                .WithDefaultRequestHeadersSetup(this.SetupChromeImpersonationUserAgent)
-                .Build()
-            .RegisterHttpClient<GraphClient>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<GraphClient>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<DownloadService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<DownloadService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<TradeChatService<KamadanTradeChatOptions>>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<TradeChatService<KamadanTradeChatOptions>>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<TradeChatService<AscalonTradeChatOptions>>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<TradeChatService<AscalonTradeChatOptions>>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<IconCache>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<IconCache>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<TraderQuoteService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<TraderQuoteService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<PriceHistoryService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<PriceHistoryService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<InternetCheckingService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<InternetCheckingService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<ChromiumBrowserWrapper>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<ChromiumBrowserWrapper>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<ToolboxClient>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<ToolboxClient>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<ReShadeService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<ReShadeService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<GWCAClient>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<GWCAClient>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .WithTimeout(TimeSpan.FromSeconds(5))
-                .Build()
-            .RegisterHttpClient<UModService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<UModService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build()
-            .RegisterHttpClient<UBlockOriginService>()
-                .WithMessageHandler(this.SetupLoggingAndMetrics<UBlockOriginService>)
-                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
-                .Build();
    }

    public override void RegisterServices(IServiceCollection services)
@@ -173,7 +107,7 @@ public class ProjectConfiguration : PluginConfigurationBase
        services.ThrowIfNull();

        this.RegisterLiteCollections(services);
-
+        this.RegisterHttpClients(services);
        services.AddSingleton<ILogsManager, JsonLogsManager>();
        services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
        services.AddSingleton<IEventViewerLogsWriter, EventViewerLogsWriter>();
@@ -490,4 +424,75 @@ public class ProjectConfiguration : PluginConfigurationBase
        this.RegisterLiteCollection<NotificationDTO, NotificationStorageOptions>(services);
        this.RegisterLiteCollection<TraderMessageDTO, TraderMessagesOptions>(services);
    }
+
+    private IServiceCollection RegisterHttpClients(IServiceCollection services)
+    {
+        return services
+            .ThrowIfNull()
+            .RegisterHttpClient<ApplicationUpdater>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<ApplicationUpdater>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<OnlinePictureClient>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<OnlinePictureClient>)
+                .WithDefaultRequestHeadersSetup(this.SetupChromeImpersonationUserAgent)
+                .Build()
+            .RegisterHttpClient<GraphClient>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<GraphClient>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<DownloadService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<DownloadService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TradeChatService<KamadanTradeChatOptions>>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<TradeChatService<KamadanTradeChatOptions>>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TradeChatService<AscalonTradeChatOptions>>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<TradeChatService<AscalonTradeChatOptions>>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<IconCache>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<IconCache>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TraderQuoteService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<TraderQuoteService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<PriceHistoryService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<PriceHistoryService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<InternetCheckingService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<InternetCheckingService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<ChromiumBrowserWrapper>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<ChromiumBrowserWrapper>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<ToolboxClient>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<ToolboxClient>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<ReShadeService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<ReShadeService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<GWCAClient>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<GWCAClient>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .WithTimeout(TimeSpan.FromSeconds(5))
+                .Build()
+            .RegisterHttpClient<UModService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<UModService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<UBlockOriginService>()
+                .WithMessageHandler(this.SetupLoggingAndMetrics<UBlockOriginService>)
+                .WithDefaultRequestHeadersSetup(this.SetupDaybreakUserAgent)
+                .Build();
+    }
 }
@@ -96,15 +96,15 @@
    <PackageReference Include="DotNetZip" Version="1.16.0" />
    <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
    <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
-    <PackageReference Include="LiteDB" Version="5.0.17" />
+    <PackageReference Include="LiteDB" Version="5.0.20" />
    <PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-rc2" />
    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
    <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
    <PackageReference Include="NAudio" Version="2.2.1" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="Plumsy" Version="1.1.0" />
@@ -119,7 +119,7 @@
    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
    <PackageReference Include="SystemExtensions.NetCore" Version="1.0.1" />
    <PackageReference Include="SystemExtensions.NetStandard" Version="1.6.3" />
-    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.3.1" />
+    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.4.0" />
    <PackageReference Include="WpfExtended" Version="0.7.7" />
    <PackageReference Include="WpfExtended.SourceGeneration" Version="0.3.0" />
    <PackageReference Include="WpfScreenHelper" Version="2.1.0" />