From 6025add72c7857dfef56bc6ccbe06fefe007f033 Mon Sep 17 00:00:00 2001 From: Kyaw Thant <48363984+kythant@users.noreply.github.com> Date: Mon, 24 Feb 2025 12:36:11 -0800 Subject: [PATCH 1/2] Set R1 Network Flag on Windows Container Image (#5169) --- build/WindowsAppSDK-BuildDevCheck.yml | 3 +++ build/WindowsAppSDK-Foundation-Nightly.yml | 5 ++++- build/WindowsAppSDK-Foundation-Official.yml | 5 ++++- build/WindowsAppSDK-Foundation-PR.yml | 5 ++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build/WindowsAppSDK-BuildDevCheck.yml b/build/WindowsAppSDK-BuildDevCheck.yml index 3fd19418ce..f734846361 100644 --- a/build/WindowsAppSDK-BuildDevCheck.yml +++ b/build/WindowsAppSDK-BuildDevCheck.yml @@ -21,6 +21,9 @@ extends: parameters: platform: name: 'windows_undocked' # windows undocked + featureFlags: + WindowsHostVersion: + Network: R1 stages: - stage: PackageDevCheck diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml index e5ddf5ef84..c0e84fc662 100644 --- a/build/WindowsAppSDK-Foundation-Nightly.yml +++ b/build/WindowsAppSDK-Foundation-Nightly.yml @@ -54,7 +54,10 @@ extends: template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates parameters: featureFlags: - EnableCDPxPAT: false + EnableCDPxPAT: false + WindowsHostVersion: + Network: R1 + platform: name: 'windows_undocked' # windows undocked diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml index 498883f37a..03a639fbb6 100644 --- a/build/WindowsAppSDK-Foundation-Official.yml +++ b/build/WindowsAppSDK-Foundation-Official.yml @@ -54,7 +54,10 @@ extends: template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates parameters: featureFlags: - EnableCDPxPAT: false + EnableCDPxPAT: false + WindowsHostVersion: + Network: R1 + platform: name: 'windows_undocked' # windows undocked diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml index df2efb4a56..02b35292ac 100644 --- a/build/WindowsAppSDK-Foundation-PR.yml +++ b/build/WindowsAppSDK-Foundation-PR.yml @@ -45,7 +45,10 @@ extends: template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates parameters: featureFlags: - EnableCDPxPAT: false + EnableCDPxPAT: false + WindowsHostVersion: + Network: R1 + platform: name: 'windows_undocked' # windows undocked From 106db7bdfdb3aef12f4b9082780cdf37b1929471 Mon Sep 17 00:00:00 2001 From: Kyaw Thant <48363984+kythant@users.noreply.github.com> Date: Fri, 21 Feb 2025 10:41:52 -0800 Subject: [PATCH 2/2] Remove NuGetToolInstaller tasks (#5173) --- .../WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml | 2 -- .../WindowsAppSDK-BuildFoundation-Steps.yml | 2 -- .../WindowsAppSDK-BuildVSIX-Steps.yml | 2 -- .../WindowsAppSDK-StaticValidationTest-Stage.yml | 1 - build/ProjectReunion-CI.yml | 6 ------ 5 files changed, 13 deletions(-) diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml index d771126f9d..cd997c4bcd 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml @@ -10,8 +10,6 @@ parameters: default: true steps: -- task: NuGetToolInstaller@1 - - task: NuGetAuthenticate@1 inputs: nuGetServiceConnections: 'TelemetryInternal' diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml index 7c4365755c..db2cbecc5b 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml @@ -10,8 +10,6 @@ parameters: default: true steps: -- task: NuGetToolInstaller@1 - - task: NuGetAuthenticate@1 inputs: nuGetServiceConnections: 'TelemetryInternal' diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml index eac5544ec3..3d2e5d97f1 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml @@ -88,8 +88,6 @@ steps: } Exit 1 -- task: NuGetToolInstaller@1 - - task: NuGetAuthenticate@1 - task: VSBuild@1 diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml index 9e3ba0b0ef..76bebe7bb5 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml @@ -15,7 +15,6 @@ stages: name: 'ProjectReunionESPool-2022' # This stage is purely for ES, hence this custom pool timeoutInMinutes: 120 steps: - - task: NuGetToolInstaller@1 - task: NuGetAuthenticate@1 - task: powershell@2 diff --git a/build/ProjectReunion-CI.yml b/build/ProjectReunion-CI.yml index 6f03efda5d..c3a60f9ebc 100644 --- a/build/ProjectReunion-CI.yml +++ b/build/ProjectReunion-CI.yml @@ -83,8 +83,6 @@ jobs: - checkout: self persistCredentials: true - - task: NuGetToolInstaller@1 - - template: AzurePipelinesTemplates\WindowsAppSDK-SetupBuildEnvironment-Steps.yml parameters: IsOneBranch: false @@ -111,8 +109,6 @@ jobs: pool: vmImage: 'windows-2022' steps: - - task: NuGetToolInstaller@1 - - template: AzurePipelinesTemplates\WindowsAppSDK-SetupBuildEnvironment-Steps.yml parameters: IsOneBranch: false @@ -147,8 +143,6 @@ jobs: variables: ob_artifactBaseName: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)" # For BuildMRT to publish t steps: - - task: NuGetToolInstaller@1 - - template: AzurePipelinesTemplates\WindowsAppSDK-BuildMRT-Steps.yml parameters: IsOneBranch: false