From 6979126ad8499b4a1209ff95287cc98512a13b85 Mon Sep 17 00:00:00 2001
From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com>
Date: Sat, 28 Oct 2023 15:28:51 -0700
Subject: [PATCH] Small cleanup around AMQP dependencies (#5083)

* Small cleanup around AMQP dependencies

* Update cfgmanifest.json to remove uamqp, and add umock, csharedutil, and macro-utils-c

---------

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
---
 sdk/core/azure-core-amqp/cgmanifest.json      | 22 +++++++++++++++++--
 .../azure-core-amqp/vcpkg/Config.cmake.in     |  1 -
 sdk/core/azure-core-amqp/vcpkg/vcpkg.json     |  2 +-
 .../vcpkg/vcpkg.json                          |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/sdk/core/azure-core-amqp/cgmanifest.json b/sdk/core/azure-core-amqp/cgmanifest.json
index bd66936c4..976cf47fe 100644
--- a/sdk/core/azure-core-amqp/cgmanifest.json
+++ b/sdk/core/azure-core-amqp/cgmanifest.json
@@ -5,8 +5,8 @@
       "Component": {
         "Type": "git",
         "git": {
-          "RepositoryUrl": "https://github.com/Azure/azure-uamqp-c",
-          "CommitHash": "b7bdf307a0db8840156d9f6e40f704c1d5924306"
+          "RepositoryUrl": "https://github.com/Azure/azure-c-shared-utility/",
+          "CommitHash": "8ee0e5d88d1771d33e36d38d392ec9d9ae13ea55"
         }
       }
     },
@@ -19,6 +19,24 @@
         }
       },
       "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/Azure/macro-utils-c/",
+          "CommitHash": "5926caf4e42e98e730e6d03395788205649a3ada"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/Azure/umock-c/",
+          "CommitHash": "504193e65d1c2f6eb50c15357167600a296df7ff"
+        }
+      }
     }
   ]
 }
diff --git a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
index 062106828..89610e83e 100644
--- a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
+++ b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
@@ -6,7 +6,6 @@
 include(CMakeFindDependencyMacro)
 find_dependency(azure-core-cpp)
 
-find_dependency(uamqp)
 find_dependency(umock_c)
 find_dependency(azure_macro_utils_c)
 find_dependency(azure_c_shared_utility)
diff --git a/sdk/core/azure-core-amqp/vcpkg/vcpkg.json b/sdk/core/azure-core-amqp/vcpkg/vcpkg.json
index 79f6c8f57..10e0be0e3 100644
--- a/sdk/core/azure-core-amqp/vcpkg/vcpkg.json
+++ b/sdk/core/azure-core-amqp/vcpkg/vcpkg.json
@@ -12,12 +12,12 @@
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
+    "azure-c-shared-utility",
     {
       "name": "azure-core-cpp",
       "default-features": false,
       "version>=": "1.10.0"
     },
-    "azure-c-shared-utility",
     "azure-macro-utils-c",
     "umock-c",
     {
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json
index 73a7a1096..d7a139827 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json
+++ b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json
@@ -14,7 +14,7 @@
     {
       "name": "azure-core-amqp-cpp",
       "default-features": false,
-      "version>=": "1.0.0-beta.2"
+      "version>=": "1.0.0-beta.5"
     },
     {
       "name": "vcpkg-cmake",