update deps & fix ArcSDK.dll detected

BigBoot · Dec 4, 2021 · 5c8c2f8 · 5c8c2f8
1 parent c50360d
commit 5c8c2f8
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 161 deletions.
diff --git a/GiganticEmu.Agent/GiganticEmu.Agent.csproj b/GiganticEmu.Agent/GiganticEmu.Agent.csproj
@@ -20,9 +20,9 @@
 
   <ItemGroup>
     <PackageReference Include="Fetchgoods.Text.Json.Extensions" Version="0.1.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.12" />
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 

diff --git a/GiganticEmu.Launcher/App/App.xaml b/GiganticEmu.Launcher/App/App.xaml
@@ -1,8 +1,8 @@
 <Application x:Class="GiganticEmu.Launcher.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:GiganticEmu.Launcher"
-             StartupUri="MainWindow.xaml" Exit="Application_Exit">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:GiganticEmu.Launcher"
+    StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -12,12 +12,12 @@
                     <ResourceDictionary.MergedDictionaries>
                         <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Cyan.xaml" />
                     </ResourceDictionary.MergedDictionaries>
-                    <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#1a7d93"/>
-                    <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="White"/>
-                    <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#1a7d93"/>
-                    <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="White"/>
-                    <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#1a7d93"/>
-                    <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="White"/>
+                    <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#1a7d93" />
+                    <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="White" />
+                    <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#1a7d93" />
+                    <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="White" />
+                    <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#1a7d93" />
+                    <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="White" />
                 </ResourceDictionary>
                 <ResourceDictionary>
                     <ResourceDictionary.MergedDictionaries>
@@ -45,7 +45,7 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            
+
             <!--ScrollBars-->
             <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
                 <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
@@ -105,4 +105,4 @@
             </Style>
         </ResourceDictionary>
     </Application.Resources>
-</Application>
+</Application>
diff --git a/GiganticEmu.Launcher/App/App.xaml.cs b/GiganticEmu.Launcher/App/App.xaml.cs
@@ -28,8 +28,6 @@ public class Options
 
     public App()
     {
-        Settings.Load();
-
         Parser.Default.ParseArguments<Options>(Environment.GetCommandLineArgs())
                .WithParsed<Options>(o =>
                 {
@@ -51,9 +49,4 @@ public App()
             BaseAddress = new Uri(Locator.Current.GetService<LauncherConfiguration>()!.Host)
         }), typeof(IBackendApi));
     }
-
-    private void Application_Exit(object sender, ExitEventArgs e)
-    {
-        Settings.Save();
-    }
 }
diff --git a/GiganticEmu.Launcher/Common/Settings.cs b/GiganticEmu.Launcher/Common/Settings.cs
diff --git a/GiganticEmu.Launcher/GiganticEmu.Launcher.csproj b/GiganticEmu.Launcher/GiganticEmu.Launcher.csproj
@@ -23,14 +23,14 @@
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="CredentialManagement.Standard" Version="1.0.4" />
     <PackageReference Include="Flurl.Http" Version="3.2.0" />
-    <PackageReference Include="MaterialDesignColors" Version="2.0.1" />
+    <PackageReference Include="MaterialDesignColors" Version="2.0.4" />
     <PackageReference Include="MaterialDesignExtensions" Version="3.3.0" />
-    <PackageReference Include="MaterialDesignThemes" Version="4.1.0" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.0.2" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageReference Include="DynamicData" Version="7.4.3" />
-    <PackageReference Include="ReactiveUI" Version="16.3.10" />
-    <PackageReference Include="ReactiveUI.Fody" Version="16.3.10" />
-    <PackageReference Include="ReactiveUI.WPF" Version="16.3.10" />
+    <PackageReference Include="ReactiveUI" Version="17.0.1" />
+    <PackageReference Include="ReactiveUI.Fody" Version="17.0.1" />
+    <PackageReference Include="ReactiveUI.WPF" Version="17.0.1" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 
     <ProjectReference Include="..\GiganticEmu.Shared\GiganticEmu.Shared.csproj" />

diff --git a/GiganticEmu.Launcher/Main/FriendList.xaml b/GiganticEmu.Launcher/Main/FriendList.xaml
@@ -1,4 +1,4 @@
-<rxui:ReactiveUserControl x:Class="GiganticEmu.Launcher.FriendList"
+<rxui:ReactiveUserControl x:Class="GiganticEmu.Launcher.FriendList"
     x:TypeArguments="local:FriendListViewModel"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -24,6 +24,11 @@
                     <Popup x:Name="PopupUser" IsOpen="{Binding IsChecked, ElementName=ButtonUserName}" PlacementTarget="{Binding ElementName=ButtonUserName}" StaysOpen="False">
                         <Border BorderBrush="{DynamicResource PrimaryHueMidBrush}" BorderThickness="1,1,1,1">
                             <Menu Name="UserMenu" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                <Menu.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <VirtualizingStackPanel Orientation="Vertical" />
+                                    </ItemsPanelTemplate>
+                                </Menu.ItemsPanel>
                                 <MenuItem x:Name="ButtonLogout" Header="Logout" />
                             </Menu>
                         </Border>

diff --git a/GiganticEmu.Launcher/Main/FriendList.xaml.cs b/GiganticEmu.Launcher/Main/FriendList.xaml.cs
@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
 using System;
 using System.Reactive;
 using System.Reactive.Disposables;

diff --git a/GiganticEmu.Launcher/Main/FriendListViewModel.cs b/GiganticEmu.Launcher/Main/FriendListViewModel.cs
@@ -1,4 +1,4 @@
-using DynamicData;
+using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -58,36 +58,6 @@ public FriendListViewModel()
 
                 _friends.RemoveKeys(_friends.Keys.Except(friends.Select(x => x.UserName)));
             });
-
-        //_friends.Add(new FriendData()
-        //{
-        //    UserName = "TheLegend28",
-        //    IconHash = "0418e2cea8ef594e6bc05ab3c3fe1fae0db09a2981d32b291992ddc2191075fe",
-        //    IsOnline = true,
-        //    CanAccept = false,
-        //    HasAccepted = true,
-        //    CanJoin = false
-        //});
-
-        //_friends.Add(new FriendData()
-        //{
-        //    UserName = "TheLegend29",
-        //    IconHash = "e60c11bc0ea105260a7a345528e55b38d2ff4fef03124b8b295ee2c655faadf5",
-        //    IsOnline = false,
-        //    CanAccept = false,
-        //    HasAccepted = true,
-        //    CanJoin = false
-        //});
-
-        //_friends.Add(new FriendData()
-        //{
-        //    UserName = "TheLegend30",
-        //    IconHash = "17887f87477a18d04aeb3012f23f23843606e0ab9a9b25664ac348274de89b0c",
-        //    IsOnline = false,
-        //    CanAccept = true,
-        //    HasAccepted = true,
-        //    CanJoin = false
-        //});
     }
 
     private async Task DoAddFriend(string userName)

diff --git a/GiganticEmu.Launcher/Main/MainContainerViewModel.cs b/GiganticEmu.Launcher/Main/MainContainerViewModel.cs
@@ -1,4 +1,4 @@
-using GiganticEmu.Agent;
+using GiganticEmu.Agent;
 using GiganticEmu.Shared;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -56,7 +56,7 @@ private async Task DoStartGame()
 
         var arcsdkMetadata = File.Exists(Path.Join(path, "ArcSDK.dll")) ? FileVersionInfo.GetVersionInfo(Path.Join(path, "ArcSDK.dll")) : null;
 
-        if (arcsdkMetadata == null || arcsdkMetadata.InternalName != "ArcSDK" || arcsdkMetadata.ProductVersion == null)
+        if (arcsdkMetadata == null || arcsdkMetadata.ProductName != "ArcSDK" || arcsdkMetadata.ProductVersion == null)
         {
             var result = MessageBox.Show("Unknown ArcSDK.dll version found.\nThis probably means this is your first time running MistforgeLauncher.\nMistforgeLauncher needs to replace the ArcSDK.dll with it's own version to continue.\n\nDo you want to continue?", "Unknown ArcSDK.dll version!", MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result != MessageBoxResult.Yes) return;

diff --git a/GiganticEmu.Mice/GiganticEmu.Mice.csproj b/GiganticEmu.Mice/GiganticEmu.Mice.csproj
@@ -5,9 +5,9 @@
 
   <ItemGroup>
     <PackageReference Include="Fetchgoods.Text.Json.Extensions" Version="0.1.0" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.5" />
+    <PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/GiganticEmu.Shared.Backend/Data/ApplicationDatabaseFactory.cs b/GiganticEmu.Shared.Backend/Data/ApplicationDatabaseFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 
@@ -14,12 +15,19 @@ public ApplicationDatabase CreateDbContext(string[] args)
         public ApplicationDatabase CreateDbContext()
         {
             var builder = new DbContextOptionsBuilder<ApplicationDatabase>()
-                .UseNpgsql(Environment.GetEnvironmentVariable("CONNECTIONSTRINGS__POSTGRES"), options =>
+                .UseNpgsql(Environment.GetEnvironmentVariable("CONNECTIONSTRINGS__POSTGRES")!, options =>
                 {
                     options.EnableRetryOnFailure();
                 });
 
-            return new ApplicationDatabase(builder.Options);
+            var db = new ApplicationDatabase(builder.Options);
+
+            if (db.Database.GetPendingMigrations().Count() > 0)
+            {
+                db.Database.Migrate();
+            }
+
+            return db;
         }
 
         public static void Main(string[] args)

diff --git a/GiganticEmu.Shared.Backend/GiganticEmu.Shared.Backend.csproj b/GiganticEmu.Shared.Backend/GiganticEmu.Shared.Backend.csproj
@@ -1,22 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.Tye.Extensions.Configuration" Version="0.7.0-alpha.21279.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Tye.Extensions.Configuration" Version="0.10.0-alpha.21420.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
 
     <ProjectReference Include="..\GiganticEmu.Shared\GiganticEmu.Shared.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/GiganticEmu.Shared/GiganticEmu.Shared.csproj b/GiganticEmu.Shared/GiganticEmu.Shared.csproj
@@ -2,7 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="refit" Version="6.0.38" />
+    <PackageReference Include="refit" Version="6.1.15" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/GiganticEmu.Web/GiganticEmu.Web.csproj b/GiganticEmu.Web/GiganticEmu.Web.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Fetchgoods.Text.Json.Extensions" Version="0.1.0" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/GiganticEmu.Web/Startup.cs b/GiganticEmu.Web/Startup.cs
@@ -66,19 +66,13 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
         app.UseRouting();
 
-        //app.UseAuthentication();
+        //app.UseAuthentication(); 
         //app.UseAuthorization();
 
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapControllers();
         });
 
-        using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
-        {
-            var context = serviceScope.ServiceProvider.GetService<ApplicationDatabase>();
-            context?.Database.Migrate();
-        }
-
     }
 }
diff --git a/tye.yaml b/tye.yaml