From dfcebc3f48899987bce6b11455d42f5edc668504 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sat, 21 Mar 2020 10:59:37 -0700 Subject: [PATCH] allow us to get the build number for snapshots --- NovetusLauncher/NovetusCMD/Program.cs | 3 ++- NovetusLauncher/NovetusLauncher/MainForm.cs | 4 ++-- NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs | 3 ++- NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs | 2 +- NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index 2b6756d..1a386af 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -11,6 +11,7 @@ using Mono.Nat; using System.Diagnostics; using System.IO; using static NovetusCMD.CommandLineArguments; +using System.Reflection; namespace NovetusCMD { @@ -190,7 +191,7 @@ namespace NovetusCMD public static void Main(string[] args) { string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO - string version = lines[0]; + string version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()); GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3]; diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index 97aacaf..00b9421 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -361,8 +361,8 @@ namespace NovetusLauncher void MainFormLoad(object sender, EventArgs e) { string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO - string version = lines[0]; - GlobalVars.DefaultClient = lines[1]; + string version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()); + GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient2 = lines[4]; diff --git a/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs index 974c547..9d36926 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Reflection; using System.Windows.Forms; namespace NovetusLauncher @@ -32,7 +33,7 @@ namespace NovetusLauncher private void NovetusSDK_Load(object sender, EventArgs e) { string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO - string version = lines[0]; + string version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()); Text = "Novetus SDK " + version; label1.Text = version; GlobalVars.Version = version; diff --git a/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs b/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs index 2b061d5..d0be8cb 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs @@ -44,7 +44,7 @@ namespace NovetusLauncher private void SplashTester_Load(object sender, EventArgs e) { string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO - string version = lines[0]; + string version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()); GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.SelectedClient = GlobalVars.DefaultClient; diff --git a/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs index 69b1146..66f268e 100644 --- a/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs +++ b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs @@ -62,7 +62,7 @@ namespace NovetusLauncher void LoaderFormLoad(object sender, EventArgs e) { string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); - GlobalVars.Version = lines[0]; + GlobalVars.Version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()); GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3];