From 63dd5a19e20af5c84cefba7d733eafb99161cafc Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 12 Feb 2020 14:15:54 -0800
Subject: [PATCH] Fix package sorting for syncing to private Module Feed
 (#11838)

---
 .../SyncGalleryToAzArtifacts.psm1             | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1 b/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1
index 8a2d98f47..351f5ce78 100644
--- a/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1
+++ b/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1
@@ -34,7 +34,7 @@ function SyncGalleryToAzArtifacts {
     foreach ($package in $packages) {
         try {
             # Get module from gallery
-            $foundPackageOnGallery = Find-Package -ProviderName NuGet -Source $galleryUrl -AllVersions -Name $package.Name -Force -AllowPreReleaseVersion | Sort-Object -Property Version -Descending | Select-Object -First 1
+            $foundPackageOnGallery = Find-Package -ProviderName NuGet -Source $galleryUrl -AllVersions -Name $package.Name -Force -AllowPreReleaseVersion | SortPackage | Select-Object -First 1
             Write-Verbose -Verbose "Found module $($package.Name) - $($foundPackageOnGallery.Version) in gallery"
             $galleryPackages += $foundPackageOnGallery
         } catch {
@@ -51,7 +51,7 @@ function SyncGalleryToAzArtifacts {
             # Get module from Az Artifacts
             # There seems to be a bug in the feed with RequiredVersion matching. Adding workaround with post filtering.
             # Issue: https://github.com/OneGet/oneget/issues/397
-            $foundPackageOnAz = Find-Package -ProviderName NuGet -Source $azArtifactsUrl -AllVersions -Name $package.Name -Force -Credential $azDevOpsCreds -AllowPreReleaseVersion | Sort-Object -Property Version -Descending | Select-Object -First 1
+            $foundPackageOnAz = Find-Package -ProviderName NuGet -Source $azArtifactsUrl -AllVersions -Name $package.Name -Force -Credential $azDevOpsCreds -AllowPreReleaseVersion | SortPackage | Select-Object -First 1
             Write-Verbose -Verbose "Found module $($package.Name) - $($foundPackageOnAz.Version) in azArtifacts"
             $azArtifactsPackages += $foundPackageOnAz
         } catch {
@@ -120,6 +120,47 @@ function SyncGalleryToAzArtifacts {
 
 }
 
+
+
+Function SortPackage {
+    param(
+        [Parameter(ValueFromPipeline = $true)]
+        [Microsoft.PackageManagement.Packaging.SoftwareIdentity[]]
+        $packages
+    )
+
+    Begin {
+        $allPackages = @()
+    }
+
+    Process {
+        $allPackages += $packages
+    }
+
+    End {
+        $versions = $allPackages.Version |
+        Foreach-Object { ($_ -split '-')[0] } |
+        Select-Object -Unique |
+        Sort-Object -Descending -Property Version
+
+        foreach ($version in $versions) {
+            $exactMatch = $allPackages | Where-Object {
+                Write-Verbose "testing $($_.version) -eq $version"
+                $_.version -eq $version
+            }
+
+            if ($exactMatch) {
+                Write-Output $exactMatch
+            }
+
+            $allPackages | Where-Object {
+                $_.version -like "${version}-*"
+            } | Sort-Object -Descending -Property Version | Write-Output
+        }
+    }
+}
+
+
 function NormalizeVersion {
     param ([string] $version)