diff --git a/.azure-pipelines/azure-pipelines-create-release.yml b/.azure-pipelines/azure-pipelines-create-release.yml
index bf9cf8c8..06863e37 100644
--- a/.azure-pipelines/azure-pipelines-create-release.yml
+++ b/.azure-pipelines/azure-pipelines-create-release.yml
@@ -41,7 +41,7 @@ jobs:
 - job: 'Run_Test'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - template: templates/run-tests.yml
diff --git a/.azure-pipelines/azure-pipelines-merge.yml b/.azure-pipelines/azure-pipelines-merge.yml
index 7d114597..9747f960 100644
--- a/.azure-pipelines/azure-pipelines-merge.yml
+++ b/.azure-pipelines/azure-pipelines-merge.yml
@@ -79,7 +79,7 @@ jobs:
 - job: 'Run_Test_Mac'
   dependsOn: ['Build_Publish_Azure_CLI_Test_SDK','Build_Publish_Azure_DevOps_CLI_Extension']
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - template: templates/run-tests.yml
@@ -89,7 +89,7 @@ jobs:
 - job: 'Run_Test_Mac_Azure_CLI_Released_Version'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - template: templates/run-tests.yml
@@ -100,7 +100,7 @@ jobs:
 - job: 'Code_Coverage'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
@@ -137,7 +137,7 @@ jobs:
 
 - job: 'Run_Style_Check'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
@@ -162,7 +162,7 @@ jobs:
 - job: 'Run_HelpText_Check'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
@@ -189,7 +189,7 @@ jobs:
 - job: 'Run_Test_From_Old_Release'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - script: git checkout Releases-0.26.0
diff --git a/.azure-pipelines/azure-pipelines-pr.yml b/.azure-pipelines/azure-pipelines-pr.yml
index fdf9a3de..ae48e2ca 100644
--- a/.azure-pipelines/azure-pipelines-pr.yml
+++ b/.azure-pipelines/azure-pipelines-pr.yml
@@ -19,6 +19,8 @@ jobs:
     inputs:
       versionSpec: '3.x'
       architecture: 'x64'
+      - script: pip install setuptools
+    displayName: 'install setuptools'
 
   - template: templates/setup-ci-machine.yml
 
@@ -33,6 +35,8 @@ jobs:
     inputs:
       versionSpec: '3.x'
       architecture: 'x64'
+      - script: pip install setuptools
+    displayName: 'install setuptools'
 
   - template: templates/setup-ci-machine.yml
 
@@ -60,7 +64,7 @@ jobs:
 - job: 'Run_Test_Mac'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - template: templates/run-tests.yml
@@ -70,7 +74,7 @@ jobs:
 - job: 'Run_Test_Mac_Azure_CLI_Released_Version'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - template: templates/run-tests.yml
@@ -96,7 +100,7 @@ jobs:
 - job: 'Code_Coverage'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
@@ -133,13 +137,15 @@ jobs:
 
 - job: 'Run_Style_Check'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.8'
       architecture: 'x64'
+      - script: pip install setuptools
+    displayName: 'install setuptools'
 
   - template: templates/install-azure-cli-edge.yml
 
@@ -161,7 +167,7 @@ jobs:
 - job: 'Run_HelpText_Check'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - task: UsePythonVersion@0
@@ -188,7 +194,7 @@ jobs:
 - job: 'Run_Test_From_Old_Release'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - script: git checkout Releases-0.26.0
diff --git a/azure-devops-cli-extension b/azure-devops-cli-extension
new file mode 160000
index 00000000..0e887069
--- /dev/null
+++ b/azure-devops-cli-extension
@@ -0,0 +1 @@
+Subproject commit 0e887069b0e540f0dcb40605fecdb56f7ece02f9