diff --git a/Installer/Installer.rc b/Installer/Installer.rc index ef0c7a461..ee27ea2e0 100644 --- a/Installer/Installer.rc +++ b/Installer/Installer.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "..\\TcNo-Acc-Switcher-Tray\\fav // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2024,08,25,00 - PRODUCTVERSION 2024,08,25,00 + FILEVERSION 2024,08,27,00 + PRODUCTVERSION 2024,08,27,00 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "TroubleChute (Wesley Pyburn)" VALUE "FileDescription", "Easy redistributable installer for the TcNo Account Switcher" - VALUE "FileVersion", "2024.08.25.00" + VALUE "FileVersion", "2024-08-27_00" VALUE "InternalName", "_First_R.exe" VALUE "LegalCopyright", "Copyright © TroubleChute (Wesley Pyburn) 2019-2024" VALUE "OriginalFilename", "_First_Run_Installer.exe" VALUE "ProductName", "TcNo Account Switcher - Redistributable Installer" - VALUE "ProductVersion", "2024.08.25.00" + VALUE "ProductVersion", "2024-08-27_00" END END BLOCK "VarFileInfo" diff --git a/TcNo-Acc-Switcher-Client/TcNo-Acc-Switcher-Client.csproj b/TcNo-Acc-Switcher-Client/TcNo-Acc-Switcher-Client.csproj index defe2859a..8f27caa2b 100644 --- a/TcNo-Acc-Switcher-Client/TcNo-Acc-Switcher-Client.csproj +++ b/TcNo-Acc-Switcher-Client/TcNo-Acc-Switcher-Client.csproj @@ -6,7 +6,7 @@ TcNo_Acc_Switcher_Client true favicon.ico - 2024.08.25.00 + 2024.08.27.00 TroubleChute (Wesley Pyburn) TcNo Account Switcher Copyright © TroubleChute (Wesley Pyburn) 2019-2024 @@ -14,7 +14,7 @@ TcNoAccSw-Icon-100x100.png https://github.com/TcNobo/TcNo-Acc-Switcher TcNo-Acc-Switcher - 2024.08.25.00 + 2024.08.27.00 x64 false README.md diff --git a/TcNo-Acc-Switcher-Globals/Globals.cs b/TcNo-Acc-Switcher-Globals/Globals.cs index 0f2bfe012..abbaa88db 100644 --- a/TcNo-Acc-Switcher-Globals/Globals.cs +++ b/TcNo-Acc-Switcher-Globals/Globals.cs @@ -27,7 +27,7 @@ public partial class Globals #pragma warning disable CA2211 // Non-constant fields should not be visible - This is necessary due to it being a launch parameter. public static bool VerboseMode; #pragma warning restore CA2211 // Non-constant fields should not be visible - public static readonly string Version = "2024-08-25_00"; + public static readonly string Version = "2024-08-27_00"; #region INITIALISATION diff --git a/TcNo-Acc-Switcher-Server/Platforms.json b/TcNo-Acc-Switcher-Server/Platforms.json index 145a73c30..44015edd3 100644 --- a/TcNo-Acc-Switcher-Server/Platforms.json +++ b/TcNo-Acc-Switcher-Server/Platforms.json @@ -217,6 +217,7 @@ ], "PathListToClear": [ "SAME_AS_LOGIN_FILES" ], "LoginFiles": { + "%LocalAppData%\\Riot Games\\Riot Client\\Data\\Cookies\\": "Cookies", "%LocalAppData%\\Riot Games\\Riot Client\\Data\\Sessions\\": "Sessions", "%LocalAppData%\\Riot Games\\Riot Client\\Data": "RiotClientPrivateSettings.yaml", "%LocalAppData%\\Riot Games\\Riot Client\\Config": "RiotClientSettings.yaml", diff --git a/TcNo-Acc-Switcher-Server/Startup.cs b/TcNo-Acc-Switcher-Server/Startup.cs index a85184c2b..7f4fcd419 100644 --- a/TcNo-Acc-Switcher-Server/Startup.cs +++ b/TcNo-Acc-Switcher-Server/Startup.cs @@ -153,7 +153,7 @@ private static void MoveIfFileExists(string f) [SupportedOSPlatform("windows")] public static void UpdateRegistryVersion(string version) { - version = version.Replace("-", ".").Replace("_", "."); + var dotVersion = version.Replace("-", ".").Replace("_", "."); string exeDirectory = AppDomain.CurrentDomain.BaseDirectory; string uninstallExePath = Path.Combine(exeDirectory, "Uninstall TcNo Account Switcher.exe"); @@ -169,8 +169,8 @@ public static void UpdateRegistryVersion(string version) if (registryKey == null) continue; registryKey.SetValue("DisplayVersion", version, RegistryValueKind.String); - registryKey.SetValue("ProductVersion", version, RegistryValueKind.String); - registryKey.SetValue("FileVersion", version, RegistryValueKind.String); + registryKey.SetValue("ProductVersion", dotVersion, RegistryValueKind.String); + registryKey.SetValue("FileVersion", dotVersion, RegistryValueKind.String); Globals.WriteToLog($"Updated registry key: {key}"); } catch (Exception ex) diff --git a/TcNo-Acc-Switcher-Server/TcNo-Acc-Switcher-Server.csproj b/TcNo-Acc-Switcher-Server/TcNo-Acc-Switcher-Server.csproj index 1a7d42607..759670f86 100644 --- a/TcNo-Acc-Switcher-Server/TcNo-Acc-Switcher-Server.csproj +++ b/TcNo-Acc-Switcher-Server/TcNo-Acc-Switcher-Server.csproj @@ -3,7 +3,7 @@ net8.0 TcNo_Acc_Switcher_Server wwwroot\favicon.ico - 2024.08.25.00 + 2024.08.27.00 TroubleChute (Wesley Pyburn) TcNo Account Switcher - Server Copyright © TroubleChute (Wesley Pyburn) 2022 diff --git a/_Updater_Wrapper/_Wrapper.rc b/_Updater_Wrapper/_Wrapper.rc index d25468476..682c2da09 100644 --- a/_Updater_Wrapper/_Wrapper.rc +++ b/_Updater_Wrapper/_Wrapper.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "..\\TcNo-Acc-Switcher-Tray\\fav // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2024,08,25,00 - PRODUCTVERSION 2024,08,25,00 + FILEVERSION 2024,08,27,00 + PRODUCTVERSION 2024,08,27,00 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "TroubleChute (Wesley Pyburn)" VALUE "FileDescription", "TcNo Account Switcher Wrapper" - VALUE "FileVersion", "2024.08.25.00" + VALUE "FileVersion", "2024-08-27_00" VALUE "InternalName", "_Wrap.exe" VALUE "LegalCopyright", "Copyright © TroubleChute (Wesley Pyburn) 2019-2024" VALUE "OriginalFilename", "_Wrapper.exe" VALUE "ProductName", "TcNo Account Switcher - Wrapper" - VALUE "ProductVersion", "2024.08.25.00" + VALUE "ProductVersion", "2024-08-27_00" END END BLOCK "VarFileInfo" diff --git a/other/NSIS/nsis-build-x64.nsi b/other/NSIS/nsis-build-x64.nsi index a1082c484..9571232b3 100644 --- a/other/NSIS/nsis-build-x64.nsi +++ b/other/NSIS/nsis-build-x64.nsi @@ -14,7 +14,8 @@ !define LNK_NAME "TcNo Account Switcher.lnk" !define COMP_NAME "TroubleChute (Wesley Pyburn)" !define WEB_SITE "https://tcno.co" -!define VERSION "2024.08.25.00" +!define VERSION "2024.08.27.00" +!define DISPLAY_VERSION "2024-08-27_00" !define COPYRIGHT "TroubleChute (Wesley Pyburn) (C) 2024" !define DESCRIPTION "TcNo Account Switcher" !define LICENSE_TXT "..\..\LICENSE" @@ -140,7 +141,7 @@ Section "Main files" InstSec ;Create uninstaller WriteUninstaller "$INSTDIR\${UNINSTALL_EXE}" WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "TcNo Account Switcher" - WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${VERSION}" + WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${DISPLAY_VERSION}" WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$INSTDIR\${UNINSTALL_EXE}" WriteRegStr HKLM "${UNINST_KEY}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${COMP_NAME}" diff --git a/updateversion.ps1 b/updateversion.ps1 index f935c6476..c2b39752c 100644 --- a/updateversion.ps1 +++ b/updateversion.ps1 @@ -12,6 +12,10 @@ $nsisFilePath = "other\NSIS\nsis-build-x64.nsi" $nsisFileContent = Get-Content $nsisFilePath $nsisReplacement = '!define VERSION "' + $nsisVersion + '"' $nsisFileContent = $nsisFileContent -replace '^!define VERSION\s+".*"$', $nsisReplacement + +$nsisReplacement = '!define DISPLAY_VERSION "' + $dateVersion + '"' +$nsisFileContent = $nsisFileContent -replace '^!define DISPLAY_VERSION\s+".*"$', $nsisReplacement + $nsisFileContent | Set-Content $nsisFilePath Write-Host "UPDATED NSIS" @@ -26,8 +30,8 @@ $rcFileContent = Get-Content $rcFilePath $rcProductVersionReplacement = ' PRODUCTVERSION ' + $rcVersion $rcFileVersionReplacement = ' FILEVERSION ' + $rcVersion -$rcValueProductVersionReplacement = ' VALUE "ProductVersion", "' + $nsisVersion + '"' -$rcValueFileVersionReplacement = ' VALUE "FileVersion", "' + $nsisVersion + '"' +$rcValueProductVersionReplacement = ' VALUE "ProductVersion", "' + $dateVersion + '"' +$rcValueFileVersionReplacement = ' VALUE "FileVersion", "' + $dateVersion + '"' $rcFileContent = $rcFileContent -replace '^\s*PRODUCTVERSION\s+\d+,\d+,\d+,\d+', $rcProductVersionReplacement $rcFileContent = $rcFileContent -replace '^\s*FILEVERSION\s+\d+,\d+,\d+,\d+', $rcFileVersionReplacement @@ -48,8 +52,8 @@ $rcFileContent = Get-Content $rcFilePath $rcProductVersionReplacement = ' PRODUCTVERSION ' + $rcVersion $rcFileVersionReplacement = ' FILEVERSION ' + $rcVersion -$rcValueProductVersionReplacement = ' VALUE "ProductVersion", "' + $nsisVersion + '"' -$rcValueFileVersionReplacement = ' VALUE "FileVersion", "' + $nsisVersion + '"' +$rcValueProductVersionReplacement = ' VALUE "ProductVersion", "' + $dateVersion + '"' +$rcValueFileVersionReplacement = ' VALUE "FileVersion", "' + $dateVersion + '"' $rcFileContent = $rcFileContent -replace '^\s*PRODUCTVERSION\s+\d+,\d+,\d+,\d+', $rcProductVersionReplacement $rcFileContent = $rcFileContent -replace '^\s*FILEVERSION\s+\d+,\d+,\d+,\d+', $rcFileVersionReplacement