From 8de3c5c35c6002b5dcc0048d9bb9bb7732f29ff3 Mon Sep 17 00:00:00 2001 From: Joseph Spearritt Date: Mon, 4 Dec 2023 20:01:44 +1100 Subject: [PATCH] Bump version to 2.2.0 with change to using update source behind cloudfront --- Config.cs | 1 + MainWindow.xaml.cs | 4 ++-- Properties/AssemblyInfo.cs | 4 ++-- Updater.cs | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.cs b/Config.cs index 5536956..9861365 100644 --- a/Config.cs +++ b/Config.cs @@ -285,6 +285,7 @@ public string CustomArguments public InjectConfig Injection { get; set; } = new InjectConfig(); public LoginServerConfig LoginServer { get; set; } = new LoginServerConfig(); + // Legacy, no longer used but left in for config compatibility private string updateUrl = "https://raw.githubusercontent.com/mcoot/tamodsupdate/release"; public string UpdateUrl { diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index df1f0a9..4885725 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -87,7 +87,7 @@ public LocalPackage SelectedPackage private Config LauncherConfig { get => DataModel.LauncherConfig; } - public static SemanticVersion LauncherVersion { get; } = SemanticVersion.Parse("2.1.3"); + public static SemanticVersion LauncherVersion { get; } = SemanticVersion.Parse("2.2.0"); System.Timers.Timer AutoInjectTimer { get; set; } @@ -125,7 +125,7 @@ public MainWindow() { AutoInjectTimer.Elapsed += OnAutoInjectTimerElapsed; string configPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/My Games/Tribes Ascend/TribesGame/config/"; - TAModsUpdater = new Updater(LauncherConfig.UpdateUrl, configPath, LauncherConfig.Debug); + TAModsUpdater = new Updater(configPath, LauncherConfig.Debug); // Add event handlers TAModsUpdater.OnUpdateComplete += OnUpdateFinished; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 8aa76ac..26472e7 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.3.0")] -[assembly: AssemblyFileVersion("2.1.3.0")] +[assembly: AssemblyVersion("2.2.0.0")] +[assembly: AssemblyFileVersion("2.2.0.0")] diff --git a/Updater.cs b/Updater.cs index f933ef7..90a84c2 100644 --- a/Updater.cs +++ b/Updater.cs @@ -27,7 +27,7 @@ public static RemoteObjectManager Instance { get public event EventHandler DownloadProgressChanged; - private static readonly string baseUrl = "https://tamods-update.s3-ap-southeast-2.amazonaws.com"; + private static readonly string baseUrl = "https://client.update.tamods.org"; private readonly WebClient webClient = new WebClient(); @@ -63,7 +63,7 @@ class Updater public string ConfigBasePath { get; set; } - public Updater(string remoteBaseUrl, string configBasePath, Config.DebugConfig debugConfig) + public Updater(string configBasePath, Config.DebugConfig debugConfig) { ConfigBasePath = configBasePath; updateSemaphore = new SemaphoreSlim(1, 1);