diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst index 5154843afd4..78ae85888b6 100644 --- a/src/azure-cli-core/HISTORY.rst +++ b/src/azure-cli-core/HISTORY.rst @@ -3,6 +3,11 @@ Release History =============== +2.17.10 ++++++++ + +* Migrate the authentication library from ADAL to MSAL. + 2.17.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 index 68cf47589ce..5e509e601da 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -6,7 +6,7 @@ from __future__ import print_function -__version__ = "2.17.0" +__version__ = "2.17.10" 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 index d1e568bfb8d..b1ea47ee402 100644 --- a/src/azure-cli-core/azure/cli/core/_help.py +++ b/src/azure-cli-core/azure/cli/core/_help.py @@ -42,7 +42,7 @@ /_/ \_\/___|\__,_|_| \___| -Welcome to the cool new Azure CLI! +Welcome to Azure CLI v3 beta with MSAL support! Use `az --version` to display the current version. Here are the base commands: diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index ad7e28983e2..2263d840aa7 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -9,7 +9,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "2.17.0" +VERSION = "2.17.10" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. @@ -43,7 +43,6 @@ ] DEPENDENCIES = [ - 'adal~=1.2.3', 'argcomplete~=1.8', 'azure-cli-telemetry==1.0.6.*', 'colorama~=0.4.1', @@ -54,7 +53,7 @@ 'msrest>=0.4.4', 'msrestazure>=0.6.3', 'paramiko>=2.0.8,<3.0.0', - 'PyJWT', + 'PyJWT==1.7.1', 'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612 'requests~=2.22', 'six~=1.12', diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index fc055aa8501..52209745396 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -3,6 +3,11 @@ Release History =============== +2.17.10 ++++++++ + +* Migrate the authentication library from ADAL to MSAL. + 2.17.0 ++++++ diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py index fde564f6b5f..a6e65850529 100644 --- a/src/azure-cli/azure/cli/__main__.py +++ b/src/azure-cli/azure/cli/__main__.py @@ -17,7 +17,7 @@ from knack.log import get_logger __author__ = "Microsoft Corporation " -__version__ = "2.17.0" +__version__ = "2.17.10" # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 53672bc0211..2671049a064 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -5,8 +5,8 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==10.0.0 -azure-cli==2.17.0 -azure-cli-core==2.17.0 +azure-cli==2.17.10 +azure-cli-core==2.17.10 azure-cli-telemetry==1.0.6 azure-common==1.1.22 azure-cosmos==3.2.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 53672bc0211..2671049a064 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -5,8 +5,8 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==10.0.0 -azure-cli==2.17.0 -azure-cli-core==2.17.0 +azure-cli==2.17.10 +azure-cli-core==2.17.10 azure-cli-telemetry==1.0.6 azure-common==1.1.22 azure-cosmos==3.2.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 8f6e431a63f..001f92c714e 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -5,8 +5,8 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==10.0.0 -azure-cli==2.17.0 -azure-cli-core==2.17.0 +azure-cli==2.17.10 +azure-cli-core==2.17.10 azure-cli-telemetry==1.0.6 azure-common==1.1.22 azure-cosmos==3.2.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index dcd6a019916..6cbed7e0401 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -18,7 +18,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.17.0" +VERSION = "2.17.10" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. try: @@ -131,7 +131,6 @@ 'azure-synapse-accesscontrol~=0.2.0', 'azure-synapse-artifacts~=0.3.0', 'azure-synapse-spark~=0.2.0', - 'cryptography>=2.3.1,<3.0.0', 'fabric~=2.4', 'jsmin~=2.2.2', 'pytz==2019.1',