From a58ddf985e42e077c87350182c33db0c169871c4 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Thu, 20 Nov 2025 12:48:08 -0800
Subject: [PATCH 01/22] Add VS2022 pipeline (so we can build ARM64)

---
 Utilities/Pipelines/libHttpClient.CI.yml | 54 +++++++++++++-----------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 95a87dee..4a4b3c1b 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -65,30 +65,36 @@ jobs:
   # Visual Studio 2022
   ####################
 
-  # - job: Win32Vs22Build
-  #   displayName: libHttpClient Win32/UWP VS2022 Build
-  #   pool:
-  #     name: VS2022-pool
-  #   timeoutInMinutes: 180
-  #   strategy:
-  #     matrix:
-  #       x86_Debug:
-  #         Platform: x86
-  #         Configuration: Debug
-  #       x64_Debug:
-  #         Platform: x64
-  #         Configuration: Debug
-  #       x86_Release:
-  #         Platform: x86
-  #         Configuration: Release
-  #       x64_Release:
-  #         Platform: x64
-  #         Configuration: Release
-  #   steps:
-  #     - template: Tasks/vs2022-build.yml
-  #       parameters:
-  #         platform: $(Platform)
-  #         configuration: $(Configuration)
+  - job: Win32Vs22Build
+    displayName: libHttpClient Win32/UWP VS2022 Build
+    pool:
+      name: windows-2022
+    timeoutInMinutes: 240
+    strategy:
+      matrix:
+        x86_Debug:
+          Platform: x86
+          Configuration: Debug
+        x64_Debug:
+          Platform: x64
+          Configuration: Debug
+        ARM64_Debug:
+          Platform: ARM64
+          Configuration: Debug
+        x86_Release:
+          Platform: x86
+          Configuration: Release
+        x64_Release:
+          Platform: x64
+          Configuration: Release
+        ARM64_Release:
+          Platform: ARM64
+          Configuration: Release
+    steps:
+      - template: Tasks/vs2022-build.yml
+        parameters:
+          platform: $(Platform)
+          configuration: $(Configuration)
 
   ####################
   # Android

From e44b9296f19a6b30a8243c2d4e227a4d8fe3f89b Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Thu, 20 Nov 2025 13:58:32 -0800
Subject: [PATCH 02/22] Flip from pool name to vmImage

---
 Utilities/Pipelines/libHttpClient.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 4a4b3c1b..d6133039 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -68,7 +68,7 @@ jobs:
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
     pool:
-      name: windows-2022
+      vmImage: windows-2022
     timeoutInMinutes: 240
     strategy:
       matrix:

From e0f6ec6c272ffb6eb11c224f98f3aa2797b1e13e Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Thu, 20 Nov 2025 14:49:35 -0800
Subject: [PATCH 03/22] Release|x64 was missing lhc.GDK and lhc.143.GDK.C
 projects

---
 libHttpClient.vs2022.sln | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libHttpClient.vs2022.sln b/libHttpClient.vs2022.sln
index dffe792a..178f4ed8 100644
--- a/libHttpClient.vs2022.sln
+++ b/libHttpClient.vs2022.sln
@@ -123,7 +123,8 @@ Global
 		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|ARM64.Build.0 = Release|ARM64
 		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
 		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
-		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
+		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.ActiveCfg = Release|x64
+		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.Build.0 = Release|x64
 		{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x86.ActiveCfg = Release|Gaming.Desktop.x64
 		{AAF08544-8AAA-41A5-A86B-2AF4D8985258}.Debug|ARM.ActiveCfg = Debug|ARM
 		{AAF08544-8AAA-41A5-A86B-2AF4D8985258}.Debug|ARM.Build.0 = Debug|ARM
@@ -358,7 +359,8 @@ Global
 		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM64.Build.0 = Release|ARM64
 		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
 		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
-		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
+		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.ActiveCfg = Release|x64
+		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.Build.0 = Release|x64
 		{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x86.ActiveCfg = Release|Gaming.Desktop.x64
 		{30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM.ActiveCfg = Debug|Gaming.Desktop.x64
 		{30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM.Build.0 = Debug|Gaming.Desktop.x64

From 0cb1606e40ac9868388f916b931112e7be9f580f Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Thu, 20 Nov 2025 15:14:03 -0800
Subject: [PATCH 04/22] Comment non-ARM64 builds to speed up iteration

---
 Utilities/Pipelines/libHttpClient.CI.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index d6133039..e910fb5c 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -72,21 +72,21 @@ jobs:
     timeoutInMinutes: 240
     strategy:
       matrix:
-        x86_Debug:
-          Platform: x86
-          Configuration: Debug
-        x64_Debug:
-          Platform: x64
-          Configuration: Debug
+        # x86_Debug:
+        #   Platform: x86
+        #   Configuration: Debug
+        # x64_Debug:
+        #   Platform: x64
+        #   Configuration: Debug
         ARM64_Debug:
           Platform: ARM64
           Configuration: Debug
-        x86_Release:
-          Platform: x86
-          Configuration: Release
-        x64_Release:
-          Platform: x64
-          Configuration: Release
+        # x86_Release:
+        #   Platform: x86
+        #   Configuration: Release
+        # x64_Release:
+        #   Platform: x64
+        #   Configuration: Release
         ARM64_Release:
           Platform: ARM64
           Configuration: Release

From d396a1bc537eddd5319ecd577b6e29204365dabe Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 07:28:32 -0800
Subject: [PATCH 05/22] Attempt to pull in GDKX repo

---
 Utilities/Pipelines/libHttpClient.CI.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index e910fb5c..580feb0b 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -67,6 +67,11 @@ jobs:
 
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
+    resources:
+      repositories:
+        - repository: gdkx
+          type: git
+          name: Xbox.Services.sdk.external
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240
@@ -91,6 +96,14 @@ jobs:
           Platform: ARM64
           Configuration: Release
     steps:
+      - checkout: self
+        clean: true
+        persistedCredentials: true
+
+      - checkout: gdkx
+        clean: true
+        path: s/externals/gdkx
+
       - template: Tasks/vs2022-build.yml
         parameters:
           platform: $(Platform)

From 0351a716af2272cbd6e2cbef6660b9ba33b5fc90 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 07:37:00 -0800
Subject: [PATCH 06/22] Do-over with github syntax

---
 Utilities/Pipelines/libHttpClient.CI.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 580feb0b..040ce433 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -67,11 +67,6 @@ jobs:
 
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
-    resources:
-      repositories:
-        - repository: gdkx
-          type: git
-          name: Xbox.Services.sdk.external
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240
@@ -96,13 +91,19 @@ jobs:
           Platform: ARM64
           Configuration: Release
     steps:
-      - checkout: self
-        clean: true
-        persistedCredentials: true
+      - name: Checkout libhttpclient
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - checkout: gdkx
+      - name: Checkout GDKX SDK External
         clean: true
-        path: s/externals/gdkx
+        uses: actions/checkout@v4
+        with:
+          repository: microsoft/Xbox.Services.sdk.external
+          ref: main
+          path: externals/gdkx
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - template: Tasks/vs2022-build.yml
         parameters:

From be02ab21790663f104c34aa3aa7f2b5b25f365ce Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 07:46:19 -0800
Subject: [PATCH 07/22] Try different syntax

---
 Utilities/Pipelines/libHttpClient.CI.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 040ce433..c5e70918 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -91,19 +91,10 @@ jobs:
           Platform: ARM64
           Configuration: Release
     steps:
-      - name: Checkout libhttpclient
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Checkout GDKX SDK External
+      - checkout: gdkx
+        repository: Xbox.Services/sdk.external
         clean: true
-        uses: actions/checkout@v4
-        with:
-          repository: microsoft/Xbox.Services.sdk.external
-          ref: main
-          path: externals/gdkx
-          token: ${{ secrets.GITHUB_TOKEN }}
+        path: s/externals/gdkx
 
       - template: Tasks/vs2022-build.yml
         parameters:

From 32cb74ba73dc2dea4f28ab3421921ebf7bcd50c3 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 10:25:11 -0800
Subject: [PATCH 08/22] Specify repo

---
 Utilities/Pipelines/libHttpClient.CI.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index c5e70918..591ed8c8 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -91,8 +91,7 @@ jobs:
           Platform: ARM64
           Configuration: Release
     steps:
-      - checkout: gdkx
-        repository: Xbox.Services/sdk.external
+      - checkout: git://Xbox.Services/sdk.external
         clean: true
         path: s/externals/gdkx
 

From 2803080b039ad1840ccae6e41f2488c4daf10f00 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 10:54:31 -0800
Subject: [PATCH 09/22] Get GDK.PC from NuGet

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 10 +++++++++-
 Utilities/Pipelines/libHttpClient.CI.yml   |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 9d6d138d..e3c5c25b 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -12,7 +12,15 @@ steps:
     inputs:
       versionSpec: 5.8
 
-  - task: NuGetAuthenticate@0
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet authenticate'
+
+  # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
+  - script: |
+      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$(Pipeline.Workspace)/gdk" -DirectDownload
+      echo "GDK installed to $(Pipeline.Workspace)/gdk"
+      echo "GDK=$GameDK"
+      ls "$GameDK"
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 591ed8c8..e910fb5c 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -91,10 +91,6 @@ jobs:
           Platform: ARM64
           Configuration: Release
     steps:
-      - checkout: git://Xbox.Services/sdk.external
-        clean: true
-        path: s/externals/gdkx
-
       - template: Tasks/vs2022-build.yml
         parameters:
           platform: $(Platform)

From f6bfed0e7a1da027a97a20912590d775afb4c29d Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:05:16 -0800
Subject: [PATCH 10/22] Improve GDK installation

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index e3c5c25b..2657232a 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -19,8 +19,11 @@ steps:
   - script: |
       nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$(Pipeline.Workspace)/gdk" -DirectDownload
       echo "GDK installed to $(Pipeline.Workspace)/gdk"
-      echo "GDK=$GameDK"
+      echo "GameDK=$GameDK"
       ls "$GameDK"
+    displayName: 'Install GDK via NuGet'
+    env:
+      GameDK: $(Pipeline.Workspace)/gdk
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2

From be23e7bca30057c77edd7a9de65e5f347313ea2f Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:16:42 -0800
Subject: [PATCH 11/22] Make GameDK job-level

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 7 ++-----
 Utilities/Pipelines/libHttpClient.CI.yml   | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 2657232a..49021a6a 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -17,13 +17,10 @@ steps:
 
   # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
   - script: |
-      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$(Pipeline.Workspace)/gdk" -DirectDownload
-      echo "GDK installed to $(Pipeline.Workspace)/gdk"
-      echo "GameDK=$GameDK"
+      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$GameDK" -DirectDownload
+      echo "GDK installed to $(Pipeline.Workspace)/gdk $GameDK"
       ls "$GameDK"
     displayName: 'Install GDK via NuGet'
-    env:
-      GameDK: $(Pipeline.Workspace)/gdk
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index e910fb5c..fdfdd381 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -67,6 +67,8 @@ jobs:
 
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
+    variables:
+      GameDK: $(Pipeline.Workspace)/gdk
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240

From 88b9f2fe0caa9d70be8773a82abe62f4c25047b0 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:35:06 -0800
Subject: [PATCH 12/22] Fix paths for GDK

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 6 +++---
 Utilities/Pipelines/libHttpClient.CI.yml   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 49021a6a..437e13ab 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -18,9 +18,9 @@ steps:
   # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
   - script: |
       nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$GameDK" -DirectDownload
-      echo "GDK installed to $(Pipeline.Workspace)/gdk $GameDK"
-      ls "$GameDK"
-    displayName: 'Install GDK via NuGet'
+      echo "GDK installed to $(Pipeline.Workspace)/gdk $GameDK %GameDK%"
+      ls "%GameDK%"
+    displayName: 'Install GDK.PC via NuGet'
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index fdfdd381..f7ee2cff 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -69,6 +69,7 @@ jobs:
     displayName: libHttpClient Win32/UWP VS2022 Build
     variables:
       GameDK: $(Pipeline.Workspace)/gdk
+      GameDKCoreLatest: $(Pipeline.Workspace)\gdk\251000\
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240

From 79aaee65c79b2a2d985ca389a447b9e2b50459c4 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:38:07 -0800
Subject: [PATCH 13/22] Update Android build to windows-2022 as 2019 is gone

---
 Utilities/Pipelines/libHttpClient.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index f7ee2cff..1cefc88f 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -106,7 +106,7 @@ jobs:
   - job: AndroidBuild
     displayName: libHttpClient Android Build
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2022
     timeoutInMinutes: 180
     strategy:
       matrix:

From d70c6e346ec371fcd5697f553aa30c8c32b3132f Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:45:56 -0800
Subject: [PATCH 14/22] Fix paths for GDK some more

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 4 ++--
 Utilities/Pipelines/libHttpClient.CI.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 437e13ab..8dd7d362 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -17,8 +17,8 @@ steps:
 
   # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
   - script: |
-      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "$GameDK" -DirectDownload
-      echo "GDK installed to $(Pipeline.Workspace)/gdk $GameDK %GameDK%"
+      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
+      echo "GDK installed to $(Pipeline.Workspace)\gdk %GameDK%"
       ls "%GameDK%"
     displayName: 'Install GDK.PC via NuGet'
 
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 1cefc88f..a72dd1c4 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -68,8 +68,8 @@ jobs:
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
     variables:
-      GameDK: $(Pipeline.Workspace)/gdk
-      GameDKCoreLatest: $(Pipeline.Workspace)\gdk\251000\
+      GameDK: $(Pipeline.Workspace)\gdk
+      GameDKCoreLatest: $(GameDK)\251000\
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240

From 5e509c0902cb680572d1df9aefc38c106b7bea9c Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 11:52:29 -0800
Subject: [PATCH 15/22] Undo Android change

---
 Utilities/Pipelines/libHttpClient.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index a72dd1c4..dd760028 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -106,7 +106,7 @@ jobs:
   - job: AndroidBuild
     displayName: libHttpClient Android Build
     pool:
-      vmImage: windows-2022
+      vmImage: windows-2019
     timeoutInMinutes: 180
     strategy:
       matrix:

From d52b5c3a7a3326cb6bfb7d992f22c54711508629 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 12:22:46 -0800
Subject: [PATCH 16/22] Fix GDK path so it knows its October

---
 Utilities/Pipelines/libHttpClient.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index dd760028..02d650b8 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -69,7 +69,7 @@ jobs:
     displayName: libHttpClient Win32/UWP VS2022 Build
     variables:
       GameDK: $(Pipeline.Workspace)\gdk
-      GameDKCoreLatest: $(GameDK)\251000\
+      GameDKCoreLatest: $(GameDK)\Microsoft.GDK.PC.2510.0.6194\native\251000\
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240

From 3430cfcb98514688590d4d76fcea8f1b174494c5 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 12:39:02 -0800
Subject: [PATCH 17/22] Use GDK.Windows instead of GDK.PC for NuGet, to get
 windows directory

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 7 ++++---
 Utilities/Pipelines/libHttpClient.CI.yml   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 8dd7d362..7a8b66c7 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -17,10 +17,11 @@ steps:
 
   # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
   - script: |
-      nuget install Microsoft.GDK.PC -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
-      echo "GDK installed to $(Pipeline.Workspace)\gdk %GameDK%"
+      nuget install Microsoft.GDK.Windows -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
+      echo "GDK installed to %GameDK%"
       ls "%GameDK%"
-    displayName: 'Install GDK.PC via NuGet'
+      ls "%GameDKCoreLatest%"
+    displayName: 'Install GDK.Windows via NuGet'
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 02d650b8..07c442bb 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -69,7 +69,7 @@ jobs:
     displayName: libHttpClient Win32/UWP VS2022 Build
     variables:
       GameDK: $(Pipeline.Workspace)\gdk
-      GameDKCoreLatest: $(GameDK)\Microsoft.GDK.PC.2510.0.6194\native\251000\
+      GameDKCoreLatest: $(GameDK)\Microsoft.GDK.Windows.2510.0.6194\native\251000\
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240

From 06cab11aef452cc902ecd4a391c3583981a339b7 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 12:48:16 -0800
Subject: [PATCH 18/22] Debug to figure out the directory problem

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index 7a8b66c7..f695d005 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -20,6 +20,15 @@ steps:
       nuget install Microsoft.GDK.Windows -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
       echo "GDK installed to %GameDK%"
       ls "%GameDK%"
+      echo "1"
+      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194"
+      echo "2"
+      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native"
+      echo "3"
+      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
+      echo "4"
+      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
+      echo "5"
       ls "%GameDKCoreLatest%"
     displayName: 'Install GDK.Windows via NuGet'
 

From c7bf618b58e7fb1a385d96ca8c6cef8a7803032e Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 12:57:23 -0800
Subject: [PATCH 19/22] Debug to figure out the directory problem #2

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index f695d005..c6869c3b 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -20,15 +20,15 @@ steps:
       nuget install Microsoft.GDK.Windows -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
       echo "GDK installed to %GameDK%"
       ls "%GameDK%"
-      echo "1"
+      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194"
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194"
-      echo "2"
+      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native"
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native"
-      echo "3"
+      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
-      echo "4"
+      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
-      echo "5"
+      echo "* %GameDKCoreLatest%"
       ls "%GameDKCoreLatest%"
     displayName: 'Install GDK.Windows via NuGet'
 

From 8ba9013b80e18bc6e67920cb498f059b994de55e Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 12:58:03 -0800
Subject: [PATCH 20/22] Disable Android as the vm is gone now

---
 Utilities/Pipelines/libHttpClient.CI.yml | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 07c442bb..3613e317 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -103,21 +103,21 @@ jobs:
   # Android
   ####################
 
-  - job: AndroidBuild
-    displayName: libHttpClient Android Build
-    pool:
-      vmImage: windows-2019
-    timeoutInMinutes: 180
-    strategy:
-      matrix:
-        Debug:
-          Configuration: Debug
-        Release:
-          Configuration: Release
-    steps:
-      - template: Tasks/android-build.yml
-        parameters:
-          configuration: $(Configuration)
+  # - job: AndroidBuild
+  #   displayName: libHttpClient Android Build
+  #   pool:
+  #     vmImage: windows-2019
+  #   timeoutInMinutes: 180
+  #   strategy:
+  #     matrix:
+  #       Debug:
+  #         Configuration: Debug
+  #       Release:
+  #         Configuration: Release
+  #   steps:
+  #     - template: Tasks/android-build.yml
+  #       parameters:
+  #         configuration: $(Configuration)
 
   ####################
   # iOS

From fbe43acb1cc98d0d218aad64be9505220c083157 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 13:03:53 -0800
Subject: [PATCH 21/22] Debug to figure out the directory problem #3

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index c6869c3b..ced90972 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -28,8 +28,7 @@ steps:
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
       echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
       ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
-      echo "* %GameDKCoreLatest%"
-      ls "%GameDKCoreLatest%"
+      echo "GameDKCoreLatest=%GameDKCoreLatest%"
     displayName: 'Install GDK.Windows via NuGet'
 
   # Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.

From 556c66eb42e9ba1e75a1cb592b228b03767c64e5 Mon Sep 17 00:00:00 2001
From: Andy Pennell <apennell@microsoft.com>
Date: Fri, 21 Nov 2025 13:29:27 -0800
Subject: [PATCH 22/22] Tidy versions, restore other CPU types

---
 Utilities/Pipelines/Tasks/vs2022-build.yml | 11 +--------
 Utilities/Pipelines/libHttpClient.CI.yml   | 28 ++++++++++++----------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml
index ced90972..99fd8b61 100644
--- a/Utilities/Pipelines/Tasks/vs2022-build.yml
+++ b/Utilities/Pipelines/Tasks/vs2022-build.yml
@@ -17,17 +17,8 @@ steps:
 
   # Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
   - script: |
-      nuget install Microsoft.GDK.Windows -Version 2510.0.6194 -OutputDirectory "%GameDK%" -DirectDownload
+      nuget install Microsoft.GDK.Windows -Version %GDKNugetVersion% -OutputDirectory "%GameDK%" -DirectDownload
       echo "GDK installed to %GameDK%"
-      ls "%GameDK%"
-      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194"
-      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194"
-      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native"
-      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native"
-      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
-      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000"
-      echo "* %GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
-      ls "%GameDK%\Microsoft.GDK.Windows.2510.0.6194\native\251000\windows"
       echo "GameDKCoreLatest=%GameDKCoreLatest%"
     displayName: 'Install GDK.Windows via NuGet'
 
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 3613e317..6bb0e0b9 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -68,28 +68,30 @@ jobs:
   - job: Win32Vs22Build
     displayName: libHttpClient Win32/UWP VS2022 Build
     variables:
+      GDKNugetVersion: 2510.0.6194
+      GDKVersion: 251000
       GameDK: $(Pipeline.Workspace)\gdk
-      GameDKCoreLatest: $(GameDK)\Microsoft.GDK.Windows.2510.0.6194\native\251000\
+      GameDKCoreLatest: $(GameDK)\Microsoft.GDK.Windows.$(GDKNugetVersion)\native\$(GDKVersion)\
     pool:
       vmImage: windows-2022
     timeoutInMinutes: 240
     strategy:
       matrix:
-        # x86_Debug:
-        #   Platform: x86
-        #   Configuration: Debug
-        # x64_Debug:
-        #   Platform: x64
-        #   Configuration: Debug
+        x86_Debug:
+          Platform: x86
+          Configuration: Debug
+        x64_Debug:
+          Platform: x64
+          Configuration: Debug
         ARM64_Debug:
           Platform: ARM64
           Configuration: Debug
-        # x86_Release:
-        #   Platform: x86
-        #   Configuration: Release
-        # x64_Release:
-        #   Platform: x64
-        #   Configuration: Release
+        x86_Release:
+          Platform: x86
+          Configuration: Release
+        x64_Release:
+          Platform: x64
+          Configuration: Release
         ARM64_Release:
           Platform: ARM64
           Configuration: Release