From ce06c179be54948f2757aa80b28d7001985b72e7 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 25 Jan 2021 12:59:36 -0800
Subject: [PATCH 01/13] mindep test all dependencies except nspkg

---
 eng/tox/install_depend_packages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/tox/install_depend_packages.py b/eng/tox/install_depend_packages.py
index c915915d97bb..f63e5e06a1df 100644
--- a/eng/tox/install_depend_packages.py
+++ b/eng/tox/install_depend_packages.py
@@ -60,7 +60,7 @@ def find_released_packages(setup_py_path, dependency_type):
     # this method returns list of required available package on PyPI in format <package-name>==<version>
 
     # parse setup.py and find install requires
-    requires = [r for r in get_install_requires(setup_py_path) if r.startswith('azure') and '-nspkg' not in r]
+    requires = [r for r in get_install_requires(setup_py_path) if '-nspkg' not in r]
 
     # Get available version on PyPI for each required package
     avlble_packages = [x for x in map(lambda x: process_requirement(x, dependency_type), requires) if x]

From ba17285fbab8b60b92cec4485302124be84bdb6d Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 25 Jan 2021 18:26:56 -0800
Subject: [PATCH 02/13] remove parameter that's causing problems

---
 eng/pipelines/test-all.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/pipelines/test-all.yml b/eng/pipelines/test-all.yml
index a922c84e1a4b..a06facf56196 100644
--- a/eng/pipelines/test-all.yml
+++ b/eng/pipelines/test-all.yml
@@ -7,7 +7,6 @@ stages:
     - template: ./templates/jobs/archetype-sdk-client.yml
       parameters:
         ToxEnvParallel: '--tenvparallel'
-        InjectedPackages: $(InjectedPackages)
         BuildTargetingString: $(BuildTargetingString)
         BuildDocs: false
         TestTimeoutInMinutes: 300

From 6b4c357c1b56d30c94d81649f967c4499b1e691e Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 26 Jan 2021 16:50:13 -0800
Subject: [PATCH 03/13] make certain we also pick up msrest

---
 eng/tox/verify_installed_packages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/tox/verify_installed_packages.py b/eng/tox/verify_installed_packages.py
index cee12559c01d..234b18bb323b 100644
--- a/eng/tox/verify_installed_packages.py
+++ b/eng/tox/verify_installed_packages.py
@@ -34,7 +34,7 @@ def verify_packages(package_file_path):
         sys.exit(1)
 
     # find installed and expected packages
-    installed = dict(p.split('==') for p in get_installed_packages() if p.startswith('azure') and "==" in p)
+    installed = dict(p.split('==') for p in get_installed_packages() if "==" in p)
     expected = dict(p.split('==') for p in packages)
 
     missing_packages = [pkg for pkg in expected.keys() if installed.get(pkg) != expected.get(pkg)]

From 902fd49a5dcc811cb8fd315bcb51068cfd54e023 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:00:25 -0800
Subject: [PATCH 04/13] remove duplicate msrest requirement

---
 sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt | 1 -
 .../azure-applicationinsights/dev_requirements.txt               | 1 -
 sdk/core/azure-common/dev_requirements.txt                       | 1 -
 sdk/core/azure-core/dev_requirements.txt                         | 1 -
 sdk/core/azure-mgmt-core/dev_requirements.txt                    | 1 -
 sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt  | 1 -
 sdk/loganalytics/azure-loganalytics/dev_requirements.txt         | 1 -
 sdk/media/azure-media-analytics-edge/dev_requirements.txt        | 1 -
 sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt  | 1 -
 9 files changed, 9 deletions(-)

diff --git a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
index fd97c3aa22af..3aa187f95602 100644
--- a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
+++ b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
@@ -1,5 +1,4 @@
 ../../core/azure-core
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.10
 -e ../../../tools/azure-sdk-tools
\ No newline at end of file
diff --git a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
index ba61c611dd47..6ccb7f031ddd 100644
--- a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
+++ b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
@@ -1,2 +1 @@
 -e ../../../tools/azure-sdk-tools
-msrestazure
diff --git a/sdk/core/azure-common/dev_requirements.txt b/sdk/core/azure-common/dev_requirements.txt
index 38b4f8a2043f..67907583c8af 100644
--- a/sdk/core/azure-common/dev_requirements.txt
+++ b/sdk/core/azure-common/dev_requirements.txt
@@ -1,3 +1,2 @@
 -e ../../../tools/azure-sdk-tools
 -e ../azure-core
-msrestazure
diff --git a/sdk/core/azure-core/dev_requirements.txt b/sdk/core/azure-core/dev_requirements.txt
index 8282db3e5ef6..2f9390485e25 100644
--- a/sdk/core/azure-core/dev_requirements.txt
+++ b/sdk/core/azure-core/dev_requirements.txt
@@ -1,4 +1,3 @@
-msrest
 trio; python_version >= '3.5'
 aiohttp>=3.0; python_version >= '3.5'
 typing_extensions>=3.7.2
diff --git a/sdk/core/azure-mgmt-core/dev_requirements.txt b/sdk/core/azure-mgmt-core/dev_requirements.txt
index c3149fd2e6de..109a15733f4f 100644
--- a/sdk/core/azure-mgmt-core/dev_requirements.txt
+++ b/sdk/core/azure-mgmt-core/dev_requirements.txt
@@ -1,4 +1,3 @@
-msrest
 trio; python_version >= '3.5'
 aiohttp>=3.0; python_version >= '3.5'
 typing_extensions>=3.7.2
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt b/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt
index 50aff5552baa..013312c22f34 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt
@@ -4,4 +4,3 @@
 ../../core/azure-core
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.12
diff --git a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
index d826aa7b318b..fc4514eab3ef 100644
--- a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
+++ b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
@@ -1,3 +1,2 @@
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
-msrestazure
diff --git a/sdk/media/azure-media-analytics-edge/dev_requirements.txt b/sdk/media/azure-media-analytics-edge/dev_requirements.txt
index e2239c7fa7bd..cf959a9f3ff1 100644
--- a/sdk/media/azure-media-analytics-edge/dev_requirements.txt
+++ b/sdk/media/azure-media-analytics-edge/dev_requirements.txt
@@ -4,6 +4,5 @@
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
 aiodns>=2.0; python_version >= '3.5'
-msrest>=0.6.10
 tox>=3.20.0
 tox-monorepo>=0.1.2
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt b/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt
index 052d3190567b..afbe67426b9a 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt
@@ -3,4 +3,3 @@
 -e ../../identity/azure-identity
 ../../core/azure-core
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.12

From 75514cb931d7acb1d029083e7db252dc22488676 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:21:32 -0800
Subject: [PATCH 05/13] earliest we can reliably test on msrest is 0.6.10

---
 eng/tox/install_depend_packages.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/tox/install_depend_packages.py b/eng/tox/install_depend_packages.py
index f63e5e06a1df..29dd355022fb 100644
--- a/eng/tox/install_depend_packages.py
+++ b/eng/tox/install_depend_packages.py
@@ -28,7 +28,8 @@
 logging.getLogger().setLevel(logging.INFO)
 
 MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
-    'azure-common': '1.1.10'
+    'azure-common': '1.1.10',
+    'msrest': '0.6.10'
 }
 
 def install_dependent_packages(setup_py_file_path, dependency_type, temp_dir):

From 7112bd87ae3c6309bb6906c2b17678f3227a0db1 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 14:08:43 -0800
Subject: [PATCH 06/13] application insights needs msrestazure and azure-core

---
 .../azure-applicationinsights/dev_requirements.txt              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
index 6ccb7f031ddd..740c9836a3fc 100644
--- a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
+++ b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
@@ -1 +1,3 @@
 -e ../../../tools/azure-sdk-tools
+msrestazure
+../../core/azure-core
\ No newline at end of file

From 0a1501f5d5c23e13c9733b75ebb2fecd890f4d9f Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 14:28:13 -0800
Subject: [PATCH 07/13] resolve azure-common sdist/whl errors. resolve
 azure-loganalytics whl/sdist test failures.

---
 sdk/core/azure-common/dev_requirements.txt               | 1 +
 sdk/loganalytics/azure-loganalytics/dev_requirements.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sdk/core/azure-common/dev_requirements.txt b/sdk/core/azure-common/dev_requirements.txt
index 67907583c8af..4f9a6c3b5482 100644
--- a/sdk/core/azure-common/dev_requirements.txt
+++ b/sdk/core/azure-common/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
 -e ../azure-core
+msrestazure
\ No newline at end of file
diff --git a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
index fc4514eab3ef..4e5a0ba0f2ff 100644
--- a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
+++ b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
+msrestazure
\ No newline at end of file

From cd1ee521af37531e2f9a3a999c3074753adbfa57 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 15:04:46 -0800
Subject: [PATCH 08/13] allow storagetestcase import failure

---
 .../azure-sdk-tools/devtools_testutils/storage_testcase.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py b/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py
index 163326800415..3a282155cf29 100644
--- a/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py
+++ b/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py
@@ -8,7 +8,12 @@
 import os
 from time import sleep
 
-from azure.core.exceptions import ResourceExistsError
+# let this import fail, this package is used intentionally without the presence of azure-core
+try:
+    from azure.core.exceptions import ResourceExistsError
+except:
+    pass
+
 from azure.mgmt.storage import StorageManagementClient
 from azure.mgmt.storage.models import StorageAccount, Endpoints
 

From 2c951b5e300136d264ace8d2d8a8adf2b9fa8941 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 16:27:27 -0800
Subject: [PATCH 09/13] need azure-sdk-tools to be present to run tests
 successfully

---
 sdk/formrecognizer/azure-ai-formrecognizer/setup.py             | 2 +-
 sdk/identity/azure-identity/setup.py                            | 2 +-
 .../azure-mgmt-machinelearningservices/dev_requirements.txt     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/setup.py b/sdk/formrecognizer/azure-ai-formrecognizer/setup.py
index 6f6153ac24ac..2e4038f03b96 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/setup.py
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/setup.py
@@ -81,7 +81,7 @@
     install_requires=[
         "azure-core<2.0.0,>=1.8.2",
         "msrest>=0.6.12",
-        'six>=1.6',
+        'six>=1.11.0',
         'azure-common~=1.1',
     ],
     extras_require={
diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py
index e1a57cffb680..7e6aabf9e7d2 100644
--- a/sdk/identity/azure-identity/setup.py
+++ b/sdk/identity/azure-identity/setup.py
@@ -76,7 +76,7 @@
         "cryptography>=2.1.4",
         "msal<2.0.0,>=1.6.0",
         "msal-extensions~=0.3.0",
-        "six>=1.6",
+        "six>=1.12.0",
     ],
     extras_require={
         ":python_version<'3.0'": ["azure-nspkg"],
diff --git a/sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt b/sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt
new file mode 100644
index 000000000000..6ccb7f031ddd
--- /dev/null
+++ b/sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt
@@ -0,0 +1 @@
+-e ../../../tools/azure-sdk-tools

From 4979de6abace1c6fe73b3eb8d674507ed0fe1763 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 16:47:34 -0800
Subject: [PATCH 10/13] update pinned

---
 shared_requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared_requirements.txt b/shared_requirements.txt
index a433cdff4533..3bf0e6555f04 100644
--- a/shared_requirements.txt
+++ b/shared_requirements.txt
@@ -185,3 +185,5 @@ opentelemetry-sdk==0.16b1
 #override azure-opentelemetry-exporter-azuremonitor azure-core<2.0.0,>=1.6.0
 #override azure-opentelemetry-exporter-azuremonitor msrest>=0.6.10
 #override azure-core-tracing-opentelemetry opentelemetry-api==0.13b0
+#override azure-identity six>=1.12.0
+#override azure-ai-formrecognizer six>=1.11.0

From 2d6e97b09fbdde4137f921e241ea75b33e5d5c18 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:08:15 -0800
Subject: [PATCH 11/13] updated changelogs to reflect change in six dependency

---
 sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md | 1 +
 sdk/identity/azure-identity/CHANGELOG.md                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
index 777ed2d74a9a..a949338dab67 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
@@ -8,6 +8,7 @@
 - `Style` is renamed to `TextStyle`
 - Client property `api_version` is no longer exposed. Pass keyword argument `api_version` into the client to select the
 API version
+- Bumped `six` requirement from `1.6` to `1.11.0`.
 
 ## 3.1.0b2 (2021-01-12)
 
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index 1cef31e82909..ab2053900234 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 1.5.1 (Unreleased)
-
+- Bumped `six` requirement from `1.6` to `1.12.0`.
 
 ## 1.5.0 (2020-11-11)
 ### Breaking Changes

From c21de6c3c58d6a71f4d9bf3e78d8d97ba5e7a479 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 2 Feb 2021 13:16:40 -0800
Subject: [PATCH 12/13] resolve issue with eventhub by bumping minimum version
 of six to 1.9. bump metricadvisor requirement

---
 eng/tox/install_depend_packages.py                      | 3 ++-
 sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md | 3 +++
 sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/tox/install_depend_packages.py b/eng/tox/install_depend_packages.py
index 29dd355022fb..7138482cf0e3 100644
--- a/eng/tox/install_depend_packages.py
+++ b/eng/tox/install_depend_packages.py
@@ -29,7 +29,8 @@
 
 MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
     'azure-common': '1.1.10',
-    'msrest': '0.6.10'
+    'msrest': '0.6.10',
+    'six': '1.9'
 }
 
 def install_dependent_packages(setup_py_file_path, dependency_type, temp_dir):
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
index 25e4831e6b1d..5b3694708e4b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
@@ -11,6 +11,9 @@
 
 - `list_dimension_values` has been renamed to `list_anomaly_dimension_values`
 
+**Hotfixes**
+
+- Bump `six` requirement from `1.6` to 1.11.0`
 ## 1.0.0b2 (2020-11-10)
 
 **Breaking Changes**
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py
index af31a042bb36..578e56eb284b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py
@@ -81,7 +81,7 @@
     install_requires=[
         "azure-core<2.0.0,>=1.6.0",
         "msrest>=0.6.12",
-        'six>=1.6',
+        'six>=1.11.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-ai-nspkg'],

From f8f3273b52efcb56358465b452ab5b6b0fcabf81 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 2 Feb 2021 13:36:37 -0800
Subject: [PATCH 13/13] update pinned dep

---
 shared_requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared_requirements.txt b/shared_requirements.txt
index 9460c8dbbd1c..e83f5d230fd1 100644
--- a/shared_requirements.txt
+++ b/shared_requirements.txt
@@ -189,3 +189,4 @@ opentelemetry-sdk==0.16b1
 #override azure-core-tracing-opentelemetry opentelemetry-api==0.13b0
 #override azure-identity six>=1.12.0
 #override azure-ai-formrecognizer six>=1.11.0
+#override azure-ai-metricsadvisor six>=1.11.0