[oatpp] update to 1.2.5 (#17601)

* [oatpp] update to 1.2.5

* add version files

* update oatcpp libs to 1.2.5

* add version files

* use version instead of version string

* add version files

* update hashes

* add version files

* fix windows build

* add version files

* fix windows build

* add version files

37 files changed, 159 insertions, 103 deletions

diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake
index 432798d0f..83c1889bd 100644
--- a/ports/oatpp-consul/portfile.cmake
+++ b/ports/oatpp-consul/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-consul
-    REF c54ad810f245681dc25ba5e0ec48f19e7c85e1bd # 1.2.0
-    SHA512 5cf886b52af915bda0728ae9721adb155b5147c5b428ff02f5cbe932038d43e75fe5a221b16e3103ecffaed5fcdf39bf0e13157f79d8d4f2d7c74532b70566a2
+    REF ${OATPP_VERSION}
+    SHA512 6d73b869e5fea966451d15cbdc389f7c6c367a8e10124aadaa33121f0ef78bbf5b702a094b2ca6ad8583257ab7cb4187a7a0571b119c96d5d5e20b2d5cb4beae
     HEAD_REF master
 )
 
diff --git a/ports/oatpp-consul/vcpkg.json b/ports/oatpp-consul/vcpkg.json
index 663067153..0f3a90df3 100644
--- a/ports/oatpp-consul/vcpkg.json
+++ b/ports/oatpp-consul/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-consul",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "OAT++ Modern web framework consul module.",
   "homepage": "https://github.com/oatpp/oatpp-consul",
   "dependencies": [
diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake
index 25146a81d..9340560a5 100644
--- a/ports/oatpp-curl/portfile.cmake
+++ b/ports/oatpp-curl/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-curl
-    REF b7c0507e286fbc55ccbbb4a2604f6c46d3a86525 # 1.2.0
-    SHA512 274aaf34733ab70b148182332db493157ed8c87e093d09bf7dcbd9c89034dab9a97f05ba0887459a8a0ed80b2c2248c253b1ff8c933e196a6ecee11546a4488b
+    REF ${OATPP_VERSION}
+    SHA512 db2b4ab07dbf1140e44c131a1919c6ac29e9cea3df8dde8951028d6096ed5a66a248d3ddeeaabc32cac0fde38fd5905e706daaa7c9fbf6bcb49ccb9ba1cfb50e
     HEAD_REF master
     PATCHES "fix-find-curl.patch"
 )
diff --git a/ports/oatpp-curl/vcpkg.json b/ports/oatpp-curl/vcpkg.json
index c7dc30359..c552f8bee 100644
--- a/ports/oatpp-curl/vcpkg.json
+++ b/ports/oatpp-curl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-curl",
-  "version-string": "1.2.0",
-  "port-version": 2,
+  "version": "1.2.5",
   "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.",
   "homepage": "https://github.com/oatpp/oatpp-curl",
   "dependencies": [
diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake
index b44def0f4..e53766e3a 100644
--- a/ports/oatpp-libressl/portfile.cmake
+++ b/ports/oatpp-libressl/portfile.cmake
@@ -1,4 +1,4 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-libressl
-    REF cd2e9a515131e5e7dc043c591e952e12cd63db2c # 1.2.0
-    SHA512 e6d208edddff5373c07887b76fc808733bd363c340e740047ae90317874b73a5ef71e5cbbb0f9b1b48632c7a78709858a5ff0de81bc39207961e3642c0104010
+    REF ${OATPP_VERSION}
+    SHA512 64b596576b7c976cd8ebd68ba16a38e7b9c65794d9dcea82d3537d2433f11645a25eb567aea6d16ddc51f8ff5f90e83f29e24555c3ae87f80883ec2f53366d99
     HEAD_REF master
     PATCHES "libress-submodule-downgrade-required-libressl-version.patch"
 )
diff --git a/ports/oatpp-libressl/vcpkg.json b/ports/oatpp-libressl/vcpkg.json
index 132a18006..3c34c9a99 100644
--- a/ports/oatpp-libressl/vcpkg.json
+++ b/ports/oatpp-libressl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-libressl",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ libressl module providing secure server and client connection providers.",
   "homepage": "https://github.com/oatpp/oatpp-libressl",
   "dependencies": [
diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake
index 990b244ed..fd95c8c33 100644
--- a/ports/oatpp-mbedtls/portfile.cmake
+++ b/ports/oatpp-mbedtls/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-mbedtls
-    REF b415a88d652cbb1f1cbbd9093345c961cbac4ec1 # 1.2.0
-    SHA512 08864932b20bc9c569eed052137d0eacafb2acd975d0ebacaa7430ae23a6e9ef7c4afb45d88178531a1f0af1a1d488087e9bc26a866f9a656c695d55b0c85ad3
+    REF ${OATPP_VERSION}
+    SHA512 ffc7ef3614a4b3ef44c61af3db8c5b5a75ecc657b2f9f5ade4f9e78260427ca113be700065b6fcdc3e6f553648601fe4d8c68a54e10234949e004f40def0d343
     HEAD_REF master
     PATCHES find-mbedtls.patch
 )
diff --git a/ports/oatpp-mbedtls/vcpkg.json b/ports/oatpp-mbedtls/vcpkg.json
index 9381a26e3..1c4b07d48 100644
--- a/ports/oatpp-mbedtls/vcpkg.json
+++ b/ports/oatpp-mbedtls/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-mbedtls",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ Mbed TLS submodule providing secure server and client connection providers.",
   "homepage": "https://github.com/oatpp/oatpp-mbedtls",
   "dependencies": [
diff --git a/ports/oatpp-mongo/no-designatore-expression.patch b/ports/oatpp-mongo/no-designatore-expression.patch
deleted file mode 100644
index f82620487..000000000
--- a/ports/oatpp-mongo/no-designatore-expression.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/oatpp-mongo/bson/Utils.cpp b/src/oatpp-mongo/bson/Utils.cpp
-index c848c59..32a9e4c 100644
---- a/src/oatpp-mongo/bson/Utils.cpp
-+++ b/src/oatpp-mongo/bson/Utils.cpp
-@@ -34,7 +34,8 @@ Utils::BO_TYPE Utils::FLOAT_BO = detectFloatBO();
- 
- Utils::BO_TYPE Utils::detectIntBO() {
-   BO_TYPE result = BO_TYPE::UNKNOWN;
--  BO_CHECK check {.i64 = 255};
-+  BO_CHECK check;
-+  check.i64 = 255;
-   if(check.bytes[0] == 255) {
-     result = BO_TYPE::LITTLE;
-   } else if(check.bytes[7] == 255) {
-@@ -45,7 +46,8 @@ Utils::BO_TYPE Utils::detectIntBO() {
- 
- Utils::BO_TYPE Utils::detectFloatBO() {
-   BO_TYPE result = BO_TYPE::UNKNOWN;
--  BO_CHECK check {.f64 = 2.0};
-+  BO_CHECK check;
-+  check.f64 = 2.0;
-   if(check.bytes[0] > 0) {
-     result = BO_TYPE::NETWORK;
-   } else if(check.bytes[7] > 0) {
diff --git a/ports/oatpp-mongo/portfile.cmake b/ports/oatpp-mongo/portfile.cmake
index a04bd44e0..2a244eda1 100644
--- a/ports/oatpp-mongo/portfile.cmake
+++ b/ports/oatpp-mongo/portfile.cmake
@@ -1,15 +1,13 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-mongo
-    REF ebfad69af3db61c3f989ec2ec30ebd582e3a4073 # 1.2.0
-    SHA512 6cba529b258b26e8456e10089a127e9ef2b4e683f9d4e37551ed71887978ba22ba796d4af6db6558e20812428dff8ba95d1de540de0675a6563ac6b941c91921
+    REF ${OATPP_VERSION}
+    SHA512 b4d15b40521fc731213decbb4a68edf9f04d918ebd6539ec56e71bdc5aa3536bcd170d4d1f5ee828dc666294f520140241dbcd2c4498247c6d9ea363d7f8ec56
     HEAD_REF master
-    PATCHES
-        no-designatore-expression.patch # https://github.com/oatpp/oatpp-mongo/pull/5
 )
 
 set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
diff --git a/ports/oatpp-mongo/vcpkg.json b/ports/oatpp-mongo/vcpkg.json
index 9e3e610ae..cbdf48c1a 100644
--- a/ports/oatpp-mongo/vcpkg.json
+++ b/ports/oatpp-mongo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-mongo",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.",
   "homepage": "https://github.com/oatpp/oatpp-mongo",
   "dependencies": [
diff --git a/ports/oatpp-postgresql/fix-windows-build.patch b/ports/oatpp-postgresql/fix-windows-build.patch
new file mode 100644
index 000000000..0b6a57d86
--- /dev/null
+++ b/ports/oatpp-postgresql/fix-windows-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/oatpp-postgresql/mapping/Serializer.hpp b/src/oatpp-postgresql/mapping/Serializer.hpp
+index af76701..615d11b 100644
+--- a/src/oatpp-postgresql/mapping/Serializer.hpp
++++ b/src/oatpp-postgresql/mapping/Serializer.hpp
+@@ -201,7 +201,7 @@ private:
+ 
+     outData.oid = _this->getArrayTypeOid(itemType);
+     outData.dataSize = stream.getCurrentPosition();
+-    outData.dataBuffer.template reset(new char[outData.dataSize]);
++    outData.dataBuffer.reset(new char[outData.dataSize]);
+     outData.data = outData.dataBuffer.get();
+     outData.dataFormat = 1;
+ 
diff --git a/ports/oatpp-postgresql/portfile.cmake b/ports/oatpp-postgresql/portfile.cmake
index 410f1971c..ce8af28f8 100644
--- a/ports/oatpp-postgresql/portfile.cmake
+++ b/ports/oatpp-postgresql/portfile.cmake
@@ -1,13 +1,15 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-postgresql
-    REF 349d610084375c46be95d50ce10b787ae6c2baf4 # 1.2.0
-    SHA512 2faa688077020bbe64807be85d8d61e5aa84163a044d42df0a3b1701cf82048ff0322acb72d4e757a38403e14cba6a7a766daa965862e04756e483d9b750a365
+    REF ${OATPP_VERSION}
+    SHA512 43381422224f0254a823fdc702d1a007c405930157e6ea361f51e5232df4b04073181de175f61ab4986f3468d21f9ac25a0820d14efcecb0afb0096bdd674dcb
     HEAD_REF master
+    PATCHES
+        fix-windows-build.patch # see https://github.com/oatpp/oatpp-postgresql/pull/8
 )
 
 set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
diff --git a/ports/oatpp-postgresql/vcpkg.json b/ports/oatpp-postgresql/vcpkg.json
index 4872bbb3d..7a5eb7b01 100644
--- a/ports/oatpp-postgresql/vcpkg.json
+++ b/ports/oatpp-postgresql/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-postgresql",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).",
   "homepage": "https://github.com/oatpp/oatpp-postgresql",
   "dependencies": [
diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake
index cc1c4c0b3..f446876ad 100644
--- a/ports/oatpp-sqlite/portfile.cmake
+++ b/ports/oatpp-sqlite/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-sqlite
-    REF 5128a4a1dc1f6ff5d0618237d1dbb9e9d5447e2f # 1.2.0
-    SHA512 d066701d4c857e895816db14c9700f321e171d2f990ee1c505c8b5243351d726db973d61ec7ebbe1b3f19e678627c41975aeac24fd2891d41900dfb25d427903
+    REF ${OATPP_VERSION}
+    SHA512 b92d8c8b2afbbca38ecef7030648dcd7e15d7b2dd221bc32ea9778533ffcc9923b628308aa86bc53451b1ea4bb15dae8727bc6e0d8345fa611ef32469d850064
     HEAD_REF master
 )
 
diff --git a/ports/oatpp-sqlite/vcpkg.json b/ports/oatpp-sqlite/vcpkg.json
index 6a81099eb..85fa46493 100644
--- a/ports/oatpp-sqlite/vcpkg.json
+++ b/ports/oatpp-sqlite/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-sqlite",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ SQLite adapter for Oat++ ORM.",
   "homepage": "https://github.com/oatpp/oatpp-sqlite",
   "dependencies": [
diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake
index bc600b7e4..c94eda0b6 100644
--- a/ports/oatpp-swagger/portfile.cmake
+++ b/ports/oatpp-swagger/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-swagger
-    REF d0495421914cc2f9ed0a4c625d215c3d140a339f # 1.2.0
-    SHA512 d6e7e495c5a9c8cefc8703758cbbd69767373edccaf8040963e950a033525af0491c950f5fa85b7fea03b0a2901d295368a2d67f9d7069f1bad856c8c1652bd4
+    REF ${OATPP_VERSION}
+    SHA512 ad9b92a2b8ef7c54533bde92d5a12eb4b62553ee0a5252a5dd15aba7dc7293202931acc0ad40fc6f3be566813221a309a0bfec8bdbefca2197767387fe68fa6c
     HEAD_REF master
 )
 
diff --git a/ports/oatpp-swagger/vcpkg.json b/ports/oatpp-swagger/vcpkg.json
index d1764af44..da63d6133 100644
--- a/ports/oatpp-swagger/vcpkg.json
+++ b/ports/oatpp-swagger/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-swagger",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ OpenApi (Swagger) UI submodule.",
   "homepage": "https://github.com/oatpp/oatpp-swagger",
   "dependencies": [
diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake
index 7485d9cf5..b0cbf4fe0 100644
--- a/ports/oatpp-websocket/portfile.cmake
+++ b/ports/oatpp-websocket/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-websocket
-    REF 1ac81a1ae2588e9b21e4b9ecb93f7f30739fdcfe # 1.2.0
-    SHA512 db70052f4399300e2fd75f6dc7fb85b3084cc7ad4fba09340707c8465cfa3ea7f63f629581722912009d450d7951c0e0b04ffec9c24fa4dcdf0aaf429cff5593
+    REF ${OATPP_VERSION}
+    SHA512 7bf4d8c8adf158e1b46b617d0aea201db32802dc89238d50c39bb10228ae59c8536ec198696f4e403da293c9b2dcc25a3c81aff1dedc49b38d4c7d94e97557e0
     HEAD_REF master
 )
 
diff --git a/ports/oatpp-websocket/vcpkg.json b/ports/oatpp-websocket/vcpkg.json
index 629a468bd..be7aa1176 100644
--- a/ports/oatpp-websocket/vcpkg.json
+++ b/ports/oatpp-websocket/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-websocket",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ websocket module.",
   "homepage": "https://github.com/oatpp/oatpp-websocket",
   "dependencies": [
diff --git a/ports/oatpp-zlib/portfile.cmake b/ports/oatpp-zlib/portfile.cmake
index d441a8522..84a4cf84a 100644
--- a/ports/oatpp-zlib/portfile.cmake
+++ b/ports/oatpp-zlib/portfile.cmake
@@ -1,12 +1,12 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-zlib
-    REF b3a0c1d140175d8ec43ebbe1da9ac46e2baa142c # 1.2.0
-    SHA512 a6a012ad5294f994a5a65a57ccfd8b9af77515d0c203d04193a2202996b3a831f314c0847a3f5ebc1867835fbd0c438284142c070998ed26881fdc1110a3c5ad
+    REF ${OATPP_VERSION}
+    SHA512 da132edc8c6476bf8d6d1df7d05eac45ac05057153fb0042f0fae54c1a20b3866174cffce2813a0cde7dbf0d8674babf61c84b62cba8dd22c440fef5f81e322b
     HEAD_REF master
 )
 
diff --git a/ports/oatpp-zlib/vcpkg.json b/ports/oatpp-zlib/vcpkg.json
index 394d90a74..4f624c3aa 100644
--- a/ports/oatpp-zlib/vcpkg.json
+++ b/ports/oatpp-zlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp-zlib",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
   "homepage": "https://github.com/oatpp/oatpp-zlib",
   "dependencies": [
diff --git a/ports/oatpp/fix-windows-build.patch b/ports/oatpp/fix-windows-build.patch
new file mode 100644
index 000000000..d017f7480
--- /dev/null
+++ b/ports/oatpp/fix-windows-build.patch
@@ -0,0 +1,21 @@
+diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp
+index b870835..ae36970 100644
+--- a/src/oatpp/core/base/Environment.cpp
++++ b/src/oatpp/core/base/Environment.cpp
+@@ -36,14 +36,9 @@
+ 	#include <WinSock2.h>
+ #endif
+ 
+-#if (defined(WIN32) || defined(_WIN32)) && defined(_WIN64)
+-struct tm* localtime_r(time_t *_clock, struct tm *_result) {
+-    _localtime64_s(_result, _clock);
+-    return _result;
+-}
+-#elif (defined(WIN32) || defined(_WIN32)) && not defined(_WIN64)
++#if defined(WIN32) || defined(_WIN32)
+ struct tm* localtime_r(time_t *_clock, struct tm *_result) {
+-    _localtime32_s(_result, _clock);
++    localtime_s(_result, _clock);
+     return _result;
+ }
+ #endif
diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake
index ed21d2b79..233bc2f22 100644
--- a/ports/oatpp/portfile.cmake
+++ b/ports/oatpp/portfile.cmake
@@ -1,13 +1,15 @@
-set(OATPP_VERSION "1.2.0")
+set(OATPP_VERSION "1.2.5")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp
-    REF 8f1c11ae534e1f03646de8efcc9b2505fb1881cc  # 1.2.0
-    SHA512 4661aefe89be8153b08be0eb95ce688d5af3abd80e8f92fe3b2f1ac9dc76228383b05f7b33314de5f25d433013d6d287650ed156b69244b0d9ba8b604df8aaa3
+    REF ${OATPP_VERSION}
+    SHA512 8c7c939860c02ade86234e46f907051b088c07d6975cf90190c9263bb7fd8081a7aaccd3e08bfe8a962c07ae39ff771cf17099a48812ecc69df20272a856d0ed
     HEAD_REF master
+    PATCHES
+        fix-windows-build.patch # see https://github.com/oatpp/oatpp/pull/428
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json
index bd5ab4dde..594939dcf 100644
--- a/ports/oatpp/vcpkg.json
+++ b/ports/oatpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oatpp",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.5",
   "description": "Modern web framework.",
   "homepage": "https://github.com/oatpp/oatpp"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index daf2f4e57..7c61cd422 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4337,48 +4337,48 @@
       "port-version": 1
     },
     "oatpp": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-consul": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-curl": {
-      "baseline": "1.2.0",
-      "port-version": 2
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-libressl": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-mbedtls": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-mongo": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-postgresql": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-sqlite": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-swagger": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-websocket": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "oatpp-zlib": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.2.5",
+      "port-version": 0
     },
     "observer-ptr-lite": {
       "baseline": "0.4.0",
diff --git a/versions/o-/oatpp-consul.json b/versions/o-/oatpp-consul.json
index da8cb0678..bb5c05090 100644
--- a/versions/o-/oatpp-consul.json
+++ b/versions/o-/oatpp-consul.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "595495963d23d1c6b4c6c17d00ecd7c77482d3a2",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "98d704ce61f927b05f93e4e4cfa45ec4265088a8",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-curl.json b/versions/o-/oatpp-curl.json
index 9a0bfb4cd..e74632da6 100644
--- a/versions/o-/oatpp-curl.json
+++ b/versions/o-/oatpp-curl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "347efe19ad9ba33369ad147e83ac1c634cc63ca6",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "547775e31752315b7f7e81c28ca31a160030b8a5",
       "version-string": "1.2.0",
       "port-version": 2
diff --git a/versions/o-/oatpp-libressl.json b/versions/o-/oatpp-libressl.json
index c51d2a19b..00953cf30 100644
--- a/versions/o-/oatpp-libressl.json
+++ b/versions/o-/oatpp-libressl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e8b1d151bbd0338da87480893b466829b55ecc7a",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "7d4c47f40b9129f88085c5c1afe3d44c7ca22eca",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-mbedtls.json b/versions/o-/oatpp-mbedtls.json
index b45f31a94..b438b0e99 100644
--- a/versions/o-/oatpp-mbedtls.json
+++ b/versions/o-/oatpp-mbedtls.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9d453e8fdce152be19d4f0bda197adfdaeebb118",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "8fa1344d0bdd6282f1b93dbcbe6f32fadce4b302",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-mongo.json b/versions/o-/oatpp-mongo.json
index b3be4c09c..9888322aa 100644
--- a/versions/o-/oatpp-mongo.json
+++ b/versions/o-/oatpp-mongo.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e6adcb5eb014357414879a0677983d6a7b4bc9db",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "7333d11c63a663a7a9244639300493a8f3fdbe1e",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-postgresql.json b/versions/o-/oatpp-postgresql.json
index 64b35ebc1..b8b581480 100644
--- a/versions/o-/oatpp-postgresql.json
+++ b/versions/o-/oatpp-postgresql.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f2cbdc4de3f10789d3b258636819bdec76f55850",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "d79f2e5a875b29aabe79e495d7a5bd4f8b8284ff",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-sqlite.json b/versions/o-/oatpp-sqlite.json
index 27f4f476a..3351a6163 100644
--- a/versions/o-/oatpp-sqlite.json
+++ b/versions/o-/oatpp-sqlite.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "998bc24ce7db8343441a34779f38d500edd5a2c8",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "41dc1128affe43785bb670c0c43d884d334056f3",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-swagger.json b/versions/o-/oatpp-swagger.json
index 389e1863e..21161946e 100644
--- a/versions/o-/oatpp-swagger.json
+++ b/versions/o-/oatpp-swagger.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b1859f1a4fa6e90da2ed150098a07aa86189d681",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "8e041854d65d14857958f668ae92ac4e938972b7",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-websocket.json b/versions/o-/oatpp-websocket.json
index 1aff3aa95..69275f15b 100644
--- a/versions/o-/oatpp-websocket.json
+++ b/versions/o-/oatpp-websocket.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e492744484bc660010ae5e038aaa5703abce53f5",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "7412173d56da2869372aca7f30b9963b0ab9967f",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp-zlib.json b/versions/o-/oatpp-zlib.json
index 2e2feefa4..eb9d7b126 100644
--- a/versions/o-/oatpp-zlib.json
+++ b/versions/o-/oatpp-zlib.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9cbd1b70447175716f4415c18d4e66696c78ad80",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "4fbe8761bcf603ce1a4af48707aa6adfa86aed4f",
       "version-string": "1.2.0",
       "port-version": 1
diff --git a/versions/o-/oatpp.json b/versions/o-/oatpp.json
index 0b00048ab..de4c162da 100644
--- a/versions/o-/oatpp.json
+++ b/versions/o-/oatpp.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f6f5d0cb4da86c170670f9d3947b5704ed213a5c",
+      "version": "1.2.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "5c36b3d62c498e43f74d403b8f8020fbc2a06611",
       "version-string": "1.2.0",
       "port-version": 1