Skip to content

Commit 9f0b5a4

Browse files
authored
Add VS2022 pipeline (to enable ARM64) and disable Android (#923)
* Add VS2022 pipeline (so we can build ARM64) * Flip from pool name to vmImage * Release|x64 was missing lhc.GDK and lhc.143.GDK.C projects * Get GDK.PC from NuGet * Disable Android as the vm is gone now
1 parent 49d853e commit 9f0b5a4

3 files changed

Lines changed: 59 additions & 38 deletions

File tree

Utilities/Pipelines/Tasks/vs2022-build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ steps:
1212
inputs:
1313
versionSpec: 5.8
1414

15-
- task: NuGetAuthenticate@0
15+
- task: NuGetAuthenticate@1
16+
displayName: 'NuGet authenticate'
17+
18+
# Install the GDK package explicitly into $(Pipeline.Workspace)/gdk
19+
- script: |
20+
nuget install Microsoft.GDK.Windows -Version %GDKNugetVersion% -OutputDirectory "%GameDK%" -DirectDownload
21+
echo "GDK installed to %GameDK%"
22+
echo "GameDKCoreLatest=%GameDKCoreLatest%"
23+
displayName: 'Install GDK.Windows via NuGet'
1624
1725
# Install NuGet dependencies. The GUID below is the NuGetCommand for MSFT internal.
1826
- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2

Utilities/Pipelines/libHttpClient.CI.yml

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -65,51 +65,62 @@ jobs:
6565
# Visual Studio 2022
6666
####################
6767

68-
# - job: Win32Vs22Build
69-
# displayName: libHttpClient Win32/UWP VS2022 Build
68+
- job: Win32Vs22Build
69+
displayName: libHttpClient Win32/UWP VS2022 Build
70+
variables:
71+
GDKNugetVersion: 2510.0.6194
72+
GDKVersion: 251000
73+
GameDK: $(Pipeline.Workspace)\gdk
74+
GameDKCoreLatest: $(GameDK)\Microsoft.GDK.Windows.$(GDKNugetVersion)\native\$(GDKVersion)\
75+
pool:
76+
vmImage: windows-2022
77+
timeoutInMinutes: 240
78+
strategy:
79+
matrix:
80+
x86_Debug:
81+
Platform: x86
82+
Configuration: Debug
83+
x64_Debug:
84+
Platform: x64
85+
Configuration: Debug
86+
ARM64_Debug:
87+
Platform: ARM64
88+
Configuration: Debug
89+
x86_Release:
90+
Platform: x86
91+
Configuration: Release
92+
x64_Release:
93+
Platform: x64
94+
Configuration: Release
95+
ARM64_Release:
96+
Platform: ARM64
97+
Configuration: Release
98+
steps:
99+
- template: Tasks/vs2022-build.yml
100+
parameters:
101+
platform: $(Platform)
102+
configuration: $(Configuration)
103+
104+
####################
105+
# Android
106+
####################
107+
108+
# - job: AndroidBuild
109+
# displayName: libHttpClient Android Build
70110
# pool:
71-
# name: VS2022-pool
111+
# vmImage: windows-2019
72112
# timeoutInMinutes: 180
73113
# strategy:
74114
# matrix:
75-
# x86_Debug:
76-
# Platform: x86
77-
# Configuration: Debug
78-
# x64_Debug:
79-
# Platform: x64
115+
# Debug:
80116
# Configuration: Debug
81-
# x86_Release:
82-
# Platform: x86
83-
# Configuration: Release
84-
# x64_Release:
85-
# Platform: x64
117+
# Release:
86118
# Configuration: Release
87119
# steps:
88-
# - template: Tasks/vs2022-build.yml
120+
# - template: Tasks/android-build.yml
89121
# parameters:
90-
# platform: $(Platform)
91122
# configuration: $(Configuration)
92123

93-
####################
94-
# Android
95-
####################
96-
97-
- job: AndroidBuild
98-
displayName: libHttpClient Android Build
99-
pool:
100-
vmImage: windows-2019
101-
timeoutInMinutes: 180
102-
strategy:
103-
matrix:
104-
Debug:
105-
Configuration: Debug
106-
Release:
107-
Configuration: Release
108-
steps:
109-
- template: Tasks/android-build.yml
110-
parameters:
111-
configuration: $(Configuration)
112-
113124
####################
114125
# iOS
115126
####################

libHttpClient.vs2022.sln

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ Global
123123
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|ARM64.Build.0 = Release|ARM64
124124
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
125125
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
126-
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
126+
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.ActiveCfg = Release|x64
127+
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x64.Build.0 = Release|x64
127128
{0A6D51A3-0D86-4D0E-9DAA-54BA75E1DA1C}.Release|x86.ActiveCfg = Release|Gaming.Desktop.x64
128129
{AAF08544-8AAA-41A5-A86B-2AF4D8985258}.Debug|ARM.ActiveCfg = Debug|ARM
129130
{AAF08544-8AAA-41A5-A86B-2AF4D8985258}.Debug|ARM.Build.0 = Debug|ARM
@@ -358,7 +359,8 @@ Global
358359
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|ARM64.Build.0 = Release|ARM64
359360
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
360361
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
361-
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
362+
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.ActiveCfg = Release|x64
363+
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x64.Build.0 = Release|x64
362364
{A5A6E02A-21BA-4D55-9FB9-7B24DEDD3743}.Release|x86.ActiveCfg = Release|Gaming.Desktop.x64
363365
{30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM.ActiveCfg = Debug|Gaming.Desktop.x64
364366
{30B33C66-4755-4E79-A518-0E4137A58BEA}.Debug|ARM.Build.0 = Debug|Gaming.Desktop.x64

0 commit comments

Comments
 (0)