Merge pull request #1716 from wabbajack-tools/fix-install-config

Fix install config

Wabbajack.App/Controls/ButtonSettingTextBox.axaml

@@ -0,0 +1,41 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Wabbajack.App.Controls.ButtonSettingTextBox">
+
+    <UserControl.Styles>
+        <Style Selector="Button:not(:pointerover) /template/ ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="LightGray" />
+            <Setter Property="CornerRadius" Value="0, 5, 5, 0" />
+        </Style>
+
+        <Style Selector="Button:pointerover /template/ ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="LightGray" />
+            <Setter Property="CornerRadius" Value="0, 5, 5, 0" />
+        </Style>
+
+        <Style Selector="TextBox:not(:focus) /template/ ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="LightGray" />
+            <Setter Property="CornerRadius" Value="5, 0, 0, 5" />
+        </Style>
+
+        <Style Selector="TextBox:focus /template/ ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="LightGray" />
+            <Setter Property="CornerRadius" Value="5, 0, 0, 5" />
+        </Style>
+    </UserControl.Styles>
+
+    <Grid ColumnDefinitions="*, 30" Height="30">
+        <TextBox Grid.Column="0" Name="Path" Height="30" x:Name="TextBox" IsEnabled="False" />
+        <Button Grid.Column="1" Name="SelectButton" Height="30">
+            <i:MaterialIcon Kind="Search" />
+        </Button>
+    </Grid>
+</UserControl>

Wabbajack.App/Controls/ButtonSettingTextBox.axaml.cs

@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace Wabbajack.App.Controls;
+
+public partial class ButtonSettingTextBox : UserControl
+{
+    public ButtonSettingTextBox()
+    {
+        InitializeComponent();
+    }
+    
+}

Wabbajack.App/Controls/FileSelectionBox.axaml.cs

@@ -1,61 +1,69 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using Wabbajack.Paths;
 
 namespace Wabbajack.App.Controls;
 
 public partial class FileSelectionBox : ReactiveUserControl<FileSelectionBoxViewModel>
 {
-    public static readonly DirectProperty<FileSelectionBox, AbsolutePath> SelectedPathProperty =
-        AvaloniaProperty.RegisterDirect<FileSelectionBox, AbsolutePath>(nameof(SelectedPath), o => o.SelectedPath);
-
     public static readonly StyledProperty<string> AllowedExtensionsProperty =
         AvaloniaProperty.Register<FileSelectionBox, string>(nameof(AllowedExtensions));
 
     public static readonly StyledProperty<bool> SelectFolderProperty =
         AvaloniaProperty.Register<FileSelectionBox, bool>(nameof(SelectFolder));
 
-    private AbsolutePath _selectedPath;
 
     public FileSelectionBox()
     {
-        DataContext = App.Services.GetService<FileSelectionBoxViewModel>()!;
         InitializeComponent();
-
+        SelectButton.Command = ReactiveCommand.CreateFromTask(ShowDialog);
-        this.WhenActivated(disposables =>
-        {
-            this.OneWayBind(ViewModel, vm => vm.Path, view => view.SelectedPath)
-                .DisposeWith(disposables);
-            this.WhenAnyValue(view => view.SelectFolder)
-                .BindTo(ViewModel, vm => vm.SelectFolder)
-                .DisposeWith(disposables);
-            this.WhenAnyValue(view => view.AllowedExtensions)
-                .Where(exts => !string.IsNullOrWhiteSpace(exts))
-                .Select(exts =>
-                    exts.Split("|", StringSplitOptions.RemoveEmptyEntries).Select(s => new Extension(s)).ToArray())
-                .BindTo(ViewModel, vm => vm.Extensions)
-                .DisposeWith(disposables);
-            this.OneWayBind(ViewModel, vm => vm.Path,
-                    view => view.TextBox.Text)
-                .DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.BrowseCommand,
-                    view => view.SelectButton)
-                .DisposeWith(disposables);
-        });
     }
 
-    public AbsolutePath SelectedPath
+    private async Task ShowDialog()
     {
-        get => _selectedPath;
+        if (SelectFolder)
-        set => SetAndRaise(SelectedPathProperty, ref _selectedPath, value);
+        {
+            var dialog = new OpenFolderDialog
+            {
+                Title = "Select a folder"
+            };
+            var result = await dialog.ShowAsync(App.MainWindow);
+            if (result != null)
+                Load(result.ToAbsolutePath());
+        }
+        else
+        {
+            var extensions = AllowedExtensions.Split(",").Select(e => e.ToString()[1..]).ToList();
+            var dialog = new OpenFileDialog
+            {
+                AllowMultiple = false,
+                Title = "Select a file",
+                Filters = new List<FileDialogFilter>
+                {
+                    new FileDialogFilter {Extensions = extensions, Name = "*"}
+                }
+            };
+            var results = await dialog.ShowAsync(App.MainWindow);
+            if (results != null)
+                Load(results!.First().ToAbsolutePath());
+        }
     }
 
+    [Reactive]
+    public AbsolutePath SelectedPath { get; set; }
+
     public string AllowedExtensions
     {
         get => GetValue(AllowedExtensionsProperty);
@@ -70,6 +78,9 @@ public partial class FileSelectionBox : ReactiveUserControl<FileSelectionBoxView
 
     public void Load(AbsolutePath path)
     {
-        ViewModel.Path = path;
+        Dispatcher.UIThread.Post(() => { 
+            TextBox.Text = path.ToString();
+            SelectedPath = path;
+        });
     }
 }

Wabbajack.App/Screens/StandardInstallationView.axaml

@@ -5,7 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              x:Class="Wabbajack.App.Views.StandardInstallationView">
-    <Grid RowDefinitions="40, 5, 5, *, 40">
+    <Grid RowDefinitions="40, 5, 5, *, 40" Margin="4">
         <TextBlock Grid.Row="0" x:Name="StatusText" FontSize="20" FontWeight="Bold">[20/30] Installing Files</TextBlock>
         <ProgressBar Grid.Row="1" x:Name="StepsProgress" Maximum="1000" Value="0" />
         <ProgressBar Grid.Row="2" x:Name="StepProgress" Maximum="10000" Value="0" />
@@ -14,6 +14,16 @@
                  Stretch="Uniform">
             <Image x:Name="SlideImage" />
         </Viewbox>
+        <Border Grid.Row="3" VerticalAlignment="Bottom" HorizontalAlignment="Center" CornerRadius="4" Background="#111111" Opacity="25">
+            <StackPanel Orientation="Vertical" Margin="4">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock FontSize="24" x:Name="ModTitle" FontWeight="Bold"></TextBlock>
+                    <TextBlock FontSize="12" FontStyle="Italic" Text="by" Margin="8, 0, 4, 4" VerticalAlignment="Bottom"></TextBlock>
+                    <TextBlock FontSize="12" x:Name="AuthorName" FontStyle="Italic" VerticalAlignment="Bottom" Margin="0, 0, 4, 4" ></TextBlock>
+                </StackPanel>
+                <TextBlock FontSize="12" x:Name="ModDescription" TextWrapping="Wrap"></TextBlock>
+            </StackPanel>
+        </Border>
         <Grid Grid.Row="4" HorizontalAlignment="Center" ColumnDefinitions="40, 40, 40, 40">
             <Button Grid.Column="0" x:Name="PrevSlide">
                 <i:MaterialIcon Kind="ArrowLeft" />

Wabbajack.App/Screens/StandardInstallationView.axaml.cs

@@ -40,6 +40,15 @@ public partial class StandardInstallationView : ScreenBase<StandardInstallationV
             this.OneWayBind(ViewModel, vm => vm.StepProgress, p => p.StepProgress.Value, p => p.Value * 10000)
                 .DisposeWith(disposables);
 
+            this.OneWayBind(ViewModel, vm => vm.Slide.MetaState.Name, view => view.ModTitle.Text)
+                .DisposeWith(disposables);
+
+            this.OneWayBind(ViewModel, vm => vm.Slide.MetaState.Description, view => view.ModDescription.Text)
+                .DisposeWith(disposables);
+            
+            this.OneWayBind(ViewModel, vm => vm.Slide.MetaState.Author, view => view.AuthorName.Text)
+                .DisposeWith(disposables);
+
         });
     }
 }

Wabbajack.App/Screens/StandardInstallationViewModel.cs

@@ -172,6 +172,7 @@ public class StandardInstallationViewModel : ViewModelBase
 
         _slides = _config.ModList.Archives.Select(a => a.State).OfType<IMetaState>()
             .Select(m => new SlideViewModel {MetaState = m})
+            .Where(s => !s.MetaState.IsNSFW)
             .Shuffle()
             .ToArray();
 

Wabbajack.App/ViewModels/InstallConfigurationViewModel.cs

@@ -54,7 +54,6 @@ public class InstallConfigurationViewModel : ViewModelBase, IActivatableViewMode
                 .Where(t => t != default)
                 .SelectMany(async x => await LoadModList(x))
                 .OnUIThread()
-                .ObserveOn(AvaloniaScheduler.Instance)
                 .BindTo(this, t => t.ModList)
                 .DisposeWith(disposables);
 
@@ -68,7 +67,7 @@ public class InstallConfigurationViewModel : ViewModelBase, IActivatableViewMode
             var settings = this.WhenAnyValue(t => t.ModListPath)
                 .SelectMany(async v => await _stateManager.Get(v))
                 .OnUIThread()
-                .Where(s => s != null);
+                .Where(s => s != default && s.Install != default);
 
             settings.Select(s => s!.Install)
                 .BindTo(this, vm => vm.Install)
@@ -77,11 +76,8 @@ public class InstallConfigurationViewModel : ViewModelBase, IActivatableViewMode
             settings.Select(s => s!.Downloads)
                 .BindTo(this, vm => vm.Download)
                 .DisposeWith(disposables);
-
-
-            LoadSettings().FireAndForget();
-
         });
+        LoadSettings().FireAndForget();
     }
 
     private async Task LoadSettings()
@@ -139,7 +135,8 @@ public class InstallConfigurationViewModel : ViewModelBase, IActivatableViewMode
 
     private async Task<IBitmap> LoadModListImage(AbsolutePath path)
     {
-        return new Bitmap(await ModListUtilities.GetModListImageStream(path));
+        var img = new Bitmap(await ModListUtilities.GetModListImageStream(path));
+        return img;
     }
 
     private async Task<ModList> LoadModList(AbsolutePath modlist)

Wabbajack.App/Views/InstallConfigurationView.axaml

@@ -10,7 +10,7 @@
                  Name="Banner"
                  HorizontalAlignment="Center"
                  VerticalAlignment="Center"
-                 Stretch="UniformToFill">
+                 Stretch="Uniform">
             <Image x:Name="ModListImage" Margin="0,0,0,0" Source="../Assets/Wabba_Mouth.png" />
         </Viewbox>
         <Grid Grid.Row="0" RowDefinitions="40, 40" HorizontalAlignment="Left" VerticalAlignment="Bottom">
@@ -18,13 +18,13 @@
         </Grid>
         <Grid Margin="40" RowDefinitions="40, 40, 40, *" ColumnDefinitions="100, *, 200" Grid.Row="1">
             <Label Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center">ModList:</Label>
-            <controls:FileSelectionBox Grid.Column="1" Grid.Row="0" AllowedExtensions=".wabbajack" x:Name="ModListFile" />
+            <controls:ButtonSettingTextBox Grid.Column="1" Grid.Row="0" x:Name="ModListFile" />
 
             <Label Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center">Install To:</Label>
-            <controls:FileSelectionBox Grid.Column="1" Grid.Row="1" SelectFolder="True" x:Name="InstallPath" />
+            <controls:ButtonSettingTextBox Grid.Column="1" Grid.Row="1" x:Name="InstallPath" />
 
             <Label Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center">Download To:</Label>
-            <controls:FileSelectionBox Grid.Column="1" Grid.Row="2" SelectFolder="True" x:Name="DownloadPath" />
+            <controls:ButtonSettingTextBox Grid.Column="1" Grid.Row="2" x:Name="DownloadPath" />
 
             <controls:LargeIconButton x:Name="BeginInstall" Margin="40, 0, 0, 0" Grid.Row="0" Grid.Column="2"
                                       Grid.RowSpan="4" Icon="DownloadNetwork" Text="Install" />

Wabbajack.App/Views/InstallConfigurationView.axaml.cs

@@ -1,11 +1,18 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using ReactiveUI;
 using Wabbajack.App.Interfaces;
 using Wabbajack.App.ViewModels;
+using Wabbajack.Common;
+using Wabbajack.Paths;
 
 namespace Wabbajack.App.Views;
 
@@ -18,32 +25,24 @@ public partial class InstallConfigurationView : ScreenBase<InstallConfigurationV
 
         this.WhenActivated(disposables =>
         {
-            ViewModel.WhenAnyValue(vm => vm.ModListPath)
+            ModListFile.SelectButton.Command = ReactiveCommand.CreateFromTask(SelectWabbajackFile)
-                .Subscribe(path => ModListFile.Load(path))
                 .DisposeWith(disposables);
-            
+            this.OneWayBind(ViewModel, vm => vm.ModListPath, view => view.ModListFile.TextBox.Text)
-            ViewModel.WhenAnyValue(vm => vm.ModListPath)
-                .Subscribe(path => ModListFile.Load(path))
-                .DisposeWith(disposables);
-            
-            ViewModel.WhenAnyValue(vm => vm.Download)
-                .Subscribe(path => DownloadPath.Load(path))
-                .DisposeWith(disposables);
-            
-            ViewModel.WhenAnyValue(vm => vm.Install)
-                .Subscribe(path => InstallPath.Load(path))
                 .DisposeWith(disposables);
 
-            this.WhenAnyValue(view => view.ModListFile.SelectedPath)
+            InstallPath.SelectButton.Command = ReactiveCommand.CreateFromTask(() =>
-                .BindTo(ViewModel, vm => vm.ModListPath)
+                    SelectFolder("Select Install Location", p => ViewModel!.Install = p))
                 .DisposeWith(disposables);
-
+            this.OneWayBind(ViewModel, vm => vm.Install, view => view.InstallPath.TextBox.Text)
-            this.WhenAnyValue(view => view.DownloadPath.SelectedPath)
-                .BindTo(ViewModel, vm => vm.Download)
                 .DisposeWith(disposables);
-
+            
-            this.WhenAnyValue(view => view.InstallPath.SelectedPath)
+            DownloadPath.SelectButton.Command = ReactiveCommand.CreateFromTask(() =>
-                .BindTo(ViewModel, vm => vm.Install)
+                    SelectFolder("Select Download Location", p => ViewModel!.Download = p))
+                .DisposeWith(disposables);
+            this.OneWayBind(ViewModel, vm => vm.Download, view => view.DownloadPath.TextBox.Text)
+                .DisposeWith(disposables);
+            
+            this.OneWayBind(ViewModel, vm => vm.ModListImage, view => view.ModListImage.Source)
                 .DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.BeginCommand, view => view.BeginInstall.Button)
@@ -51,5 +50,40 @@ public partial class InstallConfigurationView : ScreenBase<InstallConfigurationV
         });
     }
 
+    private async Task SelectWabbajackFile()
+    {
+        var fod = new OpenFileDialog()
+        {
+            Filters = new List<FileDialogFilter> {new()
+                {
+                    Name = "Wabbajack",
+                    Extensions = new List<string> {Ext.Wabbajack.ToString()}
+                }
+            }
+        };
+        var result = await fod.ShowAsync(App.MainWindow);
+        if (result == null) return;
+        
+        Dispatcher.UIThread.Post(() =>
+        {
+            ViewModel!.ModListPath = result.First().ToAbsolutePath();
+        });
+    }
+
+    public async Task SelectFolder(string title, Action<AbsolutePath> toCall)
+    {
+        var fod = new OpenFolderDialog
+        {
+            Title = title
+        };
+        var result = await fod.ShowAsync(App.MainWindow);
+        if (result == null) return;
+        
+        Dispatcher.UIThread.Post(() =>
+        {
+            toCall(result.ToAbsolutePath());
+        });
+    }
+
     public Type ViewModelType => typeof(InstallConfigurationViewModel);
 }

Wabbajack.CLI/Wabbajack.CLI.csproj

@@ -13,12 +13,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.2.21480.5" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21552.1" />
+        <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21558.1" />
     </ItemGroup>
 
     <ItemGroup>

Wabbajack.Common/Wabbajack.Common.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
     </ItemGroup>
 
     <ItemGroup>
@@ -29,8 +29,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="System.Reactive" Version="5.0.0"/>
+        <PackageReference Include="System.Reactive" Version="5.0.0" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.2-pre.12" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.2-pre.12" />
         <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />

Wabbajack.DTOs/Wabbajack.DTOs.csproj

@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Hashing.xxHash64\Wabbajack.Hashing.xxHash64.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Hashing.xxHash64\Wabbajack.Hashing.xxHash64.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.2-pre.12" />
         <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />

Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj

@@ -8,21 +8,21 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.GameFile\Wabbajack.Downloaders.GameFile.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.GameFile\Wabbajack.Downloaders.GameFile.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.GoogleDrive\Wabbajack.Downloaders.GoogleDrive.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.GoogleDrive\Wabbajack.Downloaders.GoogleDrive.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Http\Wabbajack.Downloaders.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Http\Wabbajack.Downloaders.Http.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.IPS4OAuth2Downloader\Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.IPS4OAuth2Downloader\Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.MediaFire\Wabbajack.Downloaders.MediaFire.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.MediaFire\Wabbajack.Downloaders.MediaFire.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Mega\Wabbajack.Downloaders.Mega.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Mega\Wabbajack.Downloaders.Mega.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.ModDB\Wabbajack.Downloaders.ModDB.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.ModDB\Wabbajack.Downloaders.ModDB.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Nexus\Wabbajack.Downloaders.Nexus.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Nexus\Wabbajack.Downloaders.Nexus.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.WabbajackCDN\Wabbajack.Downloaders.WabbajackCDN.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.WabbajackCDN\Wabbajack.Downloaders.WabbajackCDN.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj

@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj

@@ -8,15 +8,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj

@@ -6,15 +6,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="F23.StringSimilarity" Version="4.1.0"/>
+        <PackageReference Include="F23.StringSimilarity" Version="4.1.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj

@@ -6,14 +6,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.37"/>
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj

@@ -6,13 +6,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MegaApiClient" Version="1.9.0"/>
+        <PackageReference Include="MegaApiClient" Version="1.9.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj

@@ -6,14 +6,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.37"/>
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
-        <PackageReference Include="MegaApiClient" Version="1.9.0"/>
+        <PackageReference Include="MegaApiClient" Version="1.9.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj

@@ -8,15 +8,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj" />
-        <ProjectReference Include="..\Wabbajack.RateLimiter\Wabbajack.RateLimiter.csproj"/>
+        <ProjectReference Include="..\Wabbajack.RateLimiter\Wabbajack.RateLimiter.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.1"/>
+        <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.1" />
     </ItemGroup>
 
 </Project>

Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.2-pre.12" />
         <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />

Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj

@@ -23,14 +23,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-        <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="OMODFramework" Version="3.0.1"/>
+        <PackageReference Include="OMODFramework" Version="3.0.1" />
     </ItemGroup>
 
 </Project>

Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.2-pre.12" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj

@@ -8,11 +8,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj

@@ -8,13 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Octokit" Version="0.50.0"/>
+        <PackageReference Include="Octokit" Version="0.50.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj

@@ -8,15 +8,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Hashing.xxHash64\Wabbajack.Hashing.xxHash64.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Hashing.xxHash64\Wabbajack.Hashing.xxHash64.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj

@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http.Interfaces\Wabbajack.Networking.Http.Interfaces.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Http\Wabbajack.Networking.Http.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj" />
     </ItemGroup>
 </Project>

Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj

@@ -8,15 +8,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="YamlDotNet" Version="11.2.1"/>
+        <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
-        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj"/>
+        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.Server/Wabbajack.Server.csproj

@@ -19,9 +19,9 @@
         <PackageReference Include="Discord.Net.WebSocket" Version="2.4.0" />
         <PackageReference Include="FluentFTP" Version="35.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="Nettle" Version="1.3.0" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     </ItemGroup>

Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj

@@ -8,20 +8,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DeviceId" Version="6.0.0"/>
+        <PackageReference Include="DeviceId" Version="6.0.0" />
         <PackageReference Include="GitInfo" Version="2.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Compiler\Wabbajack.Compiler.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Compiler\Wabbajack.Compiler.csproj" />
-        <ProjectReference Include="..\Wabbajack.Downloaders.Dispatcher\Wabbajack.Downloaders.Dispatcher.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Dispatcher\Wabbajack.Downloaders.Dispatcher.csproj" />
-        <ProjectReference Include="..\Wabbajack.Installer\Wabbajack.Installer.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Installer\Wabbajack.Installer.csproj" />
-        <ProjectReference Include="..\Wabbajack.Networking.Discord\Wabbajack.Networking.Discord.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Networking.Discord\Wabbajack.Networking.Discord.csproj" />
-        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj"/>
+        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj" />
     </ItemGroup>
 
 </Project>

Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
         <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
         <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />

Wabbajack.VFS/Wabbajack.VFS.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
         <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     </ItemGroup>