[azure-iot-sdk-c] LTS_01_2023_REF01

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 9e4322c9d88095ed276bf7e4b31b87b82b1c4d86
-        SHA512 0ede2a30ed787028a48602111be7cebc65593a84a8b3dc94ed34917f44355a180d8b8acf2b6404e47428fe8f761c11485199e9bd2e9aa6628548c585357f63e8
-        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}"

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",
@@ -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"
-          ]
-        }
-      ]
-    }
-  }
+  ]
 }

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 3fd808bee3c88f8578dcc30c0a6d1d396c172070
-        SHA512 2ee26791aca7732d21fe91cbb51be35d1589161d1d7b54542ac1a1277f1a95eb7e1d5ced7be117ce326dd118169e20ffc6bcd0ea9fd8ac9442bd466bc048f1ea
-        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

ports/azure-iot-sdk-c/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "azure-iot-sdk-c",
-  "version-date": "2022-09-15",
-  "port-version": 1,
+  "version-date": "2023-01-18",
   "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
   "homepage": "https://github.com/Azure/azure-iot-sdk-c",
   "license": "MIT",
@@ -21,51 +20,5 @@
       "name": "vcpkg-cmake-config",
       "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": {
-      "description": "Enables device provisioning client for DPS"
-    }
-  }
+  ]
 }

ports/azure-macro-utils-c/portfile.cmake

@@ -1,35 +1,23 @@
 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_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+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_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     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(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)
 

ports/azure-macro-utils-c/vcpkg.json

@@ -2,9 +2,15 @@
   "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)"
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
-  }
+  ]
 }

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 117c8378b80fdafec639dafb6693b7c044281abc
-        SHA512 6726cfb3ecb42d42957b5df94d0b173b566fdd6961814e2b10882e32ae26387a36b05d77c59efbb008b7ed37e276c35128ab4e4adf0739cbf37f5f234626481a
-        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/)
 

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",
@@ -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"
-          ]
-        }
-      ]
-    }
-  }
+  ]
 }

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 2b86b92628e55c9597aef8b96b0a73048ef072b3
-        SHA512 bc4cadaf4f64ffff4d8839fe8f604b77d6a912ab28b6100df93f4c7fbc96fa68a4e09b4670d27d078aac32a2d7792c408aa78a580328c02759c7a1c04d82d721
-        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/)
 

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",
@@ -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"
-          ]
-        }
-      ]
-    }
-  }
+  ]
 }