From 4055b90f22bcb0edeebc861918f1cb9dc8c24559 Mon Sep 17 00:00:00 2001
From: Alonso Mondal <alonsomondal@microsoft.com>
Date: Mon, 23 Jun 2025 17:12:11 -0700
Subject: [PATCH 1/3] Updating paths to ExtensionLibrary.props for XCurl

---
 Build/libHttpClient.import.props | 5 ++++-
 libHttpClient.props              | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Build/libHttpClient.import.props b/Build/libHttpClient.import.props
index 24897d8a..7d9064fe 100644
--- a/Build/libHttpClient.import.props
+++ b/Build/libHttpClient.import.props
@@ -65,7 +65,10 @@
   </ItemDefinitionGroup>
 
   <!--Bring in XCurl on GDK-->
-  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != ''">
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' == '251000' ">
+    <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' != '251000'">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>
diff --git a/libHttpClient.props b/libHttpClient.props
index c78b42ca..aaf73ed6 100644
--- a/libHttpClient.props
+++ b/libHttpClient.props
@@ -91,7 +91,10 @@
   <Import Condition="'$(OpenSslImported)' != 'true' and '$(useWsppWebsockets)' == 'true'" Project="$(HCBuildRoot)\openssl.import.props" />
 
   <!--Bring in XCurl on GDK-->
-  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != ''">
+  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' == '251000' ">
+    <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' != '251000' ">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>

From 0cddf3568c946f0ffd8577926acdaaf59db45d9a Mon Sep 17 00:00:00 2001
From: Alonso Mondal <alonsomondal@microsoft.com>
Date: Mon, 23 Jun 2025 17:46:21 -0700
Subject: [PATCH 2/3] replacing gdkver condition for props file existing
 condition

---
 Build/libHttpClient.import.props | 4 ++--
 libHttpClient.props              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Build/libHttpClient.import.props b/Build/libHttpClient.import.props
index 7d9064fe..dc539244 100644
--- a/Build/libHttpClient.import.props
+++ b/Build/libHttpClient.import.props
@@ -65,10 +65,10 @@
   </ItemDefinitionGroup>
 
   <!--Bring in XCurl on GDK-->
-  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' == '251000' ">
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props'">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' != '251000'">
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props'">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>
diff --git a/libHttpClient.props b/libHttpClient.props
index aaf73ed6..8625d056 100644
--- a/libHttpClient.props
+++ b/libHttpClient.props
@@ -91,10 +91,10 @@
   <Import Condition="'$(OpenSslImported)' != 'true' and '$(useWsppWebsockets)' == 'true'" Project="$(HCBuildRoot)\openssl.import.props" />
 
   <!--Bring in XCurl on GDK-->
-  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' == '251000' ">
+  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props')">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND '$(GDKVer)' != '251000' ">
+  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props'">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>

From e92618f5eab70ccfda84eac1173b9275b4308fd8 Mon Sep 17 00:00:00 2001
From: Alonso Mondal <alonsomondal@microsoft.com>
Date: Mon, 23 Jun 2025 18:23:12 -0700
Subject: [PATCH 3/3] missing parenthesis in exists conditions

---
 Build/libHttpClient.import.props | 4 ++--
 libHttpClient.props              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Build/libHttpClient.import.props b/Build/libHttpClient.import.props
index dc539244..11dcc86c 100644
--- a/Build/libHttpClient.import.props
+++ b/Build/libHttpClient.import.props
@@ -65,10 +65,10 @@
   </ItemDefinitionGroup>
 
   <!--Bring in XCurl on GDK-->
-  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props'">
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props')">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props'">
+  <ImportGroup Condition="'$(HCPlatform)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props')">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>
diff --git a/libHttpClient.props b/libHttpClient.props
index 8625d056..c8219d0c 100644
--- a/libHttpClient.props
+++ b/libHttpClient.props
@@ -94,7 +94,7 @@
   <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props')">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\ExtensionLibrary.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props'">
+  <ImportGroup Condition="'$(HCLibPlatformType)' == 'GDK' AND '$(GameDK)' != '' AND exists('$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props')">
     <Import Project="$(GameDK)\$(XdkEditionTarget)\GRDK\ExtensionLibraries\Xbox.XCurl.API\DesignTime\CommonConfiguration\neutral\ExtensionLibrary.props"/>
   </ImportGroup>
   <ItemDefinitionGroup>