From ea743da6196cf4f9458454923dc3dc5f90df077f Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 10:40:06 -0800
Subject: [PATCH 1/7] update apiview artifact search to account for the new
 artifact taxonomy

---
 eng/scripts/Language-Settings.ps1 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 755894e0b8e6..4d137761e72e 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -225,17 +225,16 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
     return $null
   }
 
-  $packageName = $artifactName + "-"
-  Write-Host "Searching for $($packageName) wheel in artifact path $($artifactDir)"
-  $files = Get-ChildItem "${artifactDir}" | Where-Object -FilterScript {$_.Name.StartsWith($packageName) -and $_.Name.EndsWith(".whl")}
+  Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
+  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | Where-Object -FilterScript $_.Name.EndsWith(".whl")}
   if (!$files)
   {
-    Write-Host "$($artifactDir) does not have wheel package for $($packageName)"
+    Write-Host "$($artifactDir) does not have wheel package for $($artifactName)"
     return $null
   }
   elseif($files.Count -ne 1)
   {
-    Write-Host "$($artifactDir) should contain only one published wheel package for $($packageName)"
+    Write-Host "$($artifactDir) should contain only one published wheel package for $($artifactName)"
     Write-Host "No of Packages $($files.Count)"
     return $null
   }

From 903a4eb26c67eef1c1b645fedeb6df24ae1f8b5c Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 11:19:16 -0800
Subject: [PATCH 2/7] correct syntax error in language-settings update

---
 eng/scripts/Language-Settings.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 4d137761e72e..13d46ca069ca 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -226,7 +226,7 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
   }
 
   Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
-  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | Where-Object -FilterScript $_.Name.EndsWith(".whl")}
+  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | Where-Object -FilterScript {$_.Name.EndsWith(".whl")}
   if (!$files)
   {
     Write-Host "$($artifactDir) does not have wheel package for $($artifactName)"

From c2ed0fc58c955ac7d14388887c4df4dcf1d923e7 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:34:51 -0800
Subject: [PATCH 3/7] update the output to say where it's looking

---
 eng/pipelines/templates/stages/archetype-python-release.yml | 4 ++--
 eng/scripts/Language-Settings.ps1                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/templates/stages/archetype-python-release.yml b/eng/pipelines/templates/stages/archetype-python-release.yml
index 7540e4bba413..ba80cecf9a23 100644
--- a/eng/pipelines/templates/stages/archetype-python-release.yml
+++ b/eng/pipelines/templates/stages/archetype-python-release.yml
@@ -292,8 +292,8 @@ stages:
                 exit 0
               }
 
-              twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$(Package.Name)/*a*.whl
+              twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$(Package.Name)/*-*a*.whl
               echo "Uploaded whl to devops feed $(DevFeedName)"
-              twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$(Package.Name)/*a*.zip
+              twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$(Package.Name)/*-*a*.zip
               echo "Uploaded sdist to devops feed $(DevFeedName)"
             displayName: 'Publish ${{artifact.name}} alpha package'
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 13d46ca069ca..06228812f047 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -229,12 +229,12 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
   $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | Where-Object -FilterScript {$_.Name.EndsWith(".whl")}
   if (!$files)
   {
-    Write-Host "$($artifactDir) does not have wheel package for $($artifactName)"
+    Write-Host "${artifactDir}/${artifactName.Replace("_","-")} does not have wheel package for $($artifactName)"
     return $null
   }
   elseif($files.Count -ne 1)
   {
-    Write-Host "$($artifactDir) should contain only one published wheel package for $($artifactName)"
+    Write-Host "${artifactDir}/${artifactName.Replace("_","-")} should contain only one published wheel package for $($artifactName)"
     Write-Host "No of Packages $($files.Count)"
     return $null
   }

From ee26e9e13a8d805448a9312eb97100bbe3c4788d Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:41:01 -0800
Subject: [PATCH 4/7] update the filter script to be simpler

---
 eng/scripts/Language-Settings.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 06228812f047..223818b52ac4 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -226,7 +226,7 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
   }
 
   Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
-  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | Where-Object -FilterScript {$_.Name.EndsWith(".whl")}
+  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | ? {$_.Name.EndsWith(".whl")}
   if (!$files)
   {
     Write-Host "${artifactDir}/${artifactName.Replace("_","-")} does not have wheel package for $($artifactName)"

From 5052591b90275621e80e07ba4138dc92fc1a8eb2 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:44:27 -0800
Subject: [PATCH 5/7] use JoinPath instead of /

---
 eng/scripts/Language-Settings.ps1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 223818b52ac4..e30ebccc8b2d 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -225,16 +225,18 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
     return $null
   }
 
+  $whlDirectory = Join-Path ${artifactDir} ${artifactName.Replace("_","-")}
+
   Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
-  $files = Get-ChildItem "${artifactDir}/${artifactName.Replace("_","-")}" | ? {$_.Name.EndsWith(".whl")}
+  $files = Get-ChildItem $whlDirectory | ? {$_.Name.EndsWith(".whl")}
   if (!$files)
   {
-    Write-Host "${artifactDir}/${artifactName.Replace("_","-")} does not have wheel package for $($artifactName)"
+    Write-Host "$whlDirectory does not have wheel package for $($artifactName)"
     return $null
   }
   elseif($files.Count -ne 1)
   {
-    Write-Host "${artifactDir}/${artifactName.Replace("_","-")} should contain only one published wheel package for $($artifactName)"
+    Write-Host "$whlDirectory should contain only one published wheel package for $($artifactName)"
     Write-Host "No of Packages $($files.Count)"
     return $null
   }

From 9c414a9292d6bdfaeced5d2425a6bd896c4fee44 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:44:58 -0800
Subject: [PATCH 6/7] correctly provide arguments

---
 eng/scripts/Language-Settings.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index e30ebccc8b2d..de81a48c2c09 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -225,7 +225,7 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
     return $null
   }
 
-  $whlDirectory = Join-Path ${artifactDir} ${artifactName.Replace("_","-")}
+  $whlDirectory = Join-Path -Path ${artifactDir} -ChildPath ${artifactName.Replace("_","-")}
 
   Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
   $files = Get-ChildItem $whlDirectory | ? {$_.Name.EndsWith(".whl")}

From 7fd20e2b70ddb1ce15b324632af9913f78544297 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:54:06 -0800
Subject: [PATCH 7/7] additional update

---
 eng/scripts/Language-Settings.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index de81a48c2c09..5b7044afee3e 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -225,9 +225,9 @@ function Find-python-Artifacts-For-Apireview($artifactDir, $artifactName)
     return $null
   }
 
-  $whlDirectory = Join-Path -Path ${artifactDir} -ChildPath ${artifactName.Replace("_","-")}
+  $whlDirectory = (Join-Path -Path $artifactDir -ChildPath $artifactName.Replace("_","-"))
 
-  Write-Host "Searching for $($artifactName) wheel in artifact path $($artifactDir)"
+  Write-Host "Searching for $($artifactName) wheel in artifact path $($whlDirectory)"
   $files = Get-ChildItem $whlDirectory | ? {$_.Name.EndsWith(".whl")}
   if (!$files)
   {