Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix launcher failures

Browse Source
This commit is contained in:
Timothy Baldridge 2022-06-23 17:28:57 -06:00
parent f446a967a0
commit bbe75e5061
14 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Wabbajack.App.Blazor/Wabbajack.App.Blazor.csproj
View File

@ -16,21 +16,21 @@
<ItemGroup>
<PackageReference Include="Blazored.Modal" Version="6.0.1" />
<PackageReference Include="Blazored.Toast" Version="3.2.2" />
<PackageReference Include="DynamicData" Version="7.8.1" />
<PackageReference Include="DynamicData" Version="7.9.1" />
<PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
<PackageReference Include="GitInfo" Version="2.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="6.0.200-preview.12.2441" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.5" />
<PackageReference Include="NLog" Version="5.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="6.0.400" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.6" />
<PackageReference Include="NLog" Version="5.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.1" />
<PackageReference Include="PInvoke.User32" Version="0.7.104" />
<PackageReference Include="ReactiveUI" Version="18.0.10" />
<PackageReference Include="ReactiveUI.Fody" Version="18.0.10" />
<PackageReference Include="ReactiveUI.WPF" Version="18.0.10" />
<PackageReference Include="ReactiveUI" Version="18.1.8" />
<PackageReference Include="ReactiveUI.Fody" Version="18.1.8" />
<PackageReference Include="ReactiveUI.WPF" Version="18.1.8" />
<PackageReference Include="Silk.NET.DXGI" Version="2.15.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>

12
Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj
View File

@ -60,12 +60,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamicData" Version="7.8.1" />
<PackageReference Include="DynamicData" Version="7.9.1" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.3.0">
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
<PackageReference Include="Fody" Version="6.6.2">
<PackageReference Include="Fody" Version="6.6.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -79,11 +79,11 @@
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1248-prerelease" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.1" />
<PackageReference Include="PInvoke.User32" Version="0.7.104" />
<PackageReference Include="ReactiveUI" Version="18.0.10" />
<PackageReference Include="ReactiveUI.Fody" Version="18.0.10" />
<PackageReference Include="ReactiveUI.WPF" Version="18.0.10" />
<PackageReference Include="ReactiveUI" Version="18.1.8" />
<PackageReference Include="ReactiveUI.Fody" Version="18.1.8" />
<PackageReference Include="ReactiveUI.WPF" Version="18.1.8" />
<PackageReference Include="Silk.NET.DXGI" Version="2.15.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />

6
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -18,9 +18,9 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="NLog" Version="5.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
<PackageReference Include="NLog" Version="5.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21561.1" />
</ItemGroup>

2
Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj
View File

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="LibAES-CTR" Version="0.9.6" />
<PackageReference Include="LibAES-CTR" Version="1.0.0" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>

2
Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
</ItemGroup>

2
Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
</ItemGroup>

2
Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj
View File

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
<PackageReference Include="MegaApiClient" Version="1.10.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
</ItemGroup>

2
Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj
View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Shipwreck.Phash" Version="0.5.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

17
Wabbajack.Launcher/ViewModels/MainWindowViewModel.cs
View File

@ -46,6 +46,8 @@ public class MainWindowViewModel : ViewModelBase
private async Task CheckForUpdates()
{
await VerifyCurrentLocation();
_client.Headers.Add("user-agent", "Wabbajack Launcher");
Status = "Selecting Release";
@ -168,6 +170,21 @@ public class MainWindowViewModel : ViewModelBase
}
}
private async Task VerifyCurrentLocation()
{
var entryPoint = KnownFolders.EntryPoint;
if (entryPoint.FileName == "Desktop".ToRelativePath()
|| entryPoint.Depth <= 1
|| entryPoint.FileName == "Downloads".ToRelativePath())
{
var msg = MessageBox.Avalonia.MessageBoxManager
.GetMessageBoxStandardWindow("Bad Download Path",
"Cannot start in the root, Downloads or Desktop folders.");
var result = await msg.Show();
Environment.Exit(1);
}
}
private async Task FinishAndExit()
{
try

11
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -17,12 +17,13 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Avalonia" Version="0.10.14" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.14" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.14" />
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
<PackageReference Include="MessageBox.Avalonia" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="ReactiveUI.Fody" Version="18.0.10" />
<PackageReference Include="ReactiveUI.Fody" Version="18.1.8" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
</ItemGroup>
<ItemGroup>

2
Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj
View File

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentFTP" Version="37.0.2" />
<PackageReference Include="FluentFTP" Version="37.0.3" />
<PackageReference Include="Nettle" Version="1.3.0" />
</ItemGroup>

6
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -11,11 +11,11 @@
<PackageReference Include="cesi.DTOs" Version="1.0.0" />
<PackageReference Include="Chronic.Core" Version="0.4.0" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.6.1" />
<PackageReference Include="FluentFTP" Version="37.0.2" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.7.2" />
<PackageReference Include="FluentFTP" Version="37.0.3" />
<PackageReference Include="GitInfo" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="Nettle" Version="1.3.0" />

2
Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj
View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
<PackageReference Include="Xunit.DependencyInjection" Version="8.5.0" />
<PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.1" />
</ItemGroup>

2
Wabbajack.VFS/Wabbajack.VFS.csproj
View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
</ItemGroup>
<ItemGroup>