From 0d799b026bd6fdc613a83c36b9f47bd82efcd4c8 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 23 Feb 2022 11:36:38 -0800
Subject: [PATCH 1/3] patching conda version to current. removing pin of
 azure-mgmt-resources

---
 eng/conda_env.yml               | 2 +-
 eng/conda_test_requirements.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/conda_env.yml b/eng/conda_env.yml
index 4c674de246a3..b432e880cdbb 100644
--- a/eng/conda_env.yml
+++ b/eng/conda_env.yml
@@ -1,2 +1,2 @@
 variables:
-  AZURESDK_CONDA_VERSION: '2021.05.01b1'
+  AZURESDK_CONDA_VERSION: '2021.12.01'
diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt
index 78d7ca62136e..b359bbbf5b7c 100644
--- a/eng/conda_test_requirements.txt
+++ b/eng/conda_test_requirements.txt
@@ -1,5 +1,4 @@
 # install from root of repo
-azure-mgmt-resource==20.0.0
 aiohttp>=3.0; python_version >= '3.5'
 tools/azure-devtools
 tools/azure-sdk-tools

From e88ea56a7ad8b381202497033060f0eb6f7b8b3a Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 18 May 2022 16:53:12 -0700
Subject: [PATCH 2/3] temporarily disable py.typed validation on mgmt until I
 can get a commit fix in

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

diff --git a/eng/tox/verify_sdist.py b/eng/tox/verify_sdist.py
index e0b4f6081614..ba149529fbd8 100644
--- a/eng/tox/verify_sdist.py
+++ b/eng/tox/verify_sdist.py
@@ -148,7 +148,7 @@ def verify_sdist_pytyped(
             logging.info("Failed to verify sdist for package [%s]", pkg_name)
             exit(1)
 
-    if pkg_name not in EXCLUDED_PYTYPE_PACKAGES and "-nspkg" not in pkg_name:
+    if pkg_name not in EXCLUDED_PYTYPE_PACKAGES and "-nspkg" and "-mgmt" not in pkg_name:
         logging.info("Verifying presence of py.typed: [%s]", pkg_name)
         if verify_sdist_pytyped(pkg_dir, namespace, package_data, include_package_data):
             logging.info("Py.typed setup.py kwargs are set properly: [%s]", pkg_name)

From 15f0e582384ae3285b32cafff4d5224259c7a117 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 18 May 2022 16:55:27 -0700
Subject: [PATCH 3/3] boolean experession in verify_sdist was invalid. resolved

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

diff --git a/eng/tox/verify_sdist.py b/eng/tox/verify_sdist.py
index ba149529fbd8..6815703798a8 100644
--- a/eng/tox/verify_sdist.py
+++ b/eng/tox/verify_sdist.py
@@ -148,7 +148,7 @@ def verify_sdist_pytyped(
             logging.info("Failed to verify sdist for package [%s]", pkg_name)
             exit(1)
 
-    if pkg_name not in EXCLUDED_PYTYPE_PACKAGES and "-nspkg" and "-mgmt" not in pkg_name:
+    if pkg_name not in EXCLUDED_PYTYPE_PACKAGES and "-nspkg" not in pkg_name and "-mgmt" not in pkg_name:
         logging.info("Verifying presence of py.typed: [%s]", pkg_name)
         if verify_sdist_pytyped(pkg_dir, namespace, package_data, include_package_data):
             logging.info("Py.typed setup.py kwargs are set properly: [%s]", pkg_name)