From f1b67b22df5853100b70c383ed392811605f0e12 Mon Sep 17 00:00:00 2001 From: Andy Pennell Date: Tue, 30 Sep 2025 09:29:18 -0700 Subject: [PATCH 1/5] Build ARM64 similarly to x64 in all cases. --- Build/libHttpClient.GDK.props | 25 +++++++++++++------ .../libHttpClient.GDK.vcxproj | 2 +- libHttpClient.vs2022.sln | 8 +++--- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Build/libHttpClient.GDK.props b/Build/libHttpClient.GDK.props index b0d6bc5c..b73fdd24 100644 --- a/Build/libHttpClient.GDK.props +++ b/Build/libHttpClient.GDK.props @@ -15,7 +15,7 @@ Gaming.Desktop.x64 - + Debug x64 @@ -24,6 +24,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + @@ -69,7 +77,7 @@ - + @@ -77,14 +85,14 @@ - - $(GDKCrossPlatformPath)windows\lib\x64 + + $(GDKCrossPlatformPath)windows\lib\$(Platform) $(GDKCrossPlatformPath)windows\include $(GDKLibPath);$(LibraryPath) $(GDKIncludeRoot);$(IncludePath) - + $(Console_SdkLibPath);$(LibraryPath) $(Console_SdkIncludeRoot);$(IncludePath) @@ -98,10 +106,10 @@ false ProgramDatabase __WRL_NO_DEFAULT_LIB__;_LIB;$(libHttpClientDefine);%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories);$(GDKCrossPlatformPath)GRDK\ExtensionLibraries\Xbox.XCurl.API\Include + %(AdditionalIncludeDirectories);$(GDKCrossPlatformPath)GRDK\ExtensionLibraries\Xbox.XCurl.API\Include Guard /Zc:__cplusplus /ZH:SHA_256 /bigobj /Zi %(AdditionalOptions) - HC_PLATFORM=HC_PLATFORM_GDK;HC_DATAMODEL=HC_DATAMODEL_LLP64;%(PreprocessorDefinitions) + HC_PLATFORM=HC_PLATFORM_GDK;HC_DATAMODEL=HC_DATAMODEL_LLP64;%(PreprocessorDefinitions) stdcpp17 @@ -111,7 +119,8 @@ true $(Console_Libs);%(AdditionalDependencies) xgameruntime.lib;XCurl.lib;%(AdditionalDependencies) - + xgameruntime.lib;%(AdditionalDependencies) + /ignore:4099 /ignore:4264 %(AdditionalOptions) diff --git a/Build/libHttpClient.GDK/libHttpClient.GDK.vcxproj b/Build/libHttpClient.GDK/libHttpClient.GDK.vcxproj index 42bad666..5843ca18 100644 --- a/Build/libHttpClient.GDK/libHttpClient.GDK.vcxproj +++ b/Build/libHttpClient.GDK/libHttpClient.GDK.vcxproj @@ -32,7 +32,7 @@ /Zi /guard:cf %(AdditionalOptions) - true + true diff --git a/libHttpClient.vs2022.sln b/libHttpClient.vs2022.sln index a32dea4b..42362549 100644 --- a/libHttpClient.vs2022.sln +++ b/libHttpClient.vs2022.sln @@ -111,7 +111,8 @@ Global {9164C6C9-3872-4922-A3E3-3822622D3E71}.Release|x86.ActiveCfg = Release|Win32 {9164C6C9-3872-4922-A3E3-3822622D3E71}.Release|x86.Build.0 = Release|Win32 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|ARM.ActiveCfg = Debug|Gaming.Desktop.x64 - {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|ARM64.ActiveCfg = Debug|Gaming.Desktop.x64 + {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|ARM64.Build.0 = Debug|ARM64 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|x64.ActiveCfg = Debug|x64 @@ -343,8 +344,8 @@ Global {E35BA8A1-AE7B-4FB5-8200-469B98BC1CA8}.Release|x86.Build.0 = Release|Win32 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM.ActiveCfg = Debug|Gaming.Desktop.x64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM.Build.0 = Debug|Gaming.Desktop.x64 - {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM64.ActiveCfg = Debug|Gaming.Desktop.x64 - {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM64.Build.0 = Debug|Gaming.Desktop.x64 + {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|ARM64.Build.0 = Debug|ARM64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|x64.ActiveCfg = Debug|x64 @@ -361,7 +362,6 @@ Global {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 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM64.ActiveCfg = Debug|Gaming.Desktop.x64 - {30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM64.Build.0 = Debug|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|x64.ActiveCfg = Debug|Gaming.Desktop.x64 From 26687a44746a9dde8b45c80bdd8749abcc7c4dd7 Mon Sep 17 00:00:00 2001 From: Andy Pennell Date: Tue, 30 Sep 2025 14:57:24 -0700 Subject: [PATCH 2/5] Release ARM fixes --- libHttpClient.vs2022.sln | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libHttpClient.vs2022.sln b/libHttpClient.vs2022.sln index 42362549..dffe792a 100644 --- a/libHttpClient.vs2022.sln +++ b/libHttpClient.vs2022.sln @@ -119,7 +119,8 @@ Global {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|x64.Build.0 = Debug|x64 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Debug|x86.ActiveCfg = Debug|Gaming.Desktop.x64 {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|ARM.ActiveCfg = Release|Gaming.Desktop.x64 - {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|ARM64.ActiveCfg = Release|Gaming.Desktop.x64 + {0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|ARM64.ActiveCfg = Release|ARM64 + {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 @@ -353,8 +354,8 @@ Global {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Debug|x86.ActiveCfg = Debug|Gaming.Desktop.x64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM.ActiveCfg = Release|Gaming.Desktop.x64 {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM.Build.0 = Release|Gaming.Desktop.x64 - {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM64.ActiveCfg = Release|Gaming.Desktop.x64 - {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM64.Build.0 = Release|Gaming.Desktop.x64 + {A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM64.ActiveCfg = Release|ARM64 + {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 @@ -369,7 +370,6 @@ Global {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|ARM.ActiveCfg = Release|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|ARM.Build.0 = Release|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|ARM64.ActiveCfg = Release|Gaming.Desktop.x64 - {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|ARM64.Build.0 = Release|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64 {30B33C66-4755-4E79-A518-0E4137A58BEA}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64 From a9948c00efbefebcbef95c134a727721e3ef80a1 Mon Sep 17 00:00:00 2001 From: Andy Pennell Date: Fri, 3 Oct 2025 09:38:20 -0700 Subject: [PATCH 3/5] Pipeline: enable VS2022 build and ARM64 in it --- 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..983248f8 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: VS2022-pool + timeoutInMinutes: 180 + 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 2f8ab219f9fc2e1457217105dce2fd06f9c9e285 Mon Sep 17 00:00:00 2001 From: Andy Pennell Date: Wed, 19 Nov 2025 13:04:58 -0800 Subject: [PATCH 4/5] Update build pool for VS2022 pipeline --- 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 983248f8..e1f4a9f1 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: VS2022-pool + name: playfab_poolA timeoutInMinutes: 180 strategy: matrix: From 83ba4dfdf5f69d762d7c2252844d37eada591af9 Mon Sep 17 00:00:00 2001 From: Andy Pennell Date: Thu, 20 Nov 2025 07:26:28 -0800 Subject: [PATCH 5/5] Undo pipeline build to unblock the rest of the PR, will revisit separately --- Utilities/Pipelines/libHttpClient.CI.yml | 54 +++++++++++------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml index e1f4a9f1..95a87dee 100644 --- a/Utilities/Pipelines/libHttpClient.CI.yml +++ b/Utilities/Pipelines/libHttpClient.CI.yml @@ -65,36 +65,30 @@ jobs: # Visual Studio 2022 #################### - - job: Win32Vs22Build - displayName: libHttpClient Win32/UWP VS2022 Build - pool: - name: playfab_poolA - timeoutInMinutes: 180 - 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) + # - 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) #################### # Android