Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Increment version to 1.25

Browse Source
This commit is contained in:
Mounir IDRASSI
2021-08-29 15:33:11 +02:00
parent fb1a4893b8
commit c048e5dae5
56 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Build/CMakeLists.txt
View File

@@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI )
endif()
# - Set version of the package
set( FULL_VERSION "1.24-Update9" )
set( VERSION "1.24.25" )
set( FULL_VERSION "1.25" )
set( VERSION "1.25.0" )
set( RELEASE "1" )
# - Set PROJECT_NAME and CONFLICT_PACKAGE values

2
src/Build/Resources/MacOSX/Info.plist.legacy.xml
View File

@@ -74,7 +74,7 @@
<string>TRUE</string>
<key>CFBundleVersion</key>
<string>1.24.25</string>
<string>1.25.0</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>

2
src/Build/Resources/MacOSX/Info.plist.xml
View File

@@ -74,7 +74,7 @@
<string>TRUE</string>
<key>CFBundleVersion</key>
<string>1.24.25</string>
<string>1.25.0</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>

6
src/Common/Tcdefs.h
View File

@@ -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-Update9-Beta-21-08-15"
#define VERSION_STRING "1.25"
#ifdef VC_EFI_CUSTOM_MODE
#define VERSION_STRING_SUFFIX "-CustomEFI"
@@ -64,10 +64,10 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#endif
// Version number to compare against driver
#define VERSION_NUM 0x0124
#define VERSION_NUM 0x0125
// Release date
#define TC_STR_RELEASE_DATE L"August 15, 2021"
#define TC_STR_RELEASE_DATE L"August 29, 2021"
#define TC_RELEASE_DATE_YEAR 2021
#define TC_RELEASE_DATE_MONTH 8

8
src/Driver/Driver.rc
View File

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Driver"
VALUE "FileVersion", "1.24"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "veracrypt.sys"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

8
src/ExpandVolume/ExpandVolume.rc
View File

@@ -193,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -211,11 +211,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Expander"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptExpander.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

8
src/Format/Format.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Format"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Format.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

8
src/Mount/Mount.rc
View File

@@ -559,8 +559,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -577,11 +577,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

4
src/Release/Setup Files/Product64.wxs
View File

@@ -4,7 +4,7 @@
<!-- FullProductVersion's first 3 parts MUST BE incremented at each release in order
for upgrades to work ; Windows Installer ignores the 4th part -->
<?define var.FullProductVersion = 1.24.25?>
<?define var.FullProductVersion = 1.25.0?>
<?define var.ProductName = VeraCrypt $(var.FullProductVersion)?>
<!-- Unique GUID identifying this family of product (32-bit and 64-bit have the same) -->
@@ -12,7 +12,7 @@
<!-- Unique GUID identifying this product release (32-bit and 64-bit have different ones) -->
<!-- MUST BE regenerated for each new release -->
<?define var.ProductGuid = {4B0DDCE8-2DAC-4350-8F5E-632BD9BA9209}?>
<?define var.ProductGuid = {6336469F-38A6-4E81-B50C-5A417EBB21C3}?>
<!-- Unique GUID identifying a particular Windows Installer package -->
<!-- When compiling a product, it should not be set in order to allow it to be generated for each build -->

4
src/Setup/MacOSX/veracrypt.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.24.25</string>
<string>1.25.0</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1025,7 +1025,7 @@ https://osxfuse.github.io/
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt 1.24-Update9-Beta-21-08-15</string>
<string>VeraCrypt 1.25</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

4
src/Setup/MacOSX/veracrypt_Legacy.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.24.25</string>
<string>1.25.0</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1062,7 +1062,7 @@ https://osxfuse.github.io/
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt Legacy 1.24-Update9-Beta-21-08-15</string>
<string>VeraCrypt Legacy 1.25</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

8
src/Setup/Portable.rc
View File

@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,11 +44,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Portable"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Portable.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

8
src/Setup/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Setup"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Setup.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

8
src/SetupDLL/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,25,3
PRODUCTVERSION 1,24,25,3
FILEVERSION 1,25,0,0
PRODUCTVERSION 1,25,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCryptSetup"
VALUE "FileVersion", "1.24-Update9"
VALUE "FileVersion", "1.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptSetup.dll"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24-Update9"
VALUE "ProductVersion", "1.25"
END
END
BLOCK "VarFileInfo"

4
src/Signing/sign.bat
View File

@@ -1,7 +1,7 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.24-Update9-Beta-21-08-15
set VC_VERSION_NBRE=1.24.25
set VC_VERSION=1.25
set VC_VERSION_NBRE=1.25.0
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%

4
src/Signing/sign_test.bat
View File

@@ -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-Update9-Beta-21-08-15
set VC_VERSION_NBRE=1.24.25
set VC_VERSION=1.25
set VC_VERSION_NBRE=1.25.0
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt

4
src/Signing/sign_test_debug.bat
View File

@@ -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-Update9-Beta-21-08-15
set VC_VERSION_NBRE=1.24.25
set VC_VERSION=1.25
set VC_VERSION_NBRE=1.25.0
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt