diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index cf8ecfc1210..398b4961393 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -46,24 +46,24 @@
     'adal~=1.2.6',
     'argcomplete~=1.8',
     'azure-cli-telemetry==1.0.6.*',
+    'azure-common~=1.1',
+    'azure-mgmt-core>=1.2.0,<2.0.0',
     'colorama~=0.4.1',
     'cryptography>=3.2,<3.4',
     'humanfriendly>=4.7,<10.0',
     'jmespath',
     'knack==0.8.0rc2',
     'msal~=1.9',
+    # Dependencies of the vendored subscription SDK
+    # https://github.com/Azure/azure-sdk-for-python/blob/ab12b048ddf676fe0ccec16b2167117f0609700d/sdk/resources/azure-mgmt-resource/setup.py#L82-L86
+    'msrest>=0.5.0',
     'msrestazure>=0.6.3',
     'paramiko>=2.0.8,<3.0.0',
+    'pkginfo>=1.5.0.1',
     'PyJWT==1.7.1',
     'pyopenssl>=17.1.0',  # https://github.com/pyca/pyopenssl/pull/612
     'requests~=2.22',
     'six~=1.12',
-    'pkginfo>=1.5.0.1',
-    'azure-mgmt-core>=1.2.0,<2.0.0',
-    # Dependencies of the vendored subscription SDK
-    # https://github.com/Azure/azure-sdk-for-python/blob/ab12b048ddf676fe0ccec16b2167117f0609700d/sdk/resources/azure-mgmt-resource/setup.py#L82-L86
-    'msrest>=0.5.0',
-    'azure-common~=1.1',
 ]
 
 # dependencies for specific OSes
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index d47afe3a5c1..1dc99ccff76 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -5,16 +5,19 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.20.0
 azure-cli-core==2.20.0
 azure-cli-telemetry==1.0.6
+azure-cli==2.20.0
 azure-common==1.1.22
+azure-core==1.10.0
 azure-cosmos==3.2.0
 azure-datalake-store==0.0.49
 azure-functions-devops-build==0.0.22
 azure-graphrbac==0.60.0
-azure-keyvault==1.1.0
+azure-identity==1.5.0
 azure-keyvault-administration==4.0.0b3
+azure-keyvault==1.1.0
+azure-loganalytics==0.1.0
 azure-mgmt-advisor==2.0.1
 azure-mgmt-apimanagement==0.2.0
 azure-mgmt-appconfiguration==1.0.1
@@ -32,7 +35,6 @@ azure-mgmt-containerinstance==1.5.0
 azure-mgmt-containerregistry==3.0.0rc17
 azure-mgmt-containerservice==9.4.0
 azure-mgmt-core==1.2.1
-azure-core==1.10.0
 azure-mgmt-cosmosdb==3.0.0
 azure-mgmt-databoxedge==0.2.0
 azure-mgmt-datalake-analytics==0.2.1
@@ -78,12 +80,11 @@ azure-mgmt-signalr==0.4.0
 azure-mgmt-sql==0.26.0
 azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==17.0.0
+azure-mgmt-synapse==0.6.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.48.0
-azure-mgmt-synapse==0.6.0
 azure-multiapi-storage==0.6.0
 azure-nspkg==3.0.2
-azure-loganalytics==0.1.0
 azure-storage-common==1.4.2
 azure-synapse-accesscontrol==0.2.0
 azure-synapse-artifacts==0.3.0
@@ -120,17 +121,17 @@ PyNaCl==1.3.0
 pyOpenSSL==19.0.0
 python-dateutil==2.8.0
 pytz==2019.1
-requests==2.22.0
 requests-oauthlib==1.2.0
+requests==2.22.0
 scp==0.13.2
+semver==2.13.0
 six==1.14.0
 sshtunnel==0.1.5
 tabulate==0.8.3
 urllib3==1.25.9
-vsts==0.1.25
 vsts-cd-manager==1.0.2
+vsts==0.1.25
 wcwidth==0.1.7
 websocket-client==0.56.0
 wrapt==1.11.2
 xmltodict==0.12.0
-semver==2.13.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index d47afe3a5c1..379c95147c9 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -5,16 +5,20 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.20.0
 azure-cli-core==2.20.0
 azure-cli-telemetry==1.0.6
+azure-cli==2.20.0
 azure-common==1.1.22
+azure-core==1.10.0
 azure-cosmos==3.2.0
 azure-datalake-store==0.0.49
 azure-functions-devops-build==0.0.22
 azure-graphrbac==0.60.0
-azure-keyvault==1.1.0
+azure-identity==1.5.0
 azure-keyvault-administration==4.0.0b3
+azure-keyvault==1.1.0
+azure-keyvault==1.1.0
+azure-loganalytics==0.1.0
 azure-mgmt-advisor==2.0.1
 azure-mgmt-apimanagement==0.2.0
 azure-mgmt-appconfiguration==1.0.1
@@ -32,7 +36,6 @@ azure-mgmt-containerinstance==1.5.0
 azure-mgmt-containerregistry==3.0.0rc17
 azure-mgmt-containerservice==9.4.0
 azure-mgmt-core==1.2.1
-azure-core==1.10.0
 azure-mgmt-cosmosdb==3.0.0
 azure-mgmt-databoxedge==0.2.0
 azure-mgmt-datalake-analytics==0.2.1
@@ -78,12 +81,11 @@ azure-mgmt-signalr==0.4.0
 azure-mgmt-sql==0.26.0
 azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==17.0.0
+azure-mgmt-synapse==0.6.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.48.0
-azure-mgmt-synapse==0.6.0
 azure-multiapi-storage==0.6.0
 azure-nspkg==3.0.2
-azure-loganalytics==0.1.0
 azure-storage-common==1.4.2
 azure-synapse-accesscontrol==0.2.0
 azure-synapse-artifacts==0.3.0
@@ -120,17 +122,17 @@ PyNaCl==1.3.0
 pyOpenSSL==19.0.0
 python-dateutil==2.8.0
 pytz==2019.1
-requests==2.22.0
 requests-oauthlib==1.2.0
+requests==2.22.0
 scp==0.13.2
+semver==2.13.0
 six==1.14.0
 sshtunnel==0.1.5
 tabulate==0.8.3
 urllib3==1.25.9
-vsts==0.1.25
 vsts-cd-manager==1.0.2
+vsts==0.1.25
 wcwidth==0.1.7
 websocket-client==0.56.0
 wrapt==1.11.2
 xmltodict==0.12.0
-semver==2.13.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index b50d84ecdc4..712949c2b36 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -5,16 +5,20 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.20.0
 azure-cli-core==2.20.0
 azure-cli-telemetry==1.0.6
+azure-cli==2.20.0
 azure-common==1.1.22
+azure-core==1.10.0
 azure-cosmos==3.2.0
 azure-datalake-store==0.0.49
 azure-functions-devops-build==0.0.22
 azure-graphrbac==0.60.0
-azure-keyvault==1.1.0
+azure-identity==1.5.0
 azure-keyvault-administration==4.0.0b3
+azure-keyvault==1.1.0
+azure-keyvault==1.1.0
+azure-loganalytics==0.1.0
 azure-mgmt-advisor==2.0.1
 azure-mgmt-apimanagement==0.2.0
 azure-mgmt-appconfiguration==1.0.1
@@ -32,7 +36,6 @@ azure-mgmt-containerinstance==1.5.0
 azure-mgmt-containerregistry==3.0.0rc17
 azure-mgmt-containerservice==9.4.0
 azure-mgmt-core==1.2.1
-azure-core==1.10.0
 azure-mgmt-cosmosdb==3.0.0
 azure-mgmt-databoxedge==0.2.0
 azure-mgmt-datalake-analytics==0.2.1
@@ -78,12 +81,11 @@ azure-mgmt-signalr==0.4.0
 azure-mgmt-sql==0.26.0
 azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==17.0.0
+azure-mgmt-synapse==0.6.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.48.0
-azure-mgmt-synapse==0.6.0
 azure-multiapi-storage==0.6.0
 azure-nspkg==3.0.2
-azure-loganalytics==0.1.0
 azure-storage-common==1.4.2
 azure-synapse-accesscontrol==0.2.0
 azure-synapse-artifacts==0.3.0
@@ -122,16 +124,16 @@ pyreadline==2.1
 python-dateutil==2.8.0
 pytz==2019.1
 pywin32==228
-requests==2.22.0
 requests-oauthlib==1.2.0
+requests==2.22.0
 scp==0.13.2
+semver==2.13.0
 six==1.14.0
 sshtunnel==0.1.5
 tabulate==0.8.3
 urllib3==1.25.9
-vsts==0.1.25
 vsts-cd-manager==1.0.2
+vsts==0.1.25
 wcwidth==0.1.7
 websocket-client==0.56.0
 xmltodict==0.12.0
-semver==2.13.0
\ No newline at end of file
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index f723f6d3146..57b87d82598 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -58,15 +58,17 @@
     'azure-datalake-store~=0.0.49',
     'azure-functions-devops-build~=0.0.22',
     'azure-graphrbac~=0.60.0',
-    'azure-keyvault~=1.1.0',
+    'azure-identity',
     'azure-keyvault-administration==4.0.0b3',
+    'azure-keyvault~=1.1.0',
+    'azure-loganalytics~=0.1.0',
     'azure-mgmt-advisor>=2.0.1,<3.0.0',
     'azure-mgmt-apimanagement~=0.2.0',
-    'azure-mgmt-applicationinsights~=0.1.1',
     'azure-mgmt-appconfiguration~=1.0.1',
+    'azure-mgmt-applicationinsights~=0.1.1',
     'azure-mgmt-authorization~=0.61.0',
-    'azure-mgmt-batch~=9.0.0',
     'azure-mgmt-batchai~=2.0',
+    'azure-mgmt-batch~=9.0.0',
     'azure-mgmt-billing==1.0.0',
     'azure-mgmt-botservice~=0.3.0',
     'azure-mgmt-cdn==7.0.0',
@@ -75,8 +77,8 @@
     'azure-mgmt-consumption~=2.0',
     'azure-mgmt-containerinstance~=1.4',
     'azure-mgmt-containerregistry==3.0.0rc17',
-    'azure-mgmt-cosmosdb~=3.0.0',
     'azure-mgmt-containerservice~=9.4.0',
+    'azure-mgmt-cosmosdb~=3.0.0',
     'azure-mgmt-databoxedge~=0.2.0',
     'azure-mgmt-datalake-analytics~=0.2.1',
     'azure-mgmt-datalake-store~=0.5.0',
@@ -89,8 +91,8 @@
     'azure-mgmt-hdinsight~=2.2.0',
     'azure-mgmt-imagebuilder~=0.4.0',
     'azure-mgmt-iotcentral~=4.1.0',
-    'azure-mgmt-iothub~=0.12.0',
     'azure-mgmt-iothubprovisioningservices~=0.2.0',
+    'azure-mgmt-iothub~=0.12.0',
     'azure-mgmt-keyvault==8.0.0',
     'azure-mgmt-kusto~=0.3.0',
     'azure-mgmt-loganalytics~=8.0.0',
@@ -106,43 +108,42 @@
     'azure-mgmt-policyinsights~=0.5.0',
     'azure-mgmt-privatedns~=0.1.0',
     'azure-mgmt-rdbms~=3.1.0rc1',
-    'azure-mgmt-recoveryservices~=0.4.0',
     'azure-mgmt-recoveryservicesbackup~=0.11.0',
+    'azure-mgmt-recoveryservices~=0.4.0',
     'azure-mgmt-redhatopenshift==0.1.0',
     'azure-mgmt-redis~=7.0.0rc1',
     'azure-mgmt-relay~=0.1.0',
-    # 'azure-mgmt-reservations~=0.6.0',
     'azure-mgmt-reservations==0.6.0',  # TODO: Use requirements.txt instead of '==' #9781
+    # 'azure-mgmt-reservations~=0.6.0',
     'azure-mgmt-resource==12.0.0',
     'azure-mgmt-search~=8.0',
     'azure-mgmt-security~=0.6.0',
     'azure-mgmt-servicebus~=0.6.0',
     'azure-mgmt-servicefabric~=0.5.0',
     'azure-mgmt-signalr~=0.4.0',
-    'azure-mgmt-sql~=0.26.0',
     'azure-mgmt-sqlvirtualmachine~=0.5.0',
+    'azure-mgmt-sql~=0.26.0',
     'azure-mgmt-storage~=17.0.0',
+    'azure-mgmt-synapse~=0.6.0',
     'azure-mgmt-trafficmanager~=0.51.0',
     'azure-mgmt-web~=0.48.0',
-    'azure-mgmt-synapse~=0.6.0',
     'azure-multiapi-storage~=0.6.0',
-    'azure-loganalytics~=0.1.0',
     'azure-storage-common~=1.4',
     'azure-synapse-accesscontrol~=0.2.0',
     'azure-synapse-artifacts~=0.3.0',
     'azure-synapse-spark~=0.2.0',
     'fabric~=2.4',
+    'javaproperties==0.5.1',
     'jsmin~=2.2.2',
+    'jsondiff==1.2.0',
     'pytz==2019.1',
     'scp~=0.13.2',
+    'semver==2.13.0',
     'sshtunnel~=0.1.4',
     'urllib3[secure]>=1.25.9,<2.0.0',
     'vsts-cd-manager~=1.0.0,>=1.0.2',
     'websocket-client~=0.56.0',
-    'xmltodict~=0.12',
-    'javaproperties==0.5.1',
-    'jsondiff==1.2.0',
-    'semver==2.13.0'
+    'xmltodict~=0.12'
 ]
 
 TESTS_REQUIRE = [