BigCat20196 · BigCat20196 · Mar 24, 2021 · Mar 16, 2021 · Mar 16, 2021 · Mar 16, 2021
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -21,7 +21,7 @@
 /src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy
 /src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/aro/ @mjudeikis @jim-minter
-/src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft
+/src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft @qwordy @akshayneema
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
 /src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft @Juliehzl
@@ -32,6 +32,7 @@
 /src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @Juliehzl @jsntcy
 /src/azure-cli/azure/cli/command_modules/dms/ @temandr @binuj
 /src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
+/src/azure-cli/azure/cli/command_modules/eventgrid/ @Juliehzl @evelyn-ys @VidyaKukke
 /src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @msyyc
 /src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @Juliehzl @kairu-ms
 /src/azure-cli/azure/cli/command_modules/iot/ @digimaun

diff --git a/README.md b/README.md
@@ -6,9 +6,7 @@
 
 A great cloud needs great tools; we're excited to introduce *Azure CLI*, our next generation multi-platform command line experience for Azure.
 
-Take a test run now from Azure Cloud Shell!
-
-[![](https://shell.azure.com/images/launchcloudshell.png "Launch Azure Cloud Shell")](https://shell.azure.com)
+Take a test run now from [Azure Cloud Shell](https://portal.azure.com/#cloudshell)!
 
 ## Installation
 
@@ -105,6 +103,19 @@ Please check [Tips for using Azure CLI effectively](https://docs.microsoft.com/e
 
 For more usage examples, take a look at our [GitHub samples repo](https://github.com/Azure/azure-cli-samples) or [https://docs.microsoft.com/cli/azure/overview](https://docs.microsoft.com/cli/azure/overview).
 
+### Write and run commands in Visual Studio Code
+
+With the [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli) Visual Studio Code extension, you can create `.azcli` files and use these features:
+- IntelliSense for commands and their arguments.
+- Snippets for commands, inserting required arguments automatically.
+- Run the current command in the integrated terminal.
+- Run the current command and show its output in a side-by-side editor.
+- Show documentation on mouse hover.
+- Display current subscription and defaults in status bar.
+- To enable IntelliSense for other file types like `.ps1` or `.sh`, see [microsoft/vscode-azurecli#48](https://github.com/microsoft/vscode-azurecli/issues/48).
+
+![Azure CLI Tools in Action](https://github.com/microsoft/vscode-azurecli/blob/main/images/in_action.gif?raw=true)
+
 ## Data Collection
 
 The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described in the repository. There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Our privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices.
@@ -179,7 +190,7 @@ $ pip3 install --upgrade --pre azure-cli --extra-index-url https://azurecliprod.
 
 The edge build is generated for each PR merged to the `dev` branch as a part of the Azure DevOps Pipelines. 
 
-## Get builds of arbitrary commit or PR
+### Get builds of arbitrary commit or PR
 
 If you would like to get builds of arbitrary commit or PR, see:
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -180,11 +180,16 @@ jobs:
   displayName: Test Windows MSI
 
   dependsOn: BuildWindowsMSI
-  # condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
-  condition: false
+  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
   pool:
     vmImage: 'vs2017-win2016'
   steps:
+  - task: DownloadPipelineArtifact@1
+    displayName: 'Download Build Artifacts'
+    inputs:
+      TargetPath: '$(Build.ArtifactStagingDirectory)/metadata'
+      artifactName: metadata
+
   - task: DownloadPipelineArtifact@1
     displayName: 'Download Build Artifacts'
     inputs:
@@ -196,16 +201,38 @@ jobs:
     inputs:
       targetType: inline
       script: |
+        if (-NOT ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) {  
+          # Start another Powershell process as Admin and execute this script again
+          $arguments = "& '" +$myinvocation.mycommand.definition + "'"
+          Start-Process powershell -Verb runAs -ArgumentList $arguments
+          # Stop if the PowerShell is not run as Admin
+          Break
+        }
+        # The following are executed by elevated PowerShell
+        az --version
+
         $InstallArgs = @(
-          "/I"
-          '"$env:SYSTEM_ARTIFACTSDIRECTORY/msi/Microsoft Azure CLI.msi"'
+          "/i"
+          "`"$env:SYSTEM_ARTIFACTSDIRECTORY\msi\Microsoft Azure CLI.msi`""
+          "/q"
           "/norestart"
-          "/L*v"
+          "/l*v"
           ".\install_logs.txt"
         )
+        $pre_installed_version=az version --query '\"azure-cli\"' -o tsv
+        $to_be_installed_version=Get-Content $(System.ArtifactsDirectory)/metadata/version
+        if ($pre_installed_version -eq $to_be_installed_version){
+          # See https://docs.microsoft.com/windows/win32/msi/reinstallmode about options of REINSTALLMODE
+          $reinstall_option="REINSTALL=ALL REINSTALLMODE=emus" 
+          $InstallArgs += $reinstall_option
+        }
         Start-Process "msiexec.exe" -ArgumentList $InstallArgs -Wait -NoNewWindow
         Get-Content .\install_logs.txt
-
+        $installed_version=az version --query '\"azure-cli\"' -o tsv
+        if ($installed_version -ne $to_be_installed_version){
+          echo "The MSI failed to install."
+          Exit 1
+        }
         az --version
         az self-test
 

diff --git a/build_scripts/windows/scripts/build.cmd b/build_scripts/windows/scripts/build.cmd
@@ -83,7 +83,7 @@ if not exist %PYTHON_DIR% (
     popd
 )
 set PYTHON_EXE=%PYTHON_DIR%\python.exe
-%PYTHON_EXE% -m pip install --upgrade pip==21.0.1
+%PYTHON_EXE% -m pip install --upgrade pip==21.0.1 setuptools==52.0.0
 
 robocopy %PYTHON_DIR% %BUILDING_DIR% /s /NFL /NDL
 
@@ -146,10 +146,26 @@ for /f %%f in ('dir /b /s *.pyc') do (
 )
 popd
 
+:: Remove __pycache__
+echo remove pycache
 for /d /r %BUILDING_DIR%\Lib\site-packages\pip %%d in (__pycache__) do (
     if exist %%d rmdir /s /q "%%d"
 )
 
+:: Remove aio
+echo remove aio
+for /d /r %BUILDING_DIR%\Lib\site-packages\azure\mgmt %%d in (aio) do (
+    if exist %%d rmdir /s /q "%%d"
+)
+
+:: Remove dist-info
+echo remove dist-info
+pushd %BUILDING_DIR%\Lib\site-packages
+for /d %%d in ("*.dist-info") do (
+    if exist %%d rmdir /s /q "%%d"
+)
+popd
+
 if %errorlevel% neq 0 goto ERROR
 
 ::ensure propagate_env_change.exe is available

diff --git a/doc/sphinx/__main__.py b/doc/sphinx/__main__.py
@@ -5,8 +5,6 @@
 # --------------------------------------------------------------------------------------------
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function
-
 import os
 import sphinx
 

diff --git a/doc/track_2_migration_roadmap.md b/doc/track_2_migration_roadmap.md
@@ -38,16 +38,16 @@ This document provides the roadmap for Track 2 SDK migration in Azure CLI. When
 | ACR   | Yes |Not Started | 04/30/2021 |Catherine||Preview (8.0.0b1) | Preview (3.0.0rc16) | Medium (Once two months) | Module |
 | CosmosDB   | Yes |Not Started | 04/30/2021 |Yong||GA (6.0.0) | Preview (2.0.0rc1) |  Medium (Once two months) |Module|
 | ServiceBus   | Yes |Not Started | 04/30/2021 |Catherine||GA (6.0.0) | GA (1.0.0) | Medium (Once four months) | Module |
-| CDN   | Yes |Not Started | 04/30/2021 |Yong||GA (10.0.0) | GA (6.0.0) | Low (Once half year) | Module |
-| NetAppFiles |  Yes |Not Started | 04/30/2021 |Yong||GA (1.0.0) | Preview (0.15.0) | Medium (Once two months) | Module|
+| CDN   | Yes |**Doing** | 04/30/2021 |Yong||GA (10.0.0) | GA (6.0.0) | Low (Once half year) | Module |
+| NetAppFiles |  Yes |**Doing** | 04/30/2021 |Yong||GA (1.0.0) | Preview (0.15.0) | Medium (Once two months) | Module|
 | PrivateDNS | Yes | Not Started | 04/30/2021 |Yong||Preview (1.0.0b1) | Preview (0.1.0) |N/A | Module |
 | ApplicationInsights   |Yes | Not Started | 04/30/2021 |Yong||GA (1.0.0) | Vendored_Preview (0.2.0) | N/A | Extension |
-| Firewall   |Yes| Not Started | 04/30/2021 |Yong|| Network: GA (17.0.0) | Network: Vendored_GA (13.0.0) | N/A | Extension |
+| Firewall   |Yes| **Completed** | 04/30/2021 |Yong|| Network: GA (17.0.0) | Network: Vendored_GA (13.0.0) | N/A | Extension |
 | Frontdoor   | Yes | Not Started | 04/30/2021 |Yong||Preview (1.0.0b1) | Vendored_Preview (0.3.1) | N/A | Extension |
 |**Phase 2: Management&Governance&others** |  |  | |  | |  |||||
 | CostManagement   | Yes | **Completed** | 06/30/2021 |||Vendored_GA (1.2.0) | N/A | N/A | Extension |
 | DataFactory   | Yes | **Completed** | 06/30/2021 |||Vendored_SDK | N/A | N/A | Extension |
-| RDBMS |  Yes|Not Started | 06/30/2021 |Yong||GA (8.0.0) | Preview (3.1.0rc1) | Medium (Once two months) | Module |
+| RDBMS |  Yes|**Completed** | 06/30/2021 |Yong||GA (8.0.0) | Preview (3.1.0rc1) | Medium (Once two months) | Module |
 | EventGrid | Yes |Not Started | 06/30/2021 |Catherine|| GA (8.0.0) | Preview (3.0.0rc8) | Medium (Once three months) | Module |
 | HDInsight | Yes |Not Started | 06/30/2021 |Catherine|| GA (7.0.0) | GA (2.1.0) | Medium (Once two months) | Module |
 | Kusto |  Yes |Not Started | 06/30/2021 |Catherine||Preview (1.0.0b1) | Preview (0.10.0) | Medium (Once two months | Module |

diff --git a/linter_exclusions.yml b/linter_exclusions.yml
@@ -223,6 +223,9 @@ aks create:
     enable_node_public_ip:
       rule_exclusions:
       - option_length_too_long
+    node_public_ip_prefix_id:
+      rule_exclusions:
+        - option_length_too_long
     enable_private_cluster:
       rule_exclusions:
       - option_length_too_long
@@ -271,6 +274,9 @@ aks nodepool add:
     enable_node_public_ip:
       rule_exclusions:
       - option_length_too_long
+    node_public_ip_prefix_id:
+      rule_exclusions:
+      - option_length_too_long
 aks update:
   parameters:
     aad_admin_group_object_ids:

diff --git a/scripts/_common.py b/scripts/_common.py
@@ -7,9 +7,6 @@
 
 # common utilities for scripts
 
-from __future__ import print_function
-
-
 def get_repo_root():
     """
     Returns the root path to this repository. The root is where .git folder is.

diff --git a/scripts/curl_install_pypi/install.py b/scripts/curl_install_pypi/install.py
@@ -14,7 +14,6 @@
 
 #pylint: disable=line-too-long
 
-from __future__ import print_function
 import os
 import sys
 import platform

diff --git a/scripts/dev_setup.py b/scripts/dev_setup.py
@@ -5,8 +5,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import sys
 import os
 from subprocess import check_call, CalledProcessError

diff --git a/scripts/dump_command_table.py b/scripts/dump_command_table.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import argparse
 import inspect
 import json

diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+2.21.0
+++++++
+* Unify ADAL and MSAL error handler (#17072)
+* Add support for specifying minimum required version of an extension to work with the current core version (#16751)
+
 2.20.0
 ++++++
 * Minor fixes

diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -4,9 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-from __future__ import print_function
-
-__version__ = "2.20.0"
+__version__ = "2.21.0"
 
 import os
 import sys

diff --git a/src/azure-cli-core/azure/cli/core/_help.py b/src/azure-cli-core/azure/cli/core/_help.py
@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
 import argparse
 
 from azure.cli.core.commands import ExtensionCommandSource

diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import collections
 import errno
 import json

diff --git a/src/azure-cli-core/azure/cli/core/commands/__init__.py b/src/azure-cli-core/azure/cli/core/commands/__init__.py
@@ -5,8 +5,6 @@
 
 # pylint: disable=too-many-lines
 
-from __future__ import print_function
-
 import argparse
 import datetime
 import json

diff --git a/src/azure-cli-core/azure/cli/core/commands/template_create.py b/src/azure-cli-core/azure/cli/core/commands/template_create.py
@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
 import platform
 
 from azure.cli.core.commands.arm import resource_exists

diff --git a/src/azure-cli-core/azure/cli/core/file_util.py b/src/azure-cli-core/azure/cli/core/file_util.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 from azure.cli.core._help import CliCommandHelpFile, CliGroupHelpFile
 
 from knack.log import get_logger

diff --git a/src/azure-cli-core/azure/cli/core/parser.py b/src/azure-cli-core/azure/cli/core/parser.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import difflib
 
 import argparse

diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py
@@ -136,7 +136,7 @@ def default_api_version(self):
 AZURE_API_PROFILES = {
     'latest': {
         ResourceType.MGMT_STORAGE: '2021-01-01',
-        ResourceType.MGMT_NETWORK: '2020-08-01',
+        ResourceType.MGMT_NETWORK: '2020-11-01',
         ResourceType.MGMT_COMPUTE: SDKProfile('2020-12-01', {
             'resource_skus': '2019-04-01',
             'disks': '2020-09-30',

diff --git a/src/azure-cli-core/azure/cli/core/tests/test_help.py b/src/azure-cli-core/azure/cli/core/tests/test_help.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import logging
 import shutil
 import inspect

diff --git a/src/azure-cli-core/azure/cli/core/util.py b/src/azure-cli-core/azure/cli/core/util.py
@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=too-many-lines
 
-from __future__ import print_function
 import sys
 import json
 import getpass

diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
@@ -5,11 +5,10 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from __future__ import print_function
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.20.0"
+VERSION = "2.21.0"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.