From 0dd87c07fdb2148fbd41024c9eace196d1eae502 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 5 Sep 2021 17:45:30 +0200 Subject: Increment version to 1.25-RC1 --- src/Build/CMakeLists.txt | 4 ++-- src/Build/Resources/MacOSX/Info.plist.legacy.xml | 2 +- src/Build/Resources/MacOSX/Info.plist.xml | 2 +- src/Common/Tcdefs.h | 6 +++--- src/ExpandVolume/ExpandVolume.rc | 4 ++-- src/Format/Format.rc | 4 ++-- src/Mount/Mount.rc | 4 ++-- src/Release/Setup Files/Product64.wxs | 4 ++-- src/Setup/MacOSX/veracrypt.pkgproj | 4 ++-- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 4 ++-- src/Setup/Portable.rc | 4 ++-- src/Setup/Setup.rc | 4 ++-- src/SetupDLL/Setup.rc | 4 ++-- src/Signing/sign.bat | 4 ++-- src/Signing/sign_test.bat | 4 ++-- src/Signing/sign_test_debug.bat | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index a7025c64..cba99cf8 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.25" ) -set( VERSION "1.25.0" ) +set( FULL_VERSION "1.25-RC1" ) +set( VERSION "1.25.1" ) set( RELEASE "1" ) # - Set PROJECT_NAME and CONFLICT_PACKAGE values diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml index 55f1ae32..3af93d72 100644 --- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml +++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.25.0 + 1.25.1 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 190f1efe..d5332fde 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.25.0 + 1.25.1 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 21cf68ce..1af6c0b1 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.25" +#define VERSION_STRING "1.25-RC1" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -67,9 +67,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0125 // Release date -#define TC_STR_RELEASE_DATE L"August 29, 2021" +#define TC_STR_RELEASE_DATE L"September 5, 2021" #define TC_RELEASE_DATE_YEAR 2021 -#define TC_RELEASE_DATE_MONTH 8 +#define TC_RELEASE_DATE_MONTH 9 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 674e54ae..72943470 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,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 6ac60116..72ab9b2e 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,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 88c944ee..32f3abd2 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index ff2751eb..125d739a 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 15114764..9e6b25ec 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.0 + 1.25.1 TYPE 0 @@ -1025,7 +1025,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.25 + VeraCrypt 1.25-RC1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index 183a851c..c3480254 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.0 + 1.25.1 TYPE 0 @@ -1062,7 +1062,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.25 + VeraCrypt Legacy 1.25-RC1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 2e2bbcb6..fe6f8a43 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,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index a69c510b..af2d6b14 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,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index cf0f8ed2..984db229 100644 --- a/src/SetupDLL/Setup.rc +++ b/src/SetupDLL/Setup.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,0,0 - PRODUCTVERSION 1,25,0,0 + FILEVERSION 1,25,1,0 + PRODUCTVERSION 1,25,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 550f3bda..696277fa 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,7 +1,7 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25 -set VC_VERSION_NBRE=1.25.0 +set VC_VERSION=1.25-RC1 +set VC_VERSION_NBRE=1.25.1 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 7345790b..d71b1996 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.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.25 -set VC_VERSION_NBRE=1.25.0 +set VC_VERSION=1.25-RC1 +set VC_VERSION_NBRE=1.25.1 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 08d0c34d..a31456b2 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.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.25 -set VC_VERSION_NBRE=1.25.0 +set VC_VERSION=1.25-RC1 +set VC_VERSION_NBRE=1.25.1 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3