From 236d26d0921b17245455fc3252a9dc9d8e08a702 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <48363984+kythant@users.noreply.github.com>
Date: Wed, 19 Feb 2025 10:43:42 -0800
Subject: [PATCH 1/4] k3

---
 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, 18 insertions(+)

diff --git a/build/WindowsAppSDK-BuildDevCheck.yml b/build/WindowsAppSDK-BuildDevCheck.yml
index 3fd19418ce..43d75d7fdb 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: KS3
 
     stages:
     - stage: PackageDevCheck
diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index e5ddf5ef84..374ffecc1a 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -55,9 +55,14 @@ extends:
   parameters:
     featureFlags:
       EnableCDPxPAT: false
+
     platform:
       name: 'windows_undocked' # windows undocked
 
+    featureFlags:
+      WindowsHostVersion:
+        Network: KS3
+
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 
diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 498883f37a..da19b4c9a0 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -55,9 +55,14 @@ extends:
   parameters:
     featureFlags:
       EnableCDPxPAT: false
+
     platform:
       name: 'windows_undocked' # windows undocked
 
+    featureFlags:
+      WindowsHostVersion:
+        Network: KS3
+
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 
diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index df2efb4a56..96077a2d06 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -46,9 +46,14 @@ extends:
   parameters:
     featureFlags:
       EnableCDPxPAT: false
+
     platform:
       name: 'windows_undocked' # windows undocked
 
+    featureFlags:
+      WindowsHostVersion:
+        Network: KS3
+
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 

From 9d84a6515364f8c3dd2a842c262c8255a61aec24 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <48363984+kythant@users.noreply.github.com>
Date: Wed, 19 Feb 2025 10:45:49 -0800
Subject: [PATCH 2/4] k3 fix

---
 build/WindowsAppSDK-Foundation-Nightly.yml  | 8 +++-----
 build/WindowsAppSDK-Foundation-Official.yml | 8 +++-----
 build/WindowsAppSDK-Foundation-PR.yml       | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index 374ffecc1a..b296b74636 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -54,15 +54,13 @@ extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates
   parameters:
     featureFlags:
-      EnableCDPxPAT: false
+      EnableCDPxPAT: false      
+      WindowsHostVersion:
+        Network: KS3
 
     platform:
       name: 'windows_undocked' # windows undocked
 
-    featureFlags:
-      WindowsHostVersion:
-        Network: KS3
-
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 
diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index da19b4c9a0..05ed48603e 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -54,15 +54,13 @@ extends:
   template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates
   parameters:
     featureFlags:
-      EnableCDPxPAT: false
+      EnableCDPxPAT: false      
+      WindowsHostVersion:
+        Network: KS3
 
     platform:
       name: 'windows_undocked' # windows undocked
 
-    featureFlags:
-      WindowsHostVersion:
-        Network: KS3
-
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 
diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index 96077a2d06..f3f3f6e70c 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -45,15 +45,13 @@ extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates
   parameters:
     featureFlags:
-      EnableCDPxPAT: false
+      EnableCDPxPAT: false      
+      WindowsHostVersion:
+        Network: KS3
 
     platform:
       name: 'windows_undocked' # windows undocked
 
-    featureFlags:
-      WindowsHostVersion:
-        Network: KS3
-
     cloudvault: # Please refer the wiki for more information: https://aka.ms/obpipelines/cloudvault
       enabled: false
 

From 14360283d355b26365c145dff3ac8f1580c64c3a Mon Sep 17 00:00:00 2001
From: Kyaw Thant <48363984+kythant@users.noreply.github.com>
Date: Wed, 19 Feb 2025 13:17:03 -0800
Subject: [PATCH 3/4] Should be R1

---
 build/WindowsAppSDK-BuildDevCheck.yml       | 2 +-
 build/WindowsAppSDK-Foundation-Nightly.yml  | 2 +-
 build/WindowsAppSDK-Foundation-Official.yml | 2 +-
 build/WindowsAppSDK-Foundation-PR.yml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/WindowsAppSDK-BuildDevCheck.yml b/build/WindowsAppSDK-BuildDevCheck.yml
index 43d75d7fdb..f734846361 100644
--- a/build/WindowsAppSDK-BuildDevCheck.yml
+++ b/build/WindowsAppSDK-BuildDevCheck.yml
@@ -23,7 +23,7 @@ extends:
       name: 'windows_undocked' # windows undocked
     featureFlags:
       WindowsHostVersion:
-        Network: KS3
+        Network: R1
 
     stages:
     - stage: PackageDevCheck
diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index b296b74636..c0e84fc662 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -56,7 +56,7 @@ extends:
     featureFlags:
       EnableCDPxPAT: false      
       WindowsHostVersion:
-        Network: KS3
+        Network: R1
 
     platform:
       name: 'windows_undocked' # windows undocked
diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 05ed48603e..03a639fbb6 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -56,7 +56,7 @@ extends:
     featureFlags:
       EnableCDPxPAT: false      
       WindowsHostVersion:
-        Network: KS3
+        Network: R1
 
     platform:
       name: 'windows_undocked' # windows undocked
diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index f3f3f6e70c..02b35292ac 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -47,7 +47,7 @@ extends:
     featureFlags:
       EnableCDPxPAT: false      
       WindowsHostVersion:
-        Network: KS3
+        Network: R1
 
     platform:
       name: 'windows_undocked' # windows undocked

From a8bb612dbc550d3e26666ec98f2f08bd4e68c874 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <48363984+kythant@users.noreply.github.com>
Date: Wed, 19 Feb 2025 13:37:38 -0800
Subject: [PATCH 4/4] Remove all nuget installer tasks

---
 .../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