From 5f691297c09486d094668f2180fda198551dc318 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 30 Mar 2018 12:04:28 +0200 Subject: Increment version to 1.22 (1.22.9) --- src/Build/Resources/MacOSX/Info.plist.xml | 2 +- src/Common/Tcdefs.h | 4 ++-- src/Driver/Driver.rc | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 8 ++++---- src/Format/Format.rc | 8 ++++---- src/Mount/Mount.rc | 8 ++++---- 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 | 4 ++-- src/Signing/sign_test_debug.bat | 4 ++-- 12 files changed, 32 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 07bf6381..c6f3c4f0 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.22.8 + 1.22.9 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index eda777b3..bd90c81c 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -55,13 +55,13 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define TC_APP_NAME "VeraCrypt" // Version displayed to user -#define VERSION_STRING "1.22-BETA8" +#define VERSION_STRING "1.22" // Version number to compare against driver #define VERSION_NUM 0x0122 // Release date -#define TC_STR_RELEASE_DATE L"March 28, 2018" +#define TC_STR_RELEASE_DATE L"March 30, 2018" #define TC_RELEASE_DATE_YEAR 2018 #define TC_RELEASE_DATE_MONTH 03 diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index a1d7d13d..efbcf46c 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,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 5c3061e0..8c143964 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,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -210,11 +210,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.22-BETA8" + VALUE "FileVersion", "1.22" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.22-BETA8" + VALUE "ProductVersion", "1.22" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 8f022b4b..c7118b26 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,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.22-BETA8" + VALUE "FileVersion", "1.22" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.22-BETA8" + VALUE "ProductVersion", "1.22" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 87561a19..bd46d0be 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -536,8 +536,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -554,11 +554,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.22-BETA8" + VALUE "FileVersion", "1.22" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.22-BETA8" + VALUE "ProductVersion", "1.22" END END BLOCK "VarFileInfo" diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index e5d1ccdf..d0e12787 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -495,7 +495,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.22.8 + 1.22.9 UUID B14381D9-EC5F-43E4-B971-82AB3D132A64 @@ -1004,7 +1004,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.22-BETA8 + VeraCrypt 1.22 SHARED_GLOBAL_DATA diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index b6193d3d..8edd69bb 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,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.22-BETA8" + VALUE "FileVersion", "1.22" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.22-BETA8" + VALUE "ProductVersion", "1.22" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 209b605b..d9c0efbb 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,22,8,0 - PRODUCTVERSION 1,22,8,0 + FILEVERSION 1,22,9,0 + PRODUCTVERSION 1,22,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.22-BETA8" + VALUE "FileVersion", "1.22" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.22-BETA8" + VALUE "ProductVersion", "1.22" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 4b3d3561..963881c7 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.22-BETA8 +set VC_VERSION=1.22 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index d96aa8a2..a30ed9a2 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -58,9 +58,9 @@ rmdir /S /Q docs cd %SIGNINGPATH% rem sign using SHA-1 -signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.21.exe" +signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.22.exe" rem sign using SHA-256 -signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.21.exe" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.22.exe" pause \ No newline at end of file diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index b0583029..a7bf5b33 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -58,9 +58,9 @@ rmdir /S /Q docs cd %SIGNINGPATH% rem sign using SHA-1 -signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Debug\Setup Files\VeraCrypt Setup 1.21.exe" +signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Debug\Setup Files\VeraCrypt Setup 1.22.exe" rem sign using SHA-256 -signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Debug\Setup Files\VeraCrypt Setup 1.21.exe" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Debug\Setup Files\VeraCrypt Setup 1.22.exe" pause \ No newline at end of file -- cgit v1.2.3