Build update

Build script moved, so updated. Updated version numbers
TCNOco · Jul 6, 2020 · 04ed59f · 04ed59f
1 parent da85957
commit 04ed59f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -352,5 +352,5 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 *.zip
-NSIS/TcNo Account Switcher - Installer x64.exe
-NSIS/TcNo Account Switcher - Installer x32.exe
+other/NSIS/TcNo Account Switcher - Installer x64.exe
+other/NSIS/TcNo Account Switcher - Installer x32.exe
diff --git a/TcNo-Account-Switcher/TcNo-Acc-Switcher/MainWindow.xaml.cs b/TcNo-Account-Switcher/TcNo-Acc-Switcher/MainWindow.xaml.cs
@@ -32,7 +32,7 @@ public partial class MainWindow : Window
     {
         private Globals _globals = Globals.LoadExisting(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location));
         //readonly int steam_version = 3000;
-        readonly int steam_version = 3001;
+        readonly int steam_version = 3002;
         readonly int steam_trayversion = 1000;
         public MainWindow()
         {

diff --git a/TcNo-Account-Switcher/TcNo-Acc-Switcher_Steam/MainWindow.xaml.cs b/TcNo-Account-Switcher/TcNo-Acc-Switcher_Steam/MainWindow.xaml.cs
@@ -36,13 +36,12 @@ public partial class MainWindow
         MainWindowViewModel MainViewmodel = new MainWindowViewModel();
         private TrayUsers trayUsers = new TrayUsers();
 
-        //int version = 1;
         private readonly Color _darkGreen = Color.FromRgb(5, 51, 5);
         private readonly Color _defaultGray = Color.FromRgb(51, 51, 51);
 
 
         // Settings will load later. Just defined here.
-        private const int SteamVersion = 3001;
+        private const int SteamVersion = 3002;
         private UserSettings _persistentSettings = new UserSettings();
         private readonly SolidColorBrush _vacRedBrush = new SolidColorBrush(Color.FromRgb(255,41,58));
 

diff --git a/TcNo-Account-Switcher/TcNo-Acc-Switcher_Steam/Properties/AssemblyInfo.cs b/TcNo-Account-Switcher/TcNo-Acc-Switcher_Steam/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("0.0.0.1")]
-[assembly: AssemblyFileVersion("0.0.0.1")]
+[assembly: AssemblyVersion("3.0.0.2")]
+[assembly: AssemblyFileVersion("3.0.0.2")]
diff --git a/other/NSIS/TcNo Account Switcher - Installer x64.exe b/other/NSIS/TcNo Account Switcher - Installer x64.exe
diff --git a/other/NSIS/nsis-build-x64.nsi b/other/NSIS/nsis-build-x64.nsi
@@ -14,10 +14,10 @@
 !define LNK_NAME "TcNo Account Switcher.lnk"
 !define COMP_NAME "TechNobo (Wesley Pyburn)"
 !define WEB_SITE "https://tcno.co"
-!define VERSION "3.0.0.1"
+!define VERSION "3.0.0.2"
 !define COPYRIGHT "TechNobo (Wesley Pyburn) © 2020"
 !define DESCRIPTION "TcNo Account Switcher"
-!define LICENSE_TXT "..\LICENSE"
+!define LICENSE_TXT "..\..\LICENSE"
 !define MAIN_APP_EXE "TcNo Account Switcher.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define REG_ROOT "HKCU"
@@ -42,8 +42,8 @@ VIAddVersionKey "FileVersion"  "${VERSION}"
 !define INSTALLER_NAME "TcNo Account Switcher - Installer x64.exe"
 ;;;;!define INSTALLER_NAME "TcNo Account Switcher - Installer x32.exe"
 
-!define INSTALLER_FILES "..\TCNO-Acc-Switcher-CSharp-WPF\Build\Release\TcNo.Account.Switcher.x64\*"
-;;;;!define INSTALLER_FILES "..\TCNO-Acc-Switcher-CSharp-WPF\Build\Release\TcNo.Account.Switcher.x32\*"
+!define INSTALLER_FILES "..\..\TcNo-Account-Switcher\Build\Release\TcNo.Account.Switcher.x64\*"
+;;;;!define INSTALLER_FILES "..\..\TcNo-Account-Switcher\Build\Release\TcNo.Account.Switcher.x32\*"
 
 !define INSTALL_DIR "$PROGRAMFILES64\TcNo Account Switcher"
 ;;;;!define INSTALL_DIR "$PROGRAMFILES\TcNo Account Switcher"

diff --git a/other/NSIS/nsis-build-x86.nsi b/other/NSIS/nsis-build-x86.nsi
@@ -14,10 +14,10 @@
 !define LNK_NAME "TcNo Account Switcher.lnk"
 !define COMP_NAME "TechNobo (Wesley Pyburn)"
 !define WEB_SITE "https://tcno.co"
-!define VERSION "3.0.0.1"
+!define VERSION "3.0.0.2"
 !define COPYRIGHT "TechNobo (Wesley Pyburn) © 2020"
 !define DESCRIPTION "TcNo Account Switcher"
-!define LICENSE_TXT "..\LICENSE"
+!define LICENSE_TXT "..\..\LICENSE"
 !define MAIN_APP_EXE "TcNo Account Switcher.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define REG_ROOT "HKCU"
@@ -42,8 +42,8 @@ VIAddVersionKey "FileVersion"  "${VERSION}"
 ;;;;!define INSTALLER_NAME "TcNo Account Switcher - Installer x64.exe"
 !define INSTALLER_NAME "TcNo Account Switcher - Installer x32.exe"
 
-;;;;!define INSTALLER_FILES "..\TCNO-Acc-Switcher-CSharp-WPF\Build\Release\TcNo.Account.Switcher.x64\*"
-!define INSTALLER_FILES "..\TCNO-Acc-Switcher-CSharp-WPF\Build\Release\TcNo.Account.Switcher.x32\*"
+;;;;!define INSTALLER_FILES "..\..\TcNo-Account-Switcher\Build\Release\TcNo.Account.Switcher.x64\*"
+!define INSTALLER_FILES "..\..\TcNo-Account-Switcher\Build\Release\TcNo.Account.Switcher.x32\*"
 
 ;;;;!define INSTALL_DIR "$PROGRAMFILES64\TcNo Account Switcher"
 !define INSTALL_DIR "$PROGRAMFILES\TcNo Account Switcher"