Update parsing logic for the output of nuget list command (#2732)

Author: Francisco-Gamino

build/BuildSteps.cs

@@ -66,19 +66,9 @@ public static void UpdatePackageVersionForIntegrationTests()
                 foreach (var package in packagesToUpdate)
                 {
                     var packageInfo = GetLatestPackageInfo(name: package.Name, majorVersion: package.MajorVersion, source: AzureFunctionsPreReleaseFeedName);
+                    Shell.Run("dotnet", $"add package {packageInfo.Name} -v {packageInfo.Version} -s {AzureFunctionsPreReleaseFeedName} --no-restore");
 
-                    if (string.IsNullOrEmpty(packageInfo))
-                    {
-                        throw new Exception($"Failed to get {package} package information from {AzureFunctionsPreReleaseFeedName}.");
-                    }
-
-                    var parts = packageInfo.Split(" ");
-                    var packageName = parts[0];
-                    var packageVersion = parts[1];
-
-                    Shell.Run("dotnet", $"add package {packageName} -v {packageVersion} -s {AzureFunctionsPreReleaseFeedName} --no-restore");
-
-                    buildPackages.Add(packageName, packageVersion);
+                    buildPackages.Add(packageInfo.Name, packageInfo.Version);
                 }
             }
             finally
@@ -657,31 +647,42 @@ private static void RemoveLanguageWorkers(string outputPath)
             }
         }
 
-        private static string GetLatestPackageInfo(string name, string majorVersion, string source)
+        private static PackageInfo GetLatestPackageInfo(string name, string majorVersion, string source)
         {
             string includeAllVersion = !string.IsNullOrWhiteSpace(majorVersion) ? "-AllVersions" : string.Empty;
             string packageInfo = Shell.GetOutput("NuGet", $"list {name} -Source {source} -prerelease {includeAllVersion}");
 
-            if (string.IsNullOrEmpty(packageInfo))
+            if (packageInfo.Contains("No packages found", StringComparison.OrdinalIgnoreCase))
             {
-                throw new Exception($"Failed to get {name} package information from {source}.");
+                throw new Exception($"Package name {name} not found in {source}.");
             }
 
             if (!string.IsNullOrWhiteSpace(majorVersion))
             {
                 foreach (var package in packageInfo.Split(Environment.NewLine))
                 {
-                    var version = package.Split(" ")[1];
-                    if (version.StartsWith(majorVersion))
+                    var thisPackage = NewPackageInfo(package);
+                    if (thisPackage.Name.Equals(name, StringComparison.OrdinalIgnoreCase) && thisPackage.Version.StartsWith(majorVersion))
                     {
-                        return package;
+                        return thisPackage;
                     }
                 }
 
                 throw new Exception($"Failed to find {name} package for major version {majorVersion}.");
             }
 
-            return packageInfo;
+            return NewPackageInfo(packageInfo);
+        }
+
+        private static PackageInfo NewPackageInfo(string packageInfo)
+        {
+            var parts = packageInfo.Split(" ");
+            if (parts.Length > 2)
+            {
+                throw new Exception($"Invalid package format. The string should only contain 'name<space>version'. Current value: '{packageInfo}'");
+            }
+
+            return new PackageInfo(Name: parts[0], Version: parts[1]);
         }
     }
 }

build/PackageInfo.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Build
+{
+    internal class PackageInfo
+    {
+        public PackageInfo(string Name, string Version)
+        {
+            this.Name = Name;
+            this.Version = Version;
+        }
+
+        public string Name { get; set; }
+        public string Version { get; set; }
+    }
+}