This commit is contained in:
Timothy Baldridge 2021-03-11 15:51:35 -07:00
parent 47ba907c4a
commit 84342cf604
7 changed files with 18 additions and 25 deletions

View File

@ -1,5 +1,11 @@
### Changelog ### Changelog
#### Version - 2.4.5.7 - 3/11/2021
* Several fixes for working off the new CDN
* Better detect failures in the launcher
* The app now cleans up older versions (leaving a total of 2 previous versions)
* The app now updates the launcher
#### Version - 2.4.2.6 - 2/26/2021 #### Version - 2.4.2.6 - 2/26/2021
* Cache Modlist images (based on the URL) * Cache Modlist images (based on the URL)
* Load Gallery images off the GUI thread improving UI performance * Load Gallery images off the GUI thread improving UI performance

View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.4.2.6</AssemblyVersion> <AssemblyVersion>2.4.2.7</AssemblyVersion>
<FileVersion>2.4.2.6</FileVersion> <FileVersion>2.4.2.7</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

View File

@ -97,7 +97,7 @@ namespace Wabbajack.Launcher
byte[] data; byte[] data;
try try
{ {
data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrlFast); data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrl);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -209,21 +209,7 @@ namespace Wabbajack.Launcher
{ {
[JsonProperty("browser_download_url")] [JsonProperty("browser_download_url")]
public Uri BrowserDownloadUrl { get; set; } public Uri BrowserDownloadUrl { get; set; }
[JsonIgnore]
public Uri BrowserDownloadUrlFast {
get
{
if (BrowserDownloadUrl.ToString()
.StartsWith("https://github.com/wabbajack-tools/wabbajack/releases/"))
return new Uri(BrowserDownloadUrl.ToString()
.Replace("https://github.com/wabbajack-tools/wabbajack/releases/",
"https://releases.wabbajack.org/"));
return BrowserDownloadUrl;
}
}
[JsonProperty("name")] [JsonProperty("name")]
public string Name { get; set; } public string Name { get; set; }
} }

View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.4.2.6</AssemblyVersion> <AssemblyVersion>2.4.2.7</AssemblyVersion>
<FileVersion>2.4.2.6</FileVersion> <FileVersion>2.4.2.7</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

View File

@ -63,7 +63,7 @@ namespace Wabbajack.Lib
if (release != default && launcherVersion != null && release.version > Version.Parse(launcherVersion.FileVersion!)) if (release != default && launcherVersion != null && release.version > Version.Parse(launcherVersion.FileVersion!))
{ {
Utils.Log($"Updating Launcher from {launcherVersion} to {release.version}"); Utils.Log($"Updating Launcher from {launcherVersion.FileVersion} to {release.version}");
var tempPath = launcherFolder.Combine("Wabbajack.exe.temp"); var tempPath = launcherFolder.Combine("Wabbajack.exe.temp");
var client = new Client(); var client = new Client();
client.UseChromeUserAgent(); client.UseChromeUserAgent();
@ -81,6 +81,7 @@ namespace Wabbajack.Lib
await tempPath.MoveToAsync(exePath); await tempPath.MoveToAsync(exePath);
Utils.Log("Finished updating wabbajack"); Utils.Log("Finished updating wabbajack");
await Metrics.Send("updated_launcher", $"{launcherVersion.FileVersion} -> {release.version}");
} }
} }

View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.4.2.5</AssemblyVersion> <AssemblyVersion>2.4.2.7</AssemblyVersion>
<FileVersion>2.4.2.5</FileVersion> <FileVersion>2.4.2.7</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.4.2.6</AssemblyVersion> <AssemblyVersion>2.4.2.7</AssemblyVersion>
<FileVersion>2.4.2.6</FileVersion> <FileVersion>2.4.2.7</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>