diff --git a/Utilities/Pipelines/Tasks/vs2022-build.yml b/Utilities/Pipelines/Tasks/vs2022-build.yml index 9d6d138d..99fd8b61 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.Windows -Version %GDKNugetVersion% -OutputDirectory "%GameDK%" -DirectDownload + echo "GDK installed to %GameDK%" + echo "GameDKCoreLatest=%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 95a87dee..6bb0e0b9 100644 --- a/Utilities/Pipelines/libHttpClient.CI.yml +++ b/Utilities/Pipelines/libHttpClient.CI.yml @@ -65,51 +65,62 @@ jobs: # Visual Studio 2022 #################### - # - job: Win32Vs22Build - # displayName: libHttpClient Win32/UWP VS2022 Build + - job: Win32Vs22Build + displayName: libHttpClient Win32/UWP VS2022 Build + variables: + GDKNugetVersion: 2510.0.6194 + GDKVersion: 251000 + GameDK: $(Pipeline.Workspace)\gdk + 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 + 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 + #################### + + # - job: AndroidBuild + # displayName: libHttpClient Android Build # pool: - # name: VS2022-pool + # vmImage: windows-2019 # timeoutInMinutes: 180 # strategy: # matrix: - # x86_Debug: - # Platform: x86 - # Configuration: Debug - # x64_Debug: - # Platform: x64 + # Debug: # Configuration: Debug - # x86_Release: - # Platform: x86 - # Configuration: Release - # x64_Release: - # Platform: x64 + # Release: # Configuration: Release # steps: - # - template: Tasks/vs2022-build.yml + # - template: Tasks/android-build.yml # parameters: - # platform: $(Platform) # configuration: $(Configuration) - #################### - # 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) - #################### # iOS #################### 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