From c048e5dae52c4b2b29a3cf1ba14d74c25aa5b2d0 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 29 Aug 2021 15:33:11 +0200
Subject: Increment version to 1.25

---
 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/Driver/Driver.rc                             | 8 ++++----
 src/ExpandVolume/ExpandVolume.rc                 | 8 ++++----
 src/Format/Format.rc                             | 8 ++++----
 src/Mount/Mount.rc                               | 8 ++++----
 src/Release/Setup Files/Product64.wxs            | 4 ++--
 src/Setup/MacOSX/veracrypt.pkgproj               | 4 ++--
 src/Setup/MacOSX/veracrypt_Legacy.pkgproj        | 4 ++--
 src/Setup/Portable.rc                            | 8 ++++----
 src/Setup/Setup.rc                               | 8 ++++----
 src/SetupDLL/Setup.rc                            | 8 ++++----
 src/Signing/sign.bat                             | 4 ++--
 src/Signing/sign_test.bat                        | 4 ++--
 src/Signing/sign_test_debug.bat                  | 4 ++--
 17 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'src')

diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index 3a396870..5924c744 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-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
diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
index 41321c05..55f1ae32 100644
--- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
@@ -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>
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index 3d20696d..190f1efe 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -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>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index d054653f..21cf68ce 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-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
 
diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc
index 8dd2bac8..ba4c62c7 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,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"
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index 9d4f07b1..674e54ae 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,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"
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index 60e3dc2b..6ac60116 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,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"
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index 92521096..88c944ee 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -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"
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs
index 7bd7388b..ff2751eb 100644
--- a/src/Release/Setup Files/Product64.wxs	
+++ b/src/Release/Setup Files/Product64.wxs	
@@ -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 -->
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index 0911e7b2..15114764 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -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>
diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
index fa4388f4..183a851c 100755
--- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
+++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
@@ -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>
diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc
index 7a6bdaea..2e2bbcb6 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,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"
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index ca929419..a69c510b 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,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"
diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc
index f4736945..cf0f8ed2 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,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"
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index e7ed45e3..550f3bda 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.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%
 
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index fd1a3082..7345790b 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.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
diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat
index 235cafc2..08d0c34d 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.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
-- 
cgit v1.2.3