From 5ff67865531a2a2ecb07770e2f57d404bb5783f6 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Thu, 25 Feb 2021 12:20:37 -0800
Subject: [PATCH 1/2] return package path alongside

---
 eng/scripts/Language-Settings.ps1    | 2 +-
 scripts/devops_tasks/common_tasks.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 5b7044afee3e..7dff11c4541c 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -22,7 +22,7 @@ function Get-python-PackageInfoFromRepo  ($pkgPath, $serviceDirectory, $pkgName)
     $setupProps = $null
     try{
       pip install packaging==20.4 -q -I
-      $setupProps = (python -c "import sys; import os; sys.path.append(os.path.join('scripts', 'devops_tasks')); from common_tasks import get_package_properties; obj=get_package_properties('$setupLocation'); print('{0},{1},{2}'.format(obj[0], obj[1], obj[2]));") -split ","
+      $setupProps = (python -c "import sys; import os; sys.path.append(os.path.join('scripts', 'devops_tasks')); from common_tasks import get_package_properties; obj=get_package_properties('$setupLocation'); print('{0},{1},{2},{3}'.format(obj[0], obj[1], obj[2], obj[3]));") -split ","
     }
     catch
     {
diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py
index 1ec5d86cdbf3..43638e5e545a 100644
--- a/scripts/devops_tasks/common_tasks.py
+++ b/scripts/devops_tasks/common_tasks.py
@@ -475,4 +475,4 @@ def get_package_properties(setup_py_path):
     """
     pkgName, version, _, requires = parse_setup(setup_py_path)
     is_new_sdk = pkgName in NEW_REQ_PACKAGES or any(map(lambda x: (parse_require(x)[0] in NEW_REQ_PACKAGES), requires))
-    return pkgName, version, is_new_sdk
+    return pkgName, version, is_new_sdk, os.path.normpath(os.path.join(setup_py_path, 'setup.py'))

From 890daa52be60ff6c8618a5a24d118c98fb9501c3 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Thu, 25 Feb 2021 12:24:36 -0800
Subject: [PATCH 2/2] make it just the directory we're passing in

---
 scripts/devops_tasks/common_tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py
index 43638e5e545a..733a53c00b88 100644
--- a/scripts/devops_tasks/common_tasks.py
+++ b/scripts/devops_tasks/common_tasks.py
@@ -475,4 +475,4 @@ def get_package_properties(setup_py_path):
     """
     pkgName, version, _, requires = parse_setup(setup_py_path)
     is_new_sdk = pkgName in NEW_REQ_PACKAGES or any(map(lambda x: (parse_require(x)[0] in NEW_REQ_PACKAGES), requires))
-    return pkgName, version, is_new_sdk, os.path.normpath(os.path.join(setup_py_path, 'setup.py'))
+    return pkgName, version, is_new_sdk, setup_py_path