diff --git a/Default.Cpp.props b/Default.Cpp.props index a2460594..d4c0b3e3 100644 --- a/Default.Cpp.props +++ b/Default.Cpp.props @@ -19,7 +19,11 @@ Level4 true + VERSION=3.3.9;VERSION_ARRAY=$([System.String]::Copy('3.3.9').Replace('.',','));%(PreprocessorDefinitions) + + VERSION=3.3.9;VERSION_ARRAY=$([System.String]::Copy('3.3.9').Replace('.',','));%(PreprocessorDefinitions) + Windows diff --git a/eduVPN.Resources/Resources.rc b/eduVPN.Resources/Resources.rc index d8d2c5d7..c95ec54c 100644 --- a/eduVPN.Resources/Resources.rc +++ b/eduVPN.Resources/Resources.rc @@ -7,14 +7,17 @@ #include #undef APSTUDIO_READONLY_SYMBOLS +#define STRINGIZE(x) #x +#define EXPAND(x) STRINGIZE(x) + ///////////////////////////////////////////////////////////////////////////// // English (United States) resources LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,3,9,0 - PRODUCTVERSION 3,3,9,0 + FILEVERSION VERSION_ARRAY + PRODUCTVERSION VERSION_ARRAY FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PATCHED | VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -31,11 +34,11 @@ BEGIN BEGIN VALUE "CompanyName", "SURF" VALUE "FileDescription", "eduVPN Native Resources" - VALUE "FileVersion", "3.3.9" + VALUE "FileVersion", EXPAND(VERSION) VALUE "LegalCopyright", "Copyright © 2017-2023 The Commons Conservancy" VALUE "OriginalFilename", "eduVPN.Resources.dll" VALUE "ProductName", "eduVPN" - VALUE "ProductVersion", "3.3.9" + VALUE "ProductVersion", EXPAND(VERSION) END END BLOCK "VarFileInfo" diff --git a/eduWGSvcHost/Resources.rc b/eduWGSvcHost/Resources.rc index 4583a14e..f60840fc 100644 --- a/eduWGSvcHost/Resources.rc +++ b/eduWGSvcHost/Resources.rc @@ -9,14 +9,17 @@ #include +#define STRINGIZE(x) #x +#define EXPAND(x) STRINGIZE(x) + ///////////////////////////////////////////////////////////////////////////// // English (United States) resources LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,3,9,0 - PRODUCTVERSION 3,3,9,0 + FILEVERSION VERSION_ARRAY + PRODUCTVERSION VERSION_ARRAY FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PATCHED | VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -33,11 +36,11 @@ BEGIN BEGIN VALUE "CompanyName", "SURF" VALUE "FileDescription", "WireGuard Service Host for eduVPN Client" - VALUE "FileVersion", "3.3.9" + VALUE "FileVersion", EXPAND(VERSION) VALUE "LegalCopyright", "Copyright © 2022-2023 The Commons Conservancy" VALUE "OriginalFilename", "eduWGSvcHost.exe" VALUE "ProductName", "eduVPN" - VALUE "ProductVersion", "3.3.9" + VALUE "ProductVersion", EXPAND(VERSION) END END BLOCK "VarFileInfo"