From 6b90e026247de0ef459d999dea40c75e7c1f9569 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 24 Oct 2019 00:08:35 +0200 Subject: Increment version to 1.24-Hotfix1 --- src/Build/CMakeLists.txt | 4 ++-- src/Common/Tcdefs.h | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 8 ++++---- src/Format/Format.rc | 8 ++++---- src/Mount/Mount.rc | 8 ++++---- src/Setup/MacOSX/veracrypt.pkgproj | 2 +- src/Setup/Portable.rc | 8 ++++---- src/Setup/Setup.rc | 8 ++++---- src/Signing/sign.bat | 2 +- src/Signing/sign_test.bat | 2 +- src/Signing/sign_test_debug.bat | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index d8011ef4..c5f84285 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI ) endif() # - Set version of the package -set( FULL_VERSION "1.24" ) -set( VERSION "1.24.6" ) +set( FULL_VERSION "1.24-Hotfix1" ) +set( VERSION "1.24.7" ) set( RELEASE "1" ) # - Set PROJECT_NAME and CONFLICT_PACKAGE values diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 5147e185..38d3f7fe 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -55,7 +55,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define TC_APP_NAME "VeraCrypt" // Version displayed to user -#define VERSION_STRING "1.24-Hotfix1-Preview" +#define VERSION_STRING "1.24-Hotfix1" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -67,7 +67,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0124 // Release date -#define TC_STR_RELEASE_DATE L"October 20, 2019" +#define TC_STR_RELEASE_DATE L"October 23, 2019" #define TC_RELEASE_DATE_YEAR 2019 #define TC_RELEASE_DATE_MONTH 10 diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 833411a7..ea310b3f 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -193,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,7,0 - PRODUCTVERSION 1,24,7,0 + FILEVERSION 1,24,7,1 + PRODUCTVERSION 1,24,7,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -211,11 +211,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.24-Hotfix1-Preview" + VALUE "FileVersion", "1.24-Hotfix1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1-Preview" + VALUE "ProductVersion", "1.24-Hotfix1" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 86a8dcfd..43cd208f 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,7,0 - PRODUCTVERSION 1,24,7,0 + FILEVERSION 1,24,7,1 + PRODUCTVERSION 1,24,7,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.24-Hotfix1-Preview" + VALUE "FileVersion", "1.24-Hotfix1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1-Preview" + VALUE "ProductVersion", "1.24-Hotfix1" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index ba58d6f0..4fb1477c 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -548,8 +548,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,7,0 - PRODUCTVERSION 1,24,7,0 + FILEVERSION 1,24,7,1 + PRODUCTVERSION 1,24,7,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -566,11 +566,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.24-Hotfix1-Preview" + VALUE "FileVersion", "1.24-Hotfix1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1-Preview" + VALUE "ProductVersion", "1.24-Hotfix1" END END BLOCK "VarFileInfo" diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index e7f8d143..3de38f56 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -1004,7 +1004,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.24-Hotfix1-Preview + VeraCrypt 1.24-Hotfix1 SHARED_GLOBAL_DATA diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index f12ead10..574b660a 100644 --- a/src/Setup/Portable.rc +++ b/src/Setup/Portable.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,67,0 - PRODUCTVERSION 1,24,7,0 + FILEVERSION 1,24,7,1 + PRODUCTVERSION 1,24,7,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.24-Hotfix1-Preview" + VALUE "FileVersion", "1.24-Hotfix1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1-Preview" + VALUE "ProductVersion", "1.24-Hotfix1" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 28a03db3..066710ea 100644 --- a/src/Setup/Setup.rc +++ b/src/Setup/Setup.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,7,0 - PRODUCTVERSION 1,24,7,0 + FILEVERSION 1,24,7,1 + PRODUCTVERSION 1,24,7,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.24-Hotfix1-Preview" + VALUE "FileVersion", "1.24-Hotfix1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1-Preview" + VALUE "ProductVersion", "1.24-Hotfix1" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 7b0c211e..59772f47 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,6 +1,6 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Hotfix1-Preview +set VC_VERSION=1.24-Hotfix1 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 8c6d8a32..a2b0078a 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -1,5 +1,5 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Hotfix1-Preview +set VC_VERSION=1.24-Hotfix1 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 7a69e4b3..55814341 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -1,5 +1,5 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Hotfix1-Preview +set VC_VERSION=1.24-Hotfix1 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3