From bd89ce58b0008d3fa1020645a31f0d17b9090122 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 8 Apr 2021 14:38:21 +0200 Subject: [PATCH] Set version to 1.255.8 Signed-off-by: Simon Rozman --- CHANGES.md | 5 ++++- Makefile | 4 ++-- eduEd25519 | 2 +- eduEx | 2 +- eduJSON | 2 +- eduOAuth | 2 +- eduOpenVPN | 2 +- eduVPN.Resources/Resources.rc | 8 ++++---- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 28a50f11..c562d175 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ # Changelog -## [Unreleased](https://github.com/Amebis/eduVPN/compare/1.255.7...HEAD) +## [Unreleased](https://github.com/Amebis/eduVPN/compare/1.255.8...HEAD) + + +## [1.255.8](https://github.com/Amebis/eduVPN/compare/1.255.7...1.255.8) (2021-04-08) - Upgrade to .NET Framework 4.8 - OpenVPN updated to 2.5.1-20210408 diff --git a/Makefile b/Makefile index 9043ae16..5f770adf 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ # SPDX-License-Identifier: GPL-3.0+ # -VERSION=1.255.7 -PRODUCT_GUID_TEMPLATE={108E00C1-12D1-4AF9-AF__-64BD034D1708} +VERSION=1.255.8 +PRODUCT_GUID_TEMPLATE={6B2C23BA-DCFB-4F70-AF14-D5474DE1DA61} # Default testing configuration and platform TEST_CFG=Debug diff --git a/eduEd25519 b/eduEd25519 index 73bb6f07..c4b199b4 160000 --- a/eduEd25519 +++ b/eduEd25519 @@ -1 +1 @@ -Subproject commit 73bb6f075309236d7e52b7839ab28ec9ce052be6 +Subproject commit c4b199b45e6be0d379a98ce051c5ecfff02a79f2 diff --git a/eduEx b/eduEx index 30388978..54b49e41 160000 --- a/eduEx +++ b/eduEx @@ -1 +1 @@ -Subproject commit 3038897895c882d03418397523175b2287f25c86 +Subproject commit 54b49e414d7bed3890959c00e822cd5d57fda536 diff --git a/eduJSON b/eduJSON index be4d3454..58274a32 160000 --- a/eduJSON +++ b/eduJSON @@ -1 +1 @@ -Subproject commit be4d3454252132c329a972dc66025c46ad35587a +Subproject commit 58274a328d059e86299e142612a228d270941267 diff --git a/eduOAuth b/eduOAuth index 5a5e644d..28677c39 160000 --- a/eduOAuth +++ b/eduOAuth @@ -1 +1 @@ -Subproject commit 5a5e644db01bbc038c3d997b43d319a0f6ecc849 +Subproject commit 28677c390dede2486cbda462349f62296c6a9eee diff --git a/eduOpenVPN b/eduOpenVPN index a16e908d..bddd1dae 160000 --- a/eduOpenVPN +++ b/eduOpenVPN @@ -1 +1 @@ -Subproject commit a16e908d2e17f97ff4b374bbec2fc42f40a63b68 +Subproject commit bddd1dae3a33f0f448a89939e747724ea0ff7d5a diff --git a/eduVPN.Resources/Resources.rc b/eduVPN.Resources/Resources.rc index bac72d08..020a73ae 100644 --- a/eduVPN.Resources/Resources.rc +++ b/eduVPN.Resources/Resources.rc @@ -13,8 +13,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,255,7,0 - PRODUCTVERSION 1,255,7,0 + FILEVERSION 1,255,8,0 + PRODUCTVERSION 1,255,8,0 FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PATCHED | VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -31,11 +31,11 @@ BEGIN BEGIN VALUE "CompanyName", "SURF" VALUE "FileDescription", "eduVPN Native Resources" - VALUE "FileVersion", "1.255.7" + VALUE "FileVersion", "1.255.8" VALUE "LegalCopyright", "Copyright © 2017-2021 The Commons Conservancy eduVPN Programme" VALUE "OriginalFilename", "eduVPN.Resources.dll" VALUE "ProductName", "eduVPN" - VALUE "ProductVersion", "1.255.7" + VALUE "ProductVersion", "1.255.8" END END BLOCK "VarFileInfo"