From 7d152c506ca7f58be171ffd66b5ef690145c3c6e Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 20:32:57 +0300
Subject: [PATCH 01/13] Add build agents parameter

---
 .azure-pipelines/integrated-pipeline.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index 2aa5247707b..234b24652b7 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -1,6 +1,11 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+parameters:
+  - name: BuildAgent
+    default: MsGraphBuildAgentsLinux
+    displayName: Build Agent
+
 variables:
   AUTH_MODULE_NAME: 'Authentication'
   AUTH_MODULE_PATH: 'src\Authentication\Authentication'
@@ -17,8 +22,9 @@ variables:
   GitUserEmail: 'GraphTooling@service.microsoft.com'
   GitUserName: 'Microsoft Graph DevX Tooling'
   BUILDNUMBER: -1
+  BUILDAGENT: ${{ parameters.BuildAgent }}
 
-pool: MsGraphDevXAzureAgents
+pool: ${{ parameters.BuildAgent }}
 
 trigger:
     branches:

From d728a3558fff3f95d2e9c87b3f421d6544da4f2b Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 20:35:31 +0300
Subject: [PATCH 02/13] Rename variable

---
 .azure-pipelines/integrated-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index 234b24652b7..af07dbda84b 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -24,7 +24,7 @@ variables:
   BUILDNUMBER: -1
   BUILDAGENT: ${{ parameters.BuildAgent }}
 
-pool: ${{ parameters.BuildAgent }}
+pool: $(BUILDAGENT)
 
 trigger:
     branches:

From 27c9ccf5700b0aaf5971dda285309819dd236223 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 20:51:15 +0300
Subject: [PATCH 03/13] Add settings for test certificate and build vault.

---
 .azure-pipelines/integrated-pipeline.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index af07dbda84b..859725fb167 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -6,6 +6,18 @@ parameters:
     default: MsGraphBuildAgentsLinux
     displayName: Build Agent
 
+  - name: AzureSubscription
+    default: "Microsoft Graph Build Agents (Win+Lin)"
+    displayName: Azure Subscription
+
+  - name: KeyVault
+    default: "msgraph-build-keyvault"
+    displayName: Build Key vault
+
+  - name: TestCertificate
+    default: "MsGraphPSSDKCertificate"
+    displayName: Test Certificate
+
 variables:
   AUTH_MODULE_NAME: 'Authentication'
   AUTH_MODULE_PATH: 'src\Authentication\Authentication'
@@ -23,6 +35,9 @@ variables:
   GitUserName: 'Microsoft Graph DevX Tooling'
   BUILDNUMBER: -1
   BUILDAGENT: ${{ parameters.BuildAgent }}
+  AZURESUBSCRIPTION: ${{ parameters.AzureSubscription }}
+  KEYVAULT: ${{ parameters.KeyVault }}
+  TESTCERTIFICATE: ${{ parameters.TestCertificate }}
 
 pool: $(BUILDAGENT)
 
@@ -60,8 +75,8 @@ stages:
     steps:
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Microsoft Graph Build Agents'
-        KeyVaultName: 'msgraph-build-vault'
+        azureSubscription: $(AZURESUBSCRIPTION)
+        KeyVaultName: $(KEYVAULT)
         SecretsFilter: '*'
         RunAsPreJob: true
     
@@ -70,7 +85,7 @@ stages:
       inputs:
         targetType: 'inline'
         script: |
-          $kvSecretBytes = [System.Convert]::FromBase64String('$(MsGraphPSSDKCertificate)')
+          $kvSecretBytes = [System.Convert]::FromBase64String('$(TESTCERTIFICATE)')
           $certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
           $certCollection.Import($kvSecretBytes,$null,[System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
           $store = New-Object System.Security.Cryptography.X509Certificates.X509Store("My", "CurrentUser")

From 9f63a79a1adc835400a736ae0f8aee91a3b0b58e Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:26:00 +0300
Subject: [PATCH 04/13] test vault access

---
 .azure-pipelines/integrated-pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index 859725fb167..a0232874da5 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -75,8 +75,8 @@ stages:
     steps:
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: $(AZURESUBSCRIPTION)
-        KeyVaultName: $(KEYVAULT)
+        azureSubscription: 'Microsoft Graph Build Agents (Win+Lin)'
+        KeyVaultName: 'msgraph-build-keyvault'
         SecretsFilter: '*'
         RunAsPreJob: true
     

From 5de96736c15bc1bbfd8d61f2b1b77c64dd1c0e9c Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:34:49 +0300
Subject: [PATCH 05/13] use old vault

---
 .azure-pipelines/integrated-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index a0232874da5..5cbce5110ae 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -76,7 +76,7 @@ stages:
     - task: AzureKeyVault@1
       inputs:
         azureSubscription: 'Microsoft Graph Build Agents (Win+Lin)'
-        KeyVaultName: 'msgraph-build-keyvault'
+        KeyVaultName: 'msgraph-build-vault'
         SecretsFilter: '*'
         RunAsPreJob: true
     

From 93f4e3c06913bbffd7af29e1fe8e48f5231d81af Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:39:23 +0300
Subject: [PATCH 06/13] Certname error.

---
 .azure-pipelines/integrated-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index 5cbce5110ae..442297439e5 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -85,7 +85,7 @@ stages:
       inputs:
         targetType: 'inline'
         script: |
-          $kvSecretBytes = [System.Convert]::FromBase64String('$(TESTCERTIFICATE)')
+          $kvSecretBytes = [System.Convert]::FromBase64String('$(MsGraphPSSDKCertificate)')
           $certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
           $certCollection.Import($kvSecretBytes,$null,[System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
           $store = New-Object System.Security.Cryptography.X509Certificates.X509Store("My", "CurrentUser")

From d7e3270f925270fc4f864ca9e4161ffec70da239 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:41:53 +0300
Subject: [PATCH 07/13] use variable names.

---
 .azure-pipelines/integrated-pipeline.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index 442297439e5..f08a3bf8097 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -14,10 +14,6 @@ parameters:
     default: "msgraph-build-keyvault"
     displayName: Build Key vault
 
-  - name: TestCertificate
-    default: "MsGraphPSSDKCertificate"
-    displayName: Test Certificate
-
 variables:
   AUTH_MODULE_NAME: 'Authentication'
   AUTH_MODULE_PATH: 'src\Authentication\Authentication'
@@ -37,7 +33,6 @@ variables:
   BUILDAGENT: ${{ parameters.BuildAgent }}
   AZURESUBSCRIPTION: ${{ parameters.AzureSubscription }}
   KEYVAULT: ${{ parameters.KeyVault }}
-  TESTCERTIFICATE: ${{ parameters.TestCertificate }}
 
 pool: $(BUILDAGENT)
 
@@ -75,8 +70,8 @@ stages:
     steps:
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Microsoft Graph Build Agents (Win+Lin)'
-        KeyVaultName: 'msgraph-build-vault'
+        azureSubscription: $(AZURESUBSCRIPTION)
+        KeyVaultName: $(KEYVAULT)
         SecretsFilter: '*'
         RunAsPreJob: true
     

From a29dcc254c596f92d1c6a1bedd9ec3407de29211 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:09:27 +0300
Subject: [PATCH 08/13] Parameterize build agent.

---
 .../common-templates/download-openapi-docs.yml        |  5 ++++-
 .azure-pipelines/generate-auth-module-template.yml    |  3 +--
 .azure-pipelines/generate-modules-template.yml        |  1 -
 .azure-pipelines/generate-rollup-module-template.yml  |  1 -
 .../generation-templates/generate-service-modules.yml |  2 +-
 .azure-pipelines/security-postchecks-template.yml     |  3 ---
 .azure-pipelines/security-prechecks-template.yml      |  1 -
 .azure-pipelines/weekly-generation.yml                | 11 ++++++++++-
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index 1506b9d5f54..f809ea63f1b 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -8,11 +8,14 @@ parameters:
   - name: BaseBranch
     type: string
     default: "dev"
+  - name: BuildAgent
+    default: MsGraphBuildAgentsLinux
+    displayName: Build Agent
 
 jobs:
   - job: GetLatestDocs
     displayName: Download OpenApiDocs
-    pool: MsGraphDevXAzureAgents
+    pool: $(BuildAgent)
     steps:
       - template: ./checkout.yml
 
diff --git a/.azure-pipelines/generate-auth-module-template.yml b/.azure-pipelines/generate-auth-module-template.yml
index 51c36bb6355..0b92300335c 100644
--- a/.azure-pipelines/generate-auth-module-template.yml
+++ b/.azure-pipelines/generate-auth-module-template.yml
@@ -29,8 +29,7 @@ parameters:
 jobs:
 - job: MsGraphPSSDKAuthModuleGeneration
   displayName: Microsoft Graph PowerShell SDK Auth Module Generation
-  pool: MsGraphDevXAzureAgents
-  
+
   steps:
   - template: ./install-tools-template.yml
 
diff --git a/.azure-pipelines/generate-modules-template.yml b/.azure-pipelines/generate-modules-template.yml
index 4438d612e71..de39096de2c 100644
--- a/.azure-pipelines/generate-modules-template.yml
+++ b/.azure-pipelines/generate-modules-template.yml
@@ -37,7 +37,6 @@ parameters:
 jobs:
 - job: MsGraphPSSDKServiceModulesGeneration
   displayName: Microsoft Graph PowerShell SDK Service Module Generation
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
 
   steps:
diff --git a/.azure-pipelines/generate-rollup-module-template.yml b/.azure-pipelines/generate-rollup-module-template.yml
index 97634db1022..d09fb4532b7 100644
--- a/.azure-pipelines/generate-rollup-module-template.yml
+++ b/.azure-pipelines/generate-rollup-module-template.yml
@@ -33,7 +33,6 @@ parameters:
 jobs:
 - job: MsGraphPSSDKRollUpModuleGeneration
   displayName: Microsoft Graph PowerShell SDK Roll-Up Module Generation
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
     
   steps:
diff --git a/.azure-pipelines/generation-templates/generate-service-modules.yml b/.azure-pipelines/generation-templates/generate-service-modules.yml
index e0386e99079..599dd804e30 100644
--- a/.azure-pipelines/generation-templates/generate-service-modules.yml
+++ b/.azure-pipelines/generation-templates/generate-service-modules.yml
@@ -20,10 +20,10 @@ parameters:
   - name: PublishToFeed
     type: boolean
     default: false
+
 jobs:
   - job: GenerateServiceModules
     displayName: Service module generation
-    pool: MsGraphDevXAzureAgents
     timeoutInMinutes: 360
     condition: and(succeeded(), ne(stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['OpenAPIDocDiff.ModulesWithChanges'], ''))
     variables:
diff --git a/.azure-pipelines/security-postchecks-template.yml b/.azure-pipelines/security-postchecks-template.yml
index d56a156227f..2aa1538743d 100644
--- a/.azure-pipelines/security-postchecks-template.yml
+++ b/.azure-pipelines/security-postchecks-template.yml
@@ -4,9 +4,6 @@
 jobs:
 - job: MsGraphPSSDKSecurityPostChecks
   displayName: Microsoft Graph PowerShell SDK Security Post Checks
-  pool: 
-    image: windows-latest
-  timeoutInMinutes: 600
 
   steps:
   - task: CodesignValidation@0
diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml
index fad186e52d8..dd46dd7854e 100644
--- a/.azure-pipelines/security-prechecks-template.yml
+++ b/.azure-pipelines/security-prechecks-template.yml
@@ -5,7 +5,6 @@
 jobs:
 - job: MsGraphPSSDKSecurityPreChecks
   displayName: Microsoft Graph PowerShell SDK Security Pre Checks
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
 
   steps:
diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index eb9951d2780..4f0e336586c 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -1,12 +1,21 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
-pool: MsGraphDevXAzureAgents
+
+parameters:
+  - name: BuildAgent
+    default: MsGraphBuildAgentsLinux
+    displayName: Build Agent
 
 variables:
   Branch: "WeeklyOpenApiDocsDownload"
   BaseBranch: "dev"
+  BUILDAGENT: ${{ parameters.BuildAgent }}
+
+pool: $(BUILDAGENT)
+
 trigger: none
 pr: none
 schedules:

From 3c98e5358c2285bddb2750d1e68dc28f47041210 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:16:27 +0300
Subject: [PATCH 09/13] Remove credscan, as to be injected by policy.

---
 .azure-pipelines/security-prechecks-template.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml
index dd46dd7854e..4a5447b6fc5 100644
--- a/.azure-pipelines/security-prechecks-template.yml
+++ b/.azure-pipelines/security-prechecks-template.yml
@@ -8,14 +8,6 @@ jobs:
   timeoutInMinutes: 600
 
   steps:
-  - task: CredScan@2
-    displayName: 'Run CredScan'
-    inputs:
-      debugMode: false
-      batchSize: 20
-      toolMajorVersion: 'V2'
-      searchersFileType: 'Skype'
-
   - task: PoliCheck@1
     displayName: 'Run PoliCheck'
     condition: and(succeeded(), eq(eq(variables['Build.SourceBranch'], 'refs/heads/master'), false))

From 5db7c1101042d89fec26b69f1689a1aec34b2153 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:28:10 +0300
Subject: [PATCH 10/13] Security pre-checks and post-checks run on Win.

---
 .azure-pipelines/security-postchecks-template.yml |  2 ++
 .azure-pipelines/security-prechecks-template.yml  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/security-postchecks-template.yml b/.azure-pipelines/security-postchecks-template.yml
index 2aa1538743d..a3b584e7285 100644
--- a/.azure-pipelines/security-postchecks-template.yml
+++ b/.azure-pipelines/security-postchecks-template.yml
@@ -4,6 +4,8 @@
 jobs:
 - job: MsGraphPSSDKSecurityPostChecks
   displayName: Microsoft Graph PowerShell SDK Security Post Checks
+  pool: 
+    vmImage: 'windows-latest'
 
   steps:
   - task: CodesignValidation@0
diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml
index 4a5447b6fc5..9fb18f0b239 100644
--- a/.azure-pipelines/security-prechecks-template.yml
+++ b/.azure-pipelines/security-prechecks-template.yml
@@ -6,8 +6,17 @@ jobs:
 - job: MsGraphPSSDKSecurityPreChecks
   displayName: Microsoft Graph PowerShell SDK Security Pre Checks
   timeoutInMinutes: 600
-
+  pool: 
+    vmImage: 'windows-latest'
   steps:
+  - task: CredScan@2
+    displayName: 'Run CredScan'
+    inputs:
+      debugMode: false
+      batchSize: 20
+      toolMajorVersion: 'V2'
+      searchersFileType: 'Skype'
+
   - task: PoliCheck@1
     displayName: 'Run PoliCheck'
     condition: and(succeeded(), eq(eq(variables['Build.SourceBranch'], 'refs/heads/master'), false))

From 173982607866689f414ea8f15dffaf51baac3b3d Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:49:50 +0300
Subject: [PATCH 11/13] Use net5.0

---
 .azure-pipelines/install-tools-template.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/install-tools-template.yml b/.azure-pipelines/install-tools-template.yml
index 7bba77a0bba..f9e9b2ee677 100644
--- a/.azure-pipelines/install-tools-template.yml
+++ b/.azure-pipelines/install-tools-template.yml
@@ -14,6 +14,12 @@ steps:
         debugMode: false
         version: 3.x
 
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core SDK 5.x'
+      inputs:
+        debugMode: false
+        version: 5.x
+
     - task: NuGetToolInstaller@1
       displayName: 'Install Nuget 5.7'
       inputs:
@@ -28,7 +34,6 @@ steps:
         targetType: inline
         script: |
           dotnet tool update --global PowerShell
-          pwsh
 
     - task: PowerShell@2
       displayName: 'Version Check'

From 390db9dc1c247f92563cfcd7d6e5b1e2e54fb076 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Tue, 9 Mar 2021 23:13:42 +0300
Subject: [PATCH 12/13] run tests on windows.

---
 .azure-pipelines/generate-auth-module-template.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.azure-pipelines/generate-auth-module-template.yml b/.azure-pipelines/generate-auth-module-template.yml
index 0b92300335c..4dd96385c90 100644
--- a/.azure-pipelines/generate-auth-module-template.yml
+++ b/.azure-pipelines/generate-auth-module-template.yml
@@ -44,6 +44,8 @@ jobs:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run: Enabled Tests'
+    pool: 
+        vmImage: "windows-latest"
     inputs:
       command: 'test'
       publishTestResults: true

From d958c3b4fff18032e2753ac29ce73a50b17b3005 Mon Sep 17 00:00:00 2001
From: George <1641829+finsharp@users.noreply.github.com>
Date: Wed, 10 Mar 2021 20:36:48 +0300
Subject: [PATCH 13/13] undo pool requirement.

---
 .azure-pipelines/common-templates/download-openapi-docs.yml | 2 +-
 .azure-pipelines/generate-auth-module-template.yml          | 2 --
 .azure-pipelines/integrated-pipeline.yml                    | 2 +-
 .azure-pipelines/security-postchecks-template.yml           | 2 --
 .azure-pipelines/security-prechecks-template.yml            | 2 --
 .azure-pipelines/weekly-generation.yml                      | 2 +-
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index f809ea63f1b..aec3a82257a 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -9,7 +9,7 @@ parameters:
     type: string
     default: "dev"
   - name: BuildAgent
-    default: MsGraphBuildAgentsLinux
+    default: MsGraphBuildAgentsWindows
     displayName: Build Agent
 
 jobs:
diff --git a/.azure-pipelines/generate-auth-module-template.yml b/.azure-pipelines/generate-auth-module-template.yml
index 4dd96385c90..0b92300335c 100644
--- a/.azure-pipelines/generate-auth-module-template.yml
+++ b/.azure-pipelines/generate-auth-module-template.yml
@@ -44,8 +44,6 @@ jobs:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run: Enabled Tests'
-    pool: 
-        vmImage: "windows-latest"
     inputs:
       command: 'test'
       publishTestResults: true
diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
index f08a3bf8097..93fcf8488af 100644
--- a/.azure-pipelines/integrated-pipeline.yml
+++ b/.azure-pipelines/integrated-pipeline.yml
@@ -3,7 +3,7 @@
 
 parameters:
   - name: BuildAgent
-    default: MsGraphBuildAgentsLinux
+    default: MsGraphBuildAgentsWindows
     displayName: Build Agent
 
   - name: AzureSubscription
diff --git a/.azure-pipelines/security-postchecks-template.yml b/.azure-pipelines/security-postchecks-template.yml
index a3b584e7285..2aa1538743d 100644
--- a/.azure-pipelines/security-postchecks-template.yml
+++ b/.azure-pipelines/security-postchecks-template.yml
@@ -4,8 +4,6 @@
 jobs:
 - job: MsGraphPSSDKSecurityPostChecks
   displayName: Microsoft Graph PowerShell SDK Security Post Checks
-  pool: 
-    vmImage: 'windows-latest'
 
   steps:
   - task: CodesignValidation@0
diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml
index 9fb18f0b239..8dc2efd59ec 100644
--- a/.azure-pipelines/security-prechecks-template.yml
+++ b/.azure-pipelines/security-prechecks-template.yml
@@ -6,8 +6,6 @@ jobs:
 - job: MsGraphPSSDKSecurityPreChecks
   displayName: Microsoft Graph PowerShell SDK Security Pre Checks
   timeoutInMinutes: 600
-  pool: 
-    vmImage: 'windows-latest'
   steps:
   - task: CredScan@2
     displayName: 'Run CredScan'
diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index 4f0e336586c..f6ef8293ca7 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -6,7 +6,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 
 parameters:
   - name: BuildAgent
-    default: MsGraphBuildAgentsLinux
+    default: MsGraphBuildAgentsWindows
     displayName: Build Agent
 
 variables: