From 46314728d4e56afc2776f7a8399f816e912b8a8d Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Wed, 18 Jan 2023 11:34:09 -0800 Subject: [PATCH 01/38] [azure-iot-sdk-c] LTS_01_2023_REF01 --- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- ports/azure-c-shared-utility/vcpkg.json | 2 +- ports/azure-iot-sdk-c/portfile.cmake | 4 ++-- ports/azure-iot-sdk-c/vcpkg.json | 2 +- ports/azure-macro-utils-c/vcpkg.json | 2 +- ports/azure-uamqp-c/portfile.cmake | 4 ++-- ports/azure-uamqp-c/vcpkg.json | 2 +- ports/azure-uhttp-c/portfile.cmake | 4 ++-- ports/azure-uhttp-c/vcpkg.json | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/vcpkg.json | 2 +- ports/umock-c/vcpkg.json | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 40791ee3faa335..888930e72ec666 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -17,8 +17,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 9e4322c9d88095ed276bf7e4b31b87b82b1c4d86 - SHA512 0ede2a30ed787028a48602111be7cebc65593a84a8b3dc94ed34917f44355a180d8b8acf2b6404e47428fe8f761c11485199e9bd2e9aa6628548c585357f63e8 + REF 4f1b7cd6bf48833fe4b9e23e2ff07510753faee5 + SHA512 5374585bd05ad2b55d2aa183d65b0b371d52b7f3145bcc9486e92d306d172109a8a6b13e14b56073426c3b02541044864d63fc728a9006a8dcd7ab552002be79 HEAD_REF master PATCHES fix-install-location.patch diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index a7b3cf63a35fad..4ca5bbb6927c3f 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-c-shared-utility", - "version-date": "2022-09-15", + "version-date": "2023-01-18", "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 7a7bf38a6d56ca..003b5c130cddb0 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 3fd808bee3c88f8578dcc30c0a6d1d396c172070 - SHA512 2ee26791aca7732d21fe91cbb51be35d1589161d1d7b54542ac1a1277f1a95eb7e1d5ced7be117ce326dd118169e20ffc6bcd0ea9fd8ac9442bd466bc048f1ea + REF 9fa25c9f996f06b57132c73b95a251a0598d786b + SHA512 4b7ea9831bae34319710f6423a4d93a85ebe91a881d7e04d68e10dfc9828ec0bfd9cd81b55ebefa21c35e6a7f59492a2719128e7e0cab03d7afab1d6af07f43e HEAD_REF master PATCHES fix-install-location.patch diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index f580b4eb28ade8..2979530140ef9a 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-iot-sdk-c", - "version-date": "2022-09-15", + "version-date": "2023-01-18", "port-version": 1, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 0d4df0005ef4ab..394960a75ac6e6 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-macro-utils-c", - "version-date": "2022-01-21", + "version-date": "2023-01-18", "description": "A library of macros for the Azure IoT SDK Suite", "features": { "public-preview": { diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 3098bd34636ed5..eb9601fa3e4bb4 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 117c8378b80fdafec639dafb6693b7c044281abc - SHA512 6726cfb3ecb42d42957b5df94d0b173b566fdd6961814e2b10882e32ae26387a36b05d77c59efbb008b7ed37e276c35128ab4e4adf0739cbf37f5f234626481a + REF b7bdf307a0db8840156d9f6e40f704c1d5924306 + SHA512 a23ddab35caa6f9303072f235591d64f5cfe3c2f4a16e9f317380a9d887f47f146b0bca5afcb2e3a199b146e8092192ede2ec68685edb8a7fb11cfe5641815b8 HEAD_REF master ) endif() diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index 54c351911d20c2..b3afd948e90c88 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-uamqp-c", - "version-date": "2022-09-15", + "version-date": "2023-01-18", "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", "license": "MIT", diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index d8e3a633bbac68..90d62d7a239224 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 2b86b92628e55c9597aef8b96b0a73048ef072b3 - SHA512 bc4cadaf4f64ffff4d8839fe8f604b77d6a912ab28b6100df93f4c7fbc96fa68a4e09b4670d27d078aac32a2d7792c408aa78a580328c02759c7a1c04d82d721 + REF 33485e2e43f9c8f186dfff8afda7efd905b636f1 + SHA512 ad9c8f21cee431ac39a5ffc5f1007b76c5ba1768dca6cebf8fceda33747c3accbce48ace72173cfe746316a0a136a7e770005ba98b8f99e5bb3889b5bdc2e973 HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index 3b0aed5d6b070f..8ee290243f45c2 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-uhttp-c", - "version-date": "2022-09-15", + "version-date": "2023-01-18", "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", "license": "MIT", diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index acd5fe413970c4..944c5ccc96e81e 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 566127ad605172735b9ac5cc6797261f3dd6c45c - SHA512 19e997e1dd7ecfbf5e8f11f44daa89cee7aa793f95aaed4bdaf792f5443173e0ca434d69f68a6633ee7cdc504d03a42f4b4e8aeec549c7ffdbd5e03db8cce6b5 + REF 9201d60bbc12a02ac5456b6105bb50919d392105 + SHA512 97d5383184c99186783738613d00e77041fe4ff3af4c14fe775e4be8b38a77a69d093ed8636a67ee85e8e09c8732b8839375aa178128f1ae58792d7c8698f829 HEAD_REF master ) endif() diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index e5c1787633c0a8..a7be6dd5c3f0b6 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-umqtt-c", - "version-date": "2022-09-15", + "version-date": "2023-01-18", "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", "license": "MIT", diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index d791b44b5c0edc..1d8ed41ca76950 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "umock-c", - "version-date": "2022-01-21", + "version-date": "2023-01-18", "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", "dependencies": [ From 795cd583f5e4b029ab493621111cb92fd6fe4862 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Wed, 18 Jan 2023 12:03:11 -0800 Subject: [PATCH 02/38] Update vcpkg.json --- ports/azure-macro-utils-c/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 394960a75ac6e6..0d4df0005ef4ab 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-macro-utils-c", - "version-date": "2023-01-18", + "version-date": "2022-01-21", "description": "A library of macros for the Azure IoT SDK Suite", "features": { "public-preview": { From 9b1f37933de9c27a240b049d15e29fdfb06d83b1 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Wed, 18 Jan 2023 12:04:13 -0800 Subject: [PATCH 03/38] Update vcpkg.json --- ports/umock-c/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 1d8ed41ca76950..d791b44b5c0edc 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "umock-c", - "version-date": "2023-01-18", + "version-date": "2022-01-21", "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", "dependencies": [ From 3ef2624756b92d1f3b6059cfa8625c6b9933bb68 Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Wed, 18 Jan 2023 12:48:16 -0800 Subject: [PATCH 04/38] Changes to be committed: modified: versions/a-/azure-c-shared-utility.json modified: versions/a-/azure-iot-sdk-c.json modified: versions/a-/azure-uamqp-c.json modified: versions/a-/azure-uhttp-c.json modified: versions/a-/azure-umqtt-c.json modified: versions/baseline.json --- versions/a-/azure-c-shared-utility.json | 5 +++++ versions/a-/azure-iot-sdk-c.json | 5 +++++ versions/a-/azure-uamqp-c.json | 5 +++++ versions/a-/azure-uhttp-c.json | 5 +++++ versions/a-/azure-umqtt-c.json | 5 +++++ versions/baseline.json | 10 +++++----- 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index d140703f89ace6..a0fffa1a15c110 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cd748787dbcbb7e47afa20f7b21818ce2d1c32d", + "version-date": "2023-01-18", + "port-version": 0 + }, { "git-tree": "2bfbac018e320a4f8d18aba279855bebd798e74f", "version-date": "2022-09-15", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index d6605d0de4b5c0..877348bc17fe92 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bf49fe94cff0133a07607eb1682005fee4d765c", + "version-date": "2023-01-18", + "port-version": 1 + }, { "git-tree": "9cb7368d6494ab01b085cad166bb7fef06cd14e7", "version-date": "2022-09-15", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index 0d039376f98844..8af550975d7037 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b229b4dada0d4ce287ccbed879d8c5b4638dfc60", + "version-date": "2023-01-18", + "port-version": 0 + }, { "git-tree": "42efba430e30e78eaf72b03c94f8c4afe07bcfda", "version-date": "2022-09-15", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index ae63cab50a9327..4a5996bc89d06a 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ba6fce12a13e816765590a12e53632e804c29cf", + "version-date": "2023-01-18", + "port-version": 0 + }, { "git-tree": "5c83542c6dc2b853932ac25c4d8314a5556aab40", "version-date": "2022-09-15", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index a010bbe8f3a0fc..d5e7fdf47e19e5 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f0080f27dd6366cfd832d78135800febc83e2cb", + "version-date": "2023-01-18", + "port-version": 0 + }, { "git-tree": "28ef0c8d4778d3fd30120290bcb4a121a2efc14f", "version-date": "2022-09-15", diff --git a/versions/baseline.json b/versions/baseline.json index c5613cb2fac5e1..ec131970116faa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "azure-c-shared-utility": { - "baseline": "2022-09-15", + "baseline": "2023-01-18", "port-version": 0 }, "azure-core-cpp": { @@ -369,7 +369,7 @@ "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2022-09-15", + "baseline": "2023-01-18", "port-version": 1 }, "azure-kinect-sensor-sdk": { @@ -421,15 +421,15 @@ "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2022-09-15", + "baseline": "2023-01-18", "port-version": 0 }, "azure-uhttp-c": { - "baseline": "2022-09-15", + "baseline": "2023-01-18", "port-version": 0 }, "azure-umqtt-c": { - "baseline": "2022-09-15", + "baseline": "2023-01-18", "port-version": 0 }, "b64": { From 5637ef73edd126f6cb51ab88748b4054d969ffaf Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 19 Jan 2023 08:37:41 -0800 Subject: [PATCH 05/38] Remove port version Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/azure-iot-sdk-c/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index 2979530140ef9a..ec3ec381a21c91 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-iot-sdk-c", "version-date": "2023-01-18", - "port-version": 1, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", "license": "MIT", From 340ce929d05c177fe17e0f4cb309fa0d61a6b74f Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Thu, 19 Jan 2023 10:02:27 -0800 Subject: [PATCH 06/38] Changes to be committed: modified: versions/a-/azure-iot-sdk-c.json modified: versions/baseline.json --- versions/a-/azure-iot-sdk-c.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 877348bc17fe92..73a804e99bd1d5 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0e747b46da1a6642cce7718381c89ee08e29a5c", + "version-date": "2023-01-18", + "port-version": 0 + }, { "git-tree": "8bf49fe94cff0133a07607eb1682005fee4d765c", "version-date": "2023-01-18", diff --git a/versions/baseline.json b/versions/baseline.json index ec131970116faa..caf6585e81ebdb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -370,7 +370,7 @@ }, "azure-iot-sdk-c": { "baseline": "2023-01-18", - "port-version": 1 + "port-version": 0 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", From 5e7fff2d526dca3b1afe3fbed0b81376cf847ed3 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:04:16 -0800 Subject: [PATCH 07/38] Update azure-uhttp-c portfile Remove public-preview --- ports/azure-uhttp-c/portfile.cmake | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 90d62d7a239224..fc1c586aa95a16 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -1,24 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uhttp-c - REF d84a20609a2b5a555920389451fb3c9a2ed3656c - SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6 - HEAD_REF master - PATCHES - package-location-fix-preview.patch - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uhttp-c - REF 33485e2e43f9c8f186dfff8afda7efd905b636f1 - SHA512 ad9c8f21cee431ac39a5ffc5f1007b76c5ba1768dca6cebf8fceda33747c3accbce48ace72173cfe746316a0a136a7e770005ba98b8f99e5bb3889b5bdc2e973 - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF 33485e2e43f9c8f186dfff8afda7efd905b636f1 + SHA512 ad9c8f21cee431ac39a5ffc5f1007b76c5ba1768dca6cebf8fceda33747c3accbce48ace72173cfe746316a0a136a7e770005ba98b8f99e5bb3889b5bdc2e973 + HEAD_REF master +) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) From acb3e1e5fa0d9b932c41bed0fd805858e7a6580a Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:07:54 -0800 Subject: [PATCH 08/38] Update azure-uhttp-c vcpkg Remove public-preview --- ports/azure-uhttp-c/vcpkg.json | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index 8ee290243f45c2..0eebd83d6d90f4 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -16,30 +16,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "public-preview": { - "description": "Azure HTTP Library written in C (public preview)", - "dependencies": [ - { - "name": "azure-c-shared-utility", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - }, - { - "name": "umock-c", - "features": [ - "public-preview" - ] - } - ] - } - } + ] } From 02976269dc8a49b65f6ed8af699ae0e8c1fdcaa3 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:17:48 -0800 Subject: [PATCH 09/38] Update portfile.cmake Remove public-preview. --- ports/azure-c-shared-utility/portfile.cmake | 39 +++++++-------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 888930e72ec666..9f6c54a8e41052 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -1,32 +1,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-c-shared-utility - REF 42574842914591aadc77701aac72f18cc72319ad - SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 - HEAD_REF master - PATCHES - fix-install-location-preview.patch - fix-utilityFunctions-conditions-preview.patch - disable-error.patch - improve-dependencies-preview.patch - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-c-shared-utility - REF 4f1b7cd6bf48833fe4b9e23e2ff07510753faee5 - SHA512 5374585bd05ad2b55d2aa183d65b0b371d52b7f3145bcc9486e92d306d172109a8a6b13e14b56073426c3b02541044864d63fc728a9006a8dcd7ab552002be79 - HEAD_REF master - PATCHES - fix-install-location.patch - fix-utilityFunctions-conditions.patch - disable-error.patch - improve-dependencies.patch - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF 4f1b7cd6bf48833fe4b9e23e2ff07510753faee5 + SHA512 5374585bd05ad2b55d2aa183d65b0b371d52b7f3145bcc9486e92d306d172109a8a6b13e14b56073426c3b02541044864d63fc728a9006a8dcd7ab552002be79 + HEAD_REF master + PATCHES + fix-install-location.patch + fix-utilityFunctions-conditions.patch + disable-error.patch + improve-dependencies.patch +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" From a7c15f9fb444fb5f31b1f08c49b01154b26ef01b Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:19:56 -0800 Subject: [PATCH 10/38] Update vcpkg.json Remove public-preview. --- ports/azure-c-shared-utility/vcpkg.json | 29 +------------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 4ca5bbb6927c3f..412f0a83c36543 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -24,32 +24,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "public-preview": { - "description": "Azure C SDKs common code (public preview)", - "dependencies": [ - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - }, - { - "name": "curl", - "platform": "linux" - }, - { - "name": "openssl", - "platform": "linux" - }, - { - "name": "umock-c", - "features": [ - "public-preview" - ] - } - ] - } - } + ] } From 1936d2911a268bab06e8df1909851794be2d8cd1 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:26:01 -0800 Subject: [PATCH 11/38] Update portfile.cmake Remove public-preview. --- ports/azure-iot-sdk-c/portfile.cmake | 34 +++++++++------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 003b5c130cddb0..0058c811240086 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -1,28 +1,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-iot-sdk-c - REF cb2e8d390df56ffa31d08ca0a79ab58ff96160cc - SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b - HEAD_REF public-preview - PATCHES - improve-external-deps-preview.patch - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-iot-sdk-c - REF 9fa25c9f996f06b57132c73b95a251a0598d786b - SHA512 4b7ea9831bae34319710f6423a4d93a85ebe91a881d7e04d68e10dfc9828ec0bfd9cd81b55ebefa21c35e6a7f59492a2719128e7e0cab03d7afab1d6af07f43e - HEAD_REF master - PATCHES - fix-install-location.patch - improve-external-deps.patch - fix-iothubclient-includes.patch - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 9fa25c9f996f06b57132c73b95a251a0598d786b + SHA512 4b7ea9831bae34319710f6423a4d93a85ebe91a881d7e04d68e10dfc9828ec0bfd9cd81b55ebefa21c35e6a7f59492a2719128e7e0cab03d7afab1d6af07f43e + HEAD_REF master + PATCHES + fix-install-location.patch + improve-external-deps.patch + fix-iothubclient-includes.patch +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES From 9f9df5ec2f545fe9a7e627b25644bc35920cfd8f Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:31:43 -0800 Subject: [PATCH 12/38] Update vcpkg.json Remove public-preview. --- ports/azure-iot-sdk-c/vcpkg.json | 45 +------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index ec3ec381a21c91..d7a26e4de81afd 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -21,50 +21,7 @@ "host": true } ], - "features": { - "public-preview": { - "description": "A version of the azure-iot-sdk-c containing public-preview features.", - "dependencies": [ - { - "name": "azure-c-shared-utility", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-uamqp-c", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-uhttp-c", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-umqtt-c", - "features": [ - "public-preview" - ] - }, - { - "name": "umock-c", - "features": [ - "public-preview" - ] - } - ] - }, - "use-prov-client": { + "use-prov-client": { "description": "Enables device provisioning client for DPS" - } } } From 2f40239e4670a69e53c92c60d36a6b2d02cf33aa Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:39:59 -0800 Subject: [PATCH 13/38] Update vcpkg.json Remove use-prov-client --- ports/azure-iot-sdk-c/vcpkg.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index d7a26e4de81afd..dcaffc62924b03 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -20,8 +20,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "use-prov-client": { - "description": "Enables device provisioning client for DPS" - } + ] } From dacdbaab392e2b386fe233484794e0ef02f149c0 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:42:29 -0800 Subject: [PATCH 14/38] Update portfile.cmake Remove public-preview. --- ports/azure-uamqp-c/portfile.cmake | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index eb9601fa3e4bb4..743d9d35eea4a2 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -1,22 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uamqp-c - REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2 - SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba - HEAD_REF master - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uamqp-c - REF b7bdf307a0db8840156d9f6e40f704c1d5924306 - SHA512 a23ddab35caa6f9303072f235591d64f5cfe3c2f4a16e9f317380a9d887f47f146b0bca5afcb2e3a199b146e8092192ede2ec68685edb8a7fb11cfe5641815b8 - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF b7bdf307a0db8840156d9f6e40f704c1d5924306 + SHA512 a23ddab35caa6f9303072f235591d64f5cfe3c2f4a16e9f317380a9d887f47f146b0bca5afcb2e3a199b146e8092192ede2ec68685edb8a7fb11cfe5641815b8 + HEAD_REF master +) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) From f61d078389d3f2fc822dced2ce50cc0687ea8362 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:45:03 -0800 Subject: [PATCH 15/38] Update vcpkg.json Remove public-preview. --- ports/azure-uamqp-c/vcpkg.json | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index b3afd948e90c88..4f0b850f6ebcdc 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -16,30 +16,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "public-preview": { - "description": "AMQP library for C (public preview)", - "dependencies": [ - { - "name": "azure-c-shared-utility", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - }, - { - "name": "umock-c", - "features": [ - "public-preview" - ] - } - ] - } - } + ] } From bc1c410be11a771156f26b3b170f3b553e004a35 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:47:05 -0800 Subject: [PATCH 16/38] Update portfile.cmake Remove public-preview. --- ports/azure-umqtt-c/portfile.cmake | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 944c5ccc96e81e..b3d2a1bf55f14f 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -1,24 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-umqtt-c - REF 7557db6de094b67818d3c410dc95a3cf07cd86a6 - SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40 - HEAD_REF master - PATCHES - package-location-fix-preview.patch - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-umqtt-c - REF 9201d60bbc12a02ac5456b6105bb50919d392105 - SHA512 97d5383184c99186783738613d00e77041fe4ff3af4c14fe775e4be8b38a77a69d093ed8636a67ee85e8e09c8732b8839375aa178128f1ae58792d7c8698f829 - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 9201d60bbc12a02ac5456b6105bb50919d392105 + SHA512 97d5383184c99186783738613d00e77041fe4ff3af4c14fe775e4be8b38a77a69d093ed8636a67ee85e8e09c8732b8839375aa178128f1ae58792d7c8698f829 + HEAD_REF master +) file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/c-utility/configs/") From a3011b1577c36edb96a53a24375d8b0b954f7d8c Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:47:50 -0800 Subject: [PATCH 17/38] Update vcpkg.json Remove public-preview. --- ports/azure-umqtt-c/vcpkg.json | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index a7be6dd5c3f0b6..5585375816d3d9 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -16,30 +16,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "public-preview": { - "description": "General purpose library for communication over the mqtt protocol (public preview)", - "dependencies": [ - { - "name": "azure-c-shared-utility", - "features": [ - "public-preview" - ] - }, - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - }, - { - "name": "umock-c", - "features": [ - "public-preview" - ] - } - ] - } - } + ] } From 594020c9540a5e99cc93f3b271443c7ddddec20c Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:33:57 -0800 Subject: [PATCH 18/38] Update vcpkg.json Remove public-preview --- ports/umock-c/vcpkg.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index d791b44b5c0edc..2a8e27801d9ae1 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -5,18 +5,5 @@ "homepage": "https://github.com/Azure/umock-c", "dependencies": [ "azure-macro-utils-c" - ], - "features": { - "public-preview": { - "description": "A pure C mocking library (public-preview)", - "dependencies": [ - { - "name": "azure-macro-utils-c", - "features": [ - "public-preview" - ] - } - ] - } - } + ] } From 132ac22aaae8064964e05a5754fc1806dd5c70da Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:35:54 -0800 Subject: [PATCH 19/38] Update vcpkg.json Remove public-preview --- ports/azure-macro-utils-c/vcpkg.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 0d4df0005ef4ab..9942d741d0d7f9 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,10 +1,5 @@ { "name": "azure-macro-utils-c", "version-date": "2022-01-21", - "description": "A library of macros for the Azure IoT SDK Suite", - "features": { - "public-preview": { - "description": "A library of macros for the Azure IoT SDK Suite (public-preview)" - } - } + "description": "A library of macros for the Azure IoT SDK Suite" } From 2f67233b129809bd892ee66c7f9dea3feca3d11b Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:42:06 -0800 Subject: [PATCH 20/38] Update portfile.cmake Remove public-preview --- ports/azure-macro-utils-c/portfile.cmake | 27 +++++++----------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index 225def8146bafd..f69109ae2324e8 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -1,24 +1,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-macro-utils-c - REF 7523af934fc4d9423111e358f49b19314ec9c3e3 - SHA512 441d2420be319195ef50d0b03028e44c470adedc316dc338245cbc51ec2e78863cb42a9665d84a628056d212927abb5aeaf5c489e7c36b5257b16a28b3652e6e - HEAD_REF master - FILE_DISAMBIGUATOR 1 - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-macro-utils-c - REF 5926caf4e42e98e730e6d03395788205649a3ada - SHA512 8f9fd02012202db6cff5b647edbc8332a2c03963e80182a630af6a884f23df96b8e24d60e5412bfc2a0a7f43240a54f9597040aa28a9d3e1566755e1d52aac62 - HEAD_REF master - FILE_DISAMBIGUATOR 1 - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-macro-utils-c + REF 5926caf4e42e98e730e6d03395788205649a3ada + SHA512 8f9fd02012202db6cff5b647edbc8332a2c03963e80182a630af6a884f23df96b8e24d60e5412bfc2a0a7f43240a54f9597040aa28a9d3e1566755e1d52aac62 + HEAD_REF master + FILE_DISAMBIGUATOR 1 +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 6085db38180b3b7bad6d39e7cb44aa1db598027f Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:50:42 -0800 Subject: [PATCH 21/38] Update portfile.cmake Remove public-preview --- ports/umock-c/portfile.cmake | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake index 4e9345fcd8faa5..0761e1cde90450 100644 --- a/ports/umock-c/portfile.cmake +++ b/ports/umock-c/portfile.cmake @@ -1,22 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("public-preview" IN_LIST FEATURES) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/umock-c - REF 87d2214384c886a1e2406ac0756a0b3786add8da - SHA512 230b6c79a8346727bbc124d1aefaa14da8ecd82b2a56d68b3d2511b8efa5931872da440137a5d266835ba8c5193b83b4bc5ee85abb5242d07904a0706727926c - HEAD_REF master - ) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/umock-c - REF 504193e65d1c2f6eb50c15357167600a296df7ff - SHA512 68d5d986314dbd46d20de2a9b9454154c11675c25d1b5a5b1cfecdd0c0945d9dc68d0348ec1dbb00b5d1a6a1f0356121ba561d7c8fffb97ab37864edade5a85b - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/umock-c + REF 504193e65d1c2f6eb50c15357167600a296df7ff + SHA512 68d5d986314dbd46d20de2a9b9454154c11675c25d1b5a5b1cfecdd0c0945d9dc68d0348ec1dbb00b5d1a6a1f0356121ba561d7c8fffb97ab37864edade5a85b + HEAD_REF master +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From b61c96a6f4e2cdecdd48f7dcce77bba60ecdb6b3 Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Thu, 2 Feb 2023 19:42:10 -0800 Subject: [PATCH 22/38] Update versions --- versions/a-/azure-c-shared-utility.json | 2 +- versions/a-/azure-iot-sdk-c.json | 2 +- versions/a-/azure-macro-utils-c.json | 2 +- versions/a-/azure-uamqp-c.json | 2 +- versions/a-/azure-uhttp-c.json | 2 +- versions/a-/azure-umqtt-c.json | 2 +- versions/u-/umock-c.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index a0fffa1a15c110..8acf4b87bb915c 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2cd748787dbcbb7e47afa20f7b21818ce2d1c32d", + "git-tree": "78c535284693d96c19026445e363459b37a4aca9", "version-date": "2023-01-18", "port-version": 0 }, diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 73a804e99bd1d5..1b382122323abc 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c0e747b46da1a6642cce7718381c89ee08e29a5c", + "git-tree": "0013d7074456da0e8be20a9e56ed79a7aa96f1c4", "version-date": "2023-01-18", "port-version": 0 }, diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index f0dd734cb6060c..0ba2c4a116c030 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b", + "git-tree": "f65aa7d83f50a1aff407e6bb5addfc59444cb105", "version-date": "2022-01-21", "port-version": 0 }, diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index 8af550975d7037..0fc0fa7ba1b59d 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b229b4dada0d4ce287ccbed879d8c5b4638dfc60", + "git-tree": "c4183ed8c03559df3b5821d0149192a95dba5b50", "version-date": "2023-01-18", "port-version": 0 }, diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index 4a5996bc89d06a..347cfa6c5087ca 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ba6fce12a13e816765590a12e53632e804c29cf", + "git-tree": "6076f8569c54a752f30d97f3b5654190a716722a", "version-date": "2023-01-18", "port-version": 0 }, diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index d5e7fdf47e19e5..a87ba3801515b4 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6f0080f27dd6366cfd832d78135800febc83e2cb", + "git-tree": "e484fe484d0feac8170d1dc7a3f2a3a72bd262fb", "version-date": "2023-01-18", "port-version": 0 }, diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index 366826108aab81..3df19c112c15c8 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15", + "git-tree": "0a65bfeaf27e6c5706f93b6cc822dc527882629a", "version-date": "2022-01-21", "port-version": 0 }, From 8a4a447f052e4f6c84f70b72dff2d0294f2506fa Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 23:32:35 -0800 Subject: [PATCH 23/38] Add license. --- ports/azure-macro-utils-c/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 9942d741d0d7f9..20d8b2ec2b3b4a 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,5 +1,6 @@ { "name": "azure-macro-utils-c", "version-date": "2022-01-21", - "description": "A library of macros for the Azure IoT SDK Suite" + "description": "A library of macros for the Azure IoT SDK Suite", + "license": "MIT" } From 720a0bcfffa41868df9247d5d72f098c8e771089 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 23:33:36 -0800 Subject: [PATCH 24/38] Add license --- ports/umock-c/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 2a8e27801d9ae1..37d1a4525eceeb 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -5,5 +5,6 @@ "homepage": "https://github.com/Azure/umock-c", "dependencies": [ "azure-macro-utils-c" - ] + ], + "license": "MIT" } From 919db485d5b732db5a12c8ee04f6d732607fac54 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Thu, 2 Feb 2023 23:50:25 -0800 Subject: [PATCH 25/38] Fix formatting --- ports/umock-c/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 37d1a4525eceeb..0f0d1e02371a06 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -3,8 +3,8 @@ "version-date": "2022-01-21", "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", + "license": "MIT", "dependencies": [ "azure-macro-utils-c" - ], - "license": "MIT" + ] } From ca295bd750d7c0f79e9914ce0968df1c75722e19 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 00:12:42 -0800 Subject: [PATCH 26/38] Change function calls --- ports/azure-macro-utils-c/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index f69109ae2324e8..060b75a876e614 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_github( FILE_DISAMBIGUATOR 1 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Drun_int_tests=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils) From 58386a8d73efcac58769ecc5eec4e1b7f801b071 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 00:15:27 -0800 Subject: [PATCH 27/38] Change function calls --- ports/umock-c/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake index 0761e1cde90450..6946cd5cbf584e 100644 --- a/ports/umock-c/portfile.cmake +++ b/ports/umock-c/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Drun_unittests=OFF -Drun_int_tests=OFF -Duse_installed_dependencies=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/umock_c) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) From a7cf8da52f15476de7ecf88d3965d94c1c29576d Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Fri, 3 Feb 2023 00:18:30 -0800 Subject: [PATCH 28/38] Update versions again --- versions/a-/azure-macro-utils-c.json | 2 +- versions/u-/umock-c.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index 0ba2c4a116c030..12d88973a163ec 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f65aa7d83f50a1aff407e6bb5addfc59444cb105", + "git-tree": "b6a332cf769a3cf6a8976dbab03e211cfe08d103", "version-date": "2022-01-21", "port-version": 0 }, diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index 3df19c112c15c8..65a8e74055db99 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0a65bfeaf27e6c5706f93b6cc822dc527882629a", + "git-tree": "f6ab05f2f528e5423952ca3191af23a0e69a1953", "version-date": "2022-01-21", "port-version": 0 }, From c0ac0be96a320362101145b88e3677fc6cdb9635 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 10:34:15 -0800 Subject: [PATCH 29/38] Update vcpkg_cmake_config_fixup parameters --- ports/azure-macro-utils-c/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index 060b75a876e614..b61022018a4752 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -10,14 +10,14 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Drun_int_tests=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_macro_utils_c CONFIG_PATH "cmake") file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils) From f23fe9aac0b5e85e324e9f410bfb64bb5de87645 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 10:36:55 -0800 Subject: [PATCH 30/38] Update parameters --- ports/umock-c/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake index 6946cd5cbf584e..7fdff99f125a9a 100644 --- a/ports/umock-c/portfile.cmake +++ b/ports/umock-c/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Drun_unittests=OFF -Drun_int_tests=OFF @@ -18,7 +18,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/umock_c) +vcpkg_cmake_config_fixup(PACKAGE_NAME umock_c CONFIG_PATH "cmake") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) From e2c91070024ff042b41e71e2b1cc41a3f8a08a25 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 10:46:29 -0800 Subject: [PATCH 31/38] Update dependencies --- ports/azure-macro-utils-c/vcpkg.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 20d8b2ec2b3b4a..b4e822e687a480 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -2,5 +2,13 @@ "name": "azure-macro-utils-c", "version-date": "2022-01-21", "description": "A library of macros for the Azure IoT SDK Suite", - "license": "MIT" + "license": "MIT", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } } From e4e1322851822f3f6a43a1951e7d88aa81a934c1 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 10:47:52 -0800 Subject: [PATCH 32/38] Update dependencies --- ports/umock-c/vcpkg.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 0f0d1e02371a06..4e523034b8ea29 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -5,6 +5,14 @@ "homepage": "https://github.com/Azure/umock-c", "license": "MIT", "dependencies": [ - "azure-macro-utils-c" + "azure-macro-utils-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 96e055543945e2e84451008d911bb5a76e80c013 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 10:50:03 -0800 Subject: [PATCH 33/38] Update formatting --- ports/azure-macro-utils-c/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index b4e822e687a480..923051595e6b36 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -4,8 +4,8 @@ "description": "A library of macros for the Azure IoT SDK Suite", "license": "MIT", { - "name": "vcpkg-cmake", - "host": true + "name": "vcpkg-cmake", + "host": true }, { "name": "vcpkg-cmake-config", From 3fd2758393d9c3c515614f80b22b718d2e75a8e6 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 11:00:04 -0800 Subject: [PATCH 34/38] Update dependencies formatting --- ports/azure-macro-utils-c/vcpkg.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 923051595e6b36..258b916139b8b0 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -3,12 +3,14 @@ "version-date": "2022-01-21", "description": "A library of macros for the Azure IoT SDK Suite", "license": "MIT", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], } From 174da5f41822b3ebfa6de8952a1ceb0ba69f013a Mon Sep 17 00:00:00 2001 From: Jose Sanchez <108306325+JoseSanchez7@users.noreply.github.com> Date: Fri, 3 Feb 2023 11:01:58 -0800 Subject: [PATCH 35/38] remove comma --- ports/azure-macro-utils-c/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 258b916139b8b0..90fe79df25f58c 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -12,5 +12,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], + ] } From 68cb47ceb4b7172b99ed9de3c045e00a35c77279 Mon Sep 17 00:00:00 2001 From: JoseSanchez7 Date: Fri, 3 Feb 2023 11:14:22 -0800 Subject: [PATCH 36/38] Update version --- versions/a-/azure-macro-utils-c.json | 2 +- versions/u-/umock-c.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index 12d88973a163ec..d6a726a5256d03 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b6a332cf769a3cf6a8976dbab03e211cfe08d103", + "git-tree": "38ffed1b2623d28120cfadb97c2576a19b867f0c", "version-date": "2022-01-21", "port-version": 0 }, diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index 65a8e74055db99..b1b97040f97fe2 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f6ab05f2f528e5423952ca3191af23a0e69a1953", + "git-tree": "f8744584bc06f347a77f59ecfe150c15b2307b03", "version-date": "2022-01-21", "port-version": 0 }, From f4c243c837aa9bf0b36901351e3aa2b6058c88cd Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 3 Feb 2023 12:05:25 -0800 Subject: [PATCH 37/38] Bump necessary port versions for azure-macro-utils-c and umock-c. --- ports/azure-macro-utils-c/vcpkg.json | 1 + ports/umock-c/vcpkg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 90fe79df25f58c..ab060e5cf272b0 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-macro-utils-c", "version-date": "2022-01-21", + "port-version": 1, "description": "A library of macros for the Azure IoT SDK Suite", "license": "MIT", "dependencies": [ diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 4e523034b8ea29..2c1f35913a64bf 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "umock-c", "version-date": "2022-01-21", + "port-version": 1, "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", "license": "MIT", From 5bd9d31fbdf24a023f2f5efeef9357d09b3072df Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 3 Feb 2023 12:06:06 -0800 Subject: [PATCH 38/38] Fix version database. --- versions/a-/azure-iot-sdk-c.json | 5 ----- versions/a-/azure-macro-utils-c.json | 7 ++++++- versions/baseline.json | 4 ++-- versions/u-/umock-c.json | 7 ++++++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 1b382122323abc..0b98f438acbf42 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -5,11 +5,6 @@ "version-date": "2023-01-18", "port-version": 0 }, - { - "git-tree": "8bf49fe94cff0133a07607eb1682005fee4d765c", - "version-date": "2023-01-18", - "port-version": 1 - }, { "git-tree": "9cb7368d6494ab01b085cad166bb7fef06cd14e7", "version-date": "2022-09-15", diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index d6a726a5256d03..7bfdbf8ecc3c70 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "38ffed1b2623d28120cfadb97c2576a19b867f0c", + "git-tree": "9fd2347e1746c45e04e42e0a98b88a147ec366c8", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b", "version-date": "2022-01-21", "port-version": 0 }, diff --git a/versions/baseline.json b/versions/baseline.json index e8d4542f2145c1..10e79709ec54fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -386,7 +386,7 @@ }, "azure-macro-utils-c": { "baseline": "2022-01-21", - "port-version": 0 + "port-version": 1 }, "azure-security-attestation-cpp": { "baseline": "1.0.0", @@ -7846,7 +7846,7 @@ }, "umock-c": { "baseline": "2022-01-21", - "port-version": 0 + "port-version": 1 }, "unicorn": { "baseline": "1.0.3", diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index b1b97040f97fe2..78f1c548116469 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "f8744584bc06f347a77f59ecfe150c15b2307b03", + "git-tree": "524700bc9f0f017f7bbaa82086e967fec2b023d8", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15", "version-date": "2022-01-21", "port-version": 0 },