From 0d5981c3fd9b4f3e97e358fa9537fbec3fda504d Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 3 Jul 2024 16:27:01 +0200 Subject: [PATCH 1/2] Revert "start 3.6.1-dev0 cycle" This reverts commit 2669edf6234bfbc6706b01eac08ccccb6422dacd. --- CMakeLists.txt | 2 +- .../Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c | 2 +- winpr/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d590bca9d..d4643d541 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ if ($ENV{BUILD_NUMBER}) endif() set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)") -set(RAW_VERSION_STRING "3.6.1-dev0") +set(RAW_VERSION_STRING "3.6.0") if(EXISTS "${PROJECT_SOURCE_DIR}/.source_tag") file(READ ${PROJECT_SOURCE_DIR}/.source_tag RAW_VERSION_STRING) elseif(USE_VERSION_FROM_GIT_TAG) diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c index 3f671f031..c80a9adbd 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c @@ -56,7 +56,7 @@ #define TAG CLIENT_TAG("android") /* Defines the JNI version supported by this library. */ -#define FREERDP_JNI_VERSION "3.6.1-dev0" +#define FREERDP_JNI_VERSION "3.6.0" static void android_OnChannelConnectedEventHandler(void* context, const ChannelConnectedEventArgs* e) { diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 1ff3bbdc2..c931d1d7e 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -137,7 +137,7 @@ endif() # Soname versioning set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)") -set(RAW_VERSION_STRING "3.6.1-dev0") +set(RAW_VERSION_STRING "3.6.0") if(EXISTS "${PROJECT_SOURCE_DIR}/.source_tag") file(READ ${PROJECT_SOURCE_DIR}/.source_tag RAW_VERSION_STRING) elseif(USE_VERSION_FROM_GIT_TAG) From a2edac27ca469616e0552e1b447d51a4e87a5fcd Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 4 Jun 2024 10:43:27 +0200 Subject: [PATCH 2/2] start 3.6.1-dev0 cycle --- CMakeLists.txt | 2 +- .../Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c | 2 +- winpr/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4643d541..d590bca9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ if ($ENV{BUILD_NUMBER}) endif() set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)") -set(RAW_VERSION_STRING "3.6.0") +set(RAW_VERSION_STRING "3.6.1-dev0") if(EXISTS "${PROJECT_SOURCE_DIR}/.source_tag") file(READ ${PROJECT_SOURCE_DIR}/.source_tag RAW_VERSION_STRING) elseif(USE_VERSION_FROM_GIT_TAG) diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c index c80a9adbd..3f671f031 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c @@ -56,7 +56,7 @@ #define TAG CLIENT_TAG("android") /* Defines the JNI version supported by this library. */ -#define FREERDP_JNI_VERSION "3.6.0" +#define FREERDP_JNI_VERSION "3.6.1-dev0" static void android_OnChannelConnectedEventHandler(void* context, const ChannelConnectedEventArgs* e) { diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index c931d1d7e..1ff3bbdc2 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -137,7 +137,7 @@ endif() # Soname versioning set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)") -set(RAW_VERSION_STRING "3.6.0") +set(RAW_VERSION_STRING "3.6.1-dev0") if(EXISTS "${PROJECT_SOURCE_DIR}/.source_tag") file(READ ${PROJECT_SOURCE_DIR}/.source_tag RAW_VERSION_STRING) elseif(USE_VERSION_FROM_GIT_TAG)