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

2.5.3.18

Browse Source
This commit is contained in:
Timothy Baldridge 2022-06-01 18:12:13 -06:00
parent 9e4c272c1c
commit 48483d1d74
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,9 +1,11 @@
### Changelog ### Changelog
#### Version - 3.0.0.4 - 5/23/2022 #### Version - 2.5.3.18 - 6/1/2022
* Alpha (testing) release * Switch to a working version of Game Finder
* Complete rewrite of the app for .NET 6
* Most code has been rewritten to be cross platform #### Version - 2.5.3.17 - 6/1/2022
* Switch the launcher to 3.0 code
* Download new releases from the Nexus when possible
#### Version - 2.5.3.16 - 5/22/2022 #### Version - 2.5.3.16 - 5/22/2022
* Update to the latest Game Finder library * Update to the latest Game Finder library

BIN
Wabbajack.Launcher/Resources/Icons/wabbajack.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 139 KiB

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

@ -14,6 +14,8 @@ using Wabbajack.Compression.Zip;
using Wabbajack.Downloaders.Http; using Wabbajack.Downloaders.Http;
using Wabbajack.DTOs; using Wabbajack.DTOs;
using Wabbajack.DTOs.DownloadStates; using Wabbajack.DTOs.DownloadStates;
using Wabbajack.DTOs.Logins;
using Wabbajack.Networking.Http.Interfaces;
using Wabbajack.Networking.NexusApi; using Wabbajack.Networking.NexusApi;
using Wabbajack.Paths; using Wabbajack.Paths;
using Wabbajack.Paths.IO; using Wabbajack.Paths.IO;
@ -29,12 +31,14 @@ public class MainWindowViewModel : ViewModelBase
public Uri GITHUB_REPO = new("https://api.github.com/repos/wabbajack-tools/wabbajack/releases"); public Uri GITHUB_REPO = new("https://api.github.com/repos/wabbajack-tools/wabbajack/releases");
private readonly NexusApi _nexusApi; private readonly NexusApi _nexusApi;
private readonly HttpDownloader _downloader; private readonly HttpDownloader _downloader;
private readonly ITokenProvider<NexusApiState> _tokenProvider;
public MainWindowViewModel(NexusApi nexusApi, HttpDownloader downloader) public MainWindowViewModel(NexusApi nexusApi, HttpDownloader downloader, ITokenProvider<NexusApiState> tokenProvider)
{ {
_nexusApi = nexusApi; _nexusApi = nexusApi;
Status = "Checking for new versions"; Status = "Checking for new versions";
_downloader = downloader; _downloader = downloader;
_tokenProvider = tokenProvider;
var tsk = CheckForUpdates(); var tsk = CheckForUpdates();
} }
@ -47,10 +51,13 @@ public class MainWindowViewModel : ViewModelBase
try try
{ {
var nexusRelease = await GetNexusReleases(CancellationToken.None);
if (nexusRelease != default) if (_tokenProvider.HaveToken())
_version = nexusRelease; {
else _version = await GetNexusReleases(CancellationToken.None);
}
if (_version == default)
{ {
_version = await GetGithubRelease(CancellationToken.None); _version = await GetGithubRelease(CancellationToken.None);
} }

3
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -9,6 +9,9 @@
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />
</ItemGroup> </ItemGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Icons\wabbajack.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="GitInfo" Version="2.2.0"> <PackageReference Include="GitInfo" Version="2.2.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>