From b470197731de0a976ca4e6c791c23189740d3fea Mon Sep 17 00:00:00 2001
From: Adam Dobrawy <ad-m@users.noreply.github.com>
Date: Wed, 13 May 2020 08:48:51 +0200
Subject: [PATCH 1/2] Add missing dependency for azure-common

---
 sdk/core/azure-common/setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py
index 304770af255e..f50da2961ad8 100644
--- a/sdk/core/azure-common/setup.py
+++ b/sdk/core/azure-common/setup.py
@@ -75,6 +75,7 @@
         'azure.common',
         'azure.profiles'
     ],
+    install_requires=["adal", "msrestazure"],
     extras_require={
         ":python_version<'3.0'": ['azure-nspkg'],
     }

From 82300e020f947d018b5287068f131312ba0c256d Mon Sep 17 00:00:00 2001
From: Adam Dobrawy <naczelnik@jawnosc.tk>
Date: Mon, 25 May 2020 16:39:24 +0200
Subject: [PATCH 2/2] Import on scope to reduce dependencies

---
 sdk/core/azure-common/azure/common/client_factory.py | 6 +++---
 sdk/core/azure-common/setup.py                       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sdk/core/azure-common/azure/common/client_factory.py b/sdk/core/azure-common/azure/common/client_factory.py
index 432ef187e515..5819dbb15d65 100644
--- a/sdk/core/azure-common/azure/common/client_factory.py
+++ b/sdk/core/azure-common/azure/common/client_factory.py
@@ -14,9 +14,6 @@
 except ImportError:
     from inspect import getargspec as get_arg_spec
 
-import adal
-from msrestazure.azure_active_directory import AdalAuthentication
-
 from .credentials import get_azure_cli_credentials
 from .cloud import get_cli_active_cloud
 
@@ -153,6 +150,9 @@ def get_client_from_json_dict(client_class, config_dict, **kwargs):
     :param dict config_dict: A config dict.
     :return: An instantiated client
     """
+    import adal
+    from msrestazure.azure_active_directory import AdalAuthentication
+
     is_graphrbac = client_class.__name__ == 'GraphRbacManagementClient'
     is_keyvault = client_class.__name__ == 'KeyVaultClient'
     parameters = {
diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py
index f50da2961ad8..304770af255e 100644
--- a/sdk/core/azure-common/setup.py
+++ b/sdk/core/azure-common/setup.py
@@ -75,7 +75,6 @@
         'azure.common',
         'azure.profiles'
     ],
-    install_requires=["adal", "msrestazure"],
     extras_require={
         ":python_version<'3.0'": ['azure-nspkg'],
     }