From fa3d4c79c900253c0e0ff74f911bdd5c2e943480 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 2 Oct 2019 11:38:49 +0200 Subject: Increment version to 1.24-Beta6 --- src/Build/Resources/MacOSX/Info.plist.xml | 2 +- src/Common/Tcdefs.h | 6 +++--- src/Driver/Driver.rc | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 8 ++++---- src/Format/Format.rc | 8 ++++---- src/Mount/Mount.rc | 8 ++++---- src/Mount/Mount.vcxproj.user | 4 ++++ src/Release/Setup Files/veracrypt-x64.cat | Bin 10793 -> 10615 bytes src/Release/Setup Files/veracrypt-x64.sys | Bin 827816 -> 828256 bytes src/Release/Setup Files/veracrypt.Inf | 2 +- src/Release/Setup Files/veracrypt.cat | Bin 10740 -> 10768 bytes src/Release/Setup Files/veracrypt.sys | Bin 765992 -> 766640 bytes src/Setup/MacOSX/veracrypt.pkgproj | 4 ++-- 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 +- 18 files changed, 36 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index b5b5a85c..14b69603 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.24.5 + 1.24.6 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 6ee154ee..7ffdf0b2 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -61,15 +61,15 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #endif // Version displayed to user -#define VERSION_STRING "1.24-Beta5" +#define VERSION_STRING "1.24-Beta6" // Version number to compare against driver #define VERSION_NUM 0x0124 // Release date -#define TC_STR_RELEASE_DATE L"March 8, 2019" +#define TC_STR_RELEASE_DATE L"October 1, 2019" #define TC_RELEASE_DATE_YEAR 2019 -#define TC_RELEASE_DATE_MONTH 3 +#define TC_RELEASE_DATE_MONTH 10 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index a27a37b7..c96e096e 100644 --- a/src/Driver/Driver.rc +++ b/src/Driver/Driver.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 3f5e891c..983a104d 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -192,8 +192,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -210,11 +210,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.24-Beta5" + VALUE "FileVersion", "1.24-Beta6" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta5" + VALUE "ProductVersion", "1.24-Beta6" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index c9351007..c89b7385 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,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.24-Beta5" + VALUE "FileVersion", "1.24-Beta6" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta5" + // VALUE "ProductVersion", "1.24-Beta6" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 137cc62e..89fd42bd 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -548,8 +548,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -566,11 +566,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.24-Beta5" + VALUE "FileVersion", "1.24-Beta6" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta5" + VALUE "ProductVersion", "1.24-Beta6" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.vcxproj.user b/src/Mount/Mount.vcxproj.user index ace9a86a..75a63e94 100644 --- a/src/Mount/Mount.vcxproj.user +++ b/src/Mount/Mount.vcxproj.user @@ -1,3 +1,7 @@  + + /DisableDeviceUpdate + WindowsLocalDebugger + \ No newline at end of file diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat index 076d114b..0668d0b3 100644 Binary files a/src/Release/Setup Files/veracrypt-x64.cat and b/src/Release/Setup Files/veracrypt-x64.cat differ diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys index 532ca44a..92793af5 100644 Binary files a/src/Release/Setup Files/veracrypt-x64.sys and b/src/Release/Setup Files/veracrypt-x64.sys differ diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf index 94ced215..5ddf0833 100644 --- a/src/Release/Setup Files/veracrypt.Inf +++ b/src/Release/Setup Files/veracrypt.Inf @@ -10,7 +10,7 @@ signature = "$Windows NT$" Class = "Encryption" ;This is determined by the work this filter driver does ClassGuid = {a0a701c0-a511-42ff-aa6c-06dc0395576f} ;This value is determined by the Class Provider = %ProviderString% -DriverVer = 03/08/2019,1.24.5.0 +DriverVer = 10/01/2019,1.24.6.0 CatalogFile = veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat index 9756100e..7a5aba50 100644 Binary files a/src/Release/Setup Files/veracrypt.cat and b/src/Release/Setup Files/veracrypt.cat differ diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys index c2408b78..884fb781 100644 Binary files a/src/Release/Setup Files/veracrypt.sys and b/src/Release/Setup Files/veracrypt.sys differ diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 23299f50..acd9bf45 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -495,7 +495,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.24.5 + 1.24.6 UUID B14381D9-EC5F-43E4-B971-82AB3D132A64 @@ -1004,7 +1004,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.24-Beta5 + VeraCrypt 1.24-Beta6 SHARED_GLOBAL_DATA diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index abbdd6c0..3f248282 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,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.24-Beta5" + VALUE "FileVersion", "1.24-Beta6" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta5" + VALUE "ProductVersion", "1.24-Beta6" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 639ceda8..b39e92f8 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,5,0 - PRODUCTVERSION 1,24,5,0 + FILEVERSION 1,24,6,0 + PRODUCTVERSION 1,24,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.24-Beta5" + VALUE "FileVersion", "1.24-Beta6" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta5" + VALUE "ProductVersion", "1.24-Beta6" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index b6531ff6..8ce4a661 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-Beta5 +set VC_VERSION=1.24-Beta6 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index a0346dd3..32dca4a2 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-Beta5 +set VC_VERSION=1.24-Beta6 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 8c936261..1c0c26d5 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-Beta5 +set VC_VERSION=1.24-Beta6 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3