Nitpick on using identical patch file.

microsoft · Jul 22, 2022 · e564bf4 · e564bf4
1 parent 8b352cf
commit e564bf4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/...metry-cpp/use-opentelemetry-cpp-141.patch → ...core-tracing-opentelemetry-cpp/3844.patch b/...metry-cpp/use-opentelemetry-cpp-141.patch → ...core-tracing-opentelemetry-cpp/3844.patch
@@ -1,5 +1,14 @@
+From e1fd9ed9f476fc94f4143df6ba8b683113af33ed Mon Sep 17 00:00:00 2001
+From: Larry Osterman <[email protected]>
+Date: Fri, 22 Jul 2022 11:37:48 -0700
+Subject: [PATCH] Removed hard dependency on opentelemetry version
+
+---
+ sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
-index bf3077e..2bd6d91 100644
+index bf3077e676..6d0dc15151 100644
 --- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
 +++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
 @@ -36,7 +36,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)

diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -4,9 +4,8 @@ vcpkg_from_github(
     REF azure-core-tracing-opentelemetry_1.0.0-beta.2
     SHA512 a0697ed440a08f3814013adf476c2a1333b462a2eb96bac18c47939c54686396639935568e229dad6bbbae06f54c324da82544634c6384a2c1498f9959836b6d
     PATCHES
-        "use-opentelemetry-cpp-141.patch"
+        "3844.patch" # https://github.com/Azure/azure-sdk-for-cpp/pull/3844 "Removed hard dependency on opentelemetry version"
 )
-# Removed hard dependency on specific opentelemetry-cpp version as per https://github.com/Azure/azure-sdk-for-cpp/pull/3844
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/

diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "866faac3caba27757dbe0b52c76e31cba7589011",
+      "git-tree": "e0228c8ec49e7dbde7c7044c915945425ce5092d",
       "version-semver": "1.0.0-beta.2",
       "port-version": 1
     },