From fcadba506fc22426608e93bae200333fcae58efb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 14 Nov 2018 10:32:52 -0800 Subject: [PATCH 1/2] Mint 2.10.8 --- Release/CMakeLists.txt | 2 +- Release/include/cpprest/version.h | 2 +- .../tests/functional/misc/version/version.cpp | 30 ------------------- changelog.md | 15 ++++++++++ 4 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 Release/tests/functional/misc/version/version.cpp diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt index 26a5224824..e9b8a05471 100644 --- a/Release/CMakeLists.txt +++ b/Release/CMakeLists.txt @@ -11,7 +11,7 @@ endif() set(CPPREST_VERSION_MAJOR 2) set(CPPREST_VERSION_MINOR 10) -set(CPPREST_VERSION_REVISION 7) +set(CPPREST_VERSION_REVISION 8) enable_testing() diff --git a/Release/include/cpprest/version.h b/Release/include/cpprest/version.h index ef38ad4fe9..4abd1d45fe 100644 --- a/Release/include/cpprest/version.h +++ b/Release/include/cpprest/version.h @@ -5,6 +5,6 @@ */ #define CPPREST_VERSION_MINOR 10 #define CPPREST_VERSION_MAJOR 2 -#define CPPREST_VERSION_REVISION 7 +#define CPPREST_VERSION_REVISION 8 #define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION) diff --git a/Release/tests/functional/misc/version/version.cpp b/Release/tests/functional/misc/version/version.cpp deleted file mode 100644 index dd7cc98bb3..0000000000 --- a/Release/tests/functional/misc/version/version.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/*** -* Copyright (C) Microsoft. All rights reserved. -* Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. -* -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* Basic tests for versioning -* -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ -#include "cpprest/version.h" -#include "unittestpp.h" - -namespace tests { namespace functional { namespace misc { namespace versioning { - -SUITE(version_test1) -{ - -TEST(VersionTest1) -{ - // If these tests fail, this means that version.props and version.h are out of sync - // When the version number if changed, both files must change - VERIFY_ARE_EQUAL(_VER_MINOR, CPPREST_VERSION_MINOR); - VERIFY_ARE_EQUAL(_VER_MAJOR, CPPREST_VERSION_MAJOR); - VERIFY_ARE_EQUAL(_VER_REVISION, CPPREST_VERSION_REVISION); -} - -} - -}}}} diff --git a/changelog.md b/changelog.md index 188c0cd822..601d718ca1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,18 @@ +cpprestsdk (2.10.8) +---------------------- +* PR#938 Allow ppltasks.h and pplxtasks.h to co-exist +* PR#951 Fix incorrect const in reinterpret_cast +* PR#955 Fix UWP missing header +* PR#956 Adds support for OpenSSL 1.1.1 +* PR#959 Fix Android build issue by remove the crossplat name space before android parameters +* PR#960 Update vcpkg to latest master to fix VS2015 build. +* PR#966 Fix string size for error message generated by windows_category +* PR#958 Add uri_builder::append_path_raw(...) to allow adding elements to path intentionally beginning with '/' ("//" will results in the final path value) +* PR#952 cmake: add code to detect system brotli library +* PR#963 Fix Brotli compress_helper early termination issue +* PR#961 Fixes iOS builds and makes it more future proof +-- cpprestsdk team WED, 14 Nov 2018 10:24:00 -0800 + cpprestsdk (2.10.7) ---------------------- * cpprestsdk now has Azure Pipelines continuous integration. From ddfa06d49c07112b229316ae294fb99aaaf52aaf Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 14 Nov 2018 10:48:54 -0800 Subject: [PATCH 2/2] Lesssssssssss ssssssssssssss --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 601d718ca1..6a81a1f011 100644 --- a/changelog.md +++ b/changelog.md @@ -7,7 +7,7 @@ cpprestsdk (2.10.8) * PR#959 Fix Android build issue by remove the crossplat name space before android parameters * PR#960 Update vcpkg to latest master to fix VS2015 build. * PR#966 Fix string size for error message generated by windows_category -* PR#958 Add uri_builder::append_path_raw(...) to allow adding elements to path intentionally beginning with '/' ("//" will results in the final path value) +* PR#958 Add uri_builder::append_path_raw(...) to allow adding elements to path intentionally beginning with '/' ("//" will result in the final path value) * PR#952 cmake: add code to detect system brotli library * PR#963 Fix Brotli compress_helper early termination issue * PR#961 Fixes iOS builds and makes it more future proof