build fixes

Author: alerickson

src/code/ContainerRegistryServerAPICalls.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -81,12 +82,12 @@ public ContainerRegistryServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmd
 
         #region Overridden Methods
 
-        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type)
+        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionAsync is not implemented for ContainerRegistryServerAPICalls.");
         }
 
-        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest)
+        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionGlobbingAsync is not implemented for ContainerRegistryServerAPICalls.");   
         }
@@ -157,7 +158,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
         }
 
 
-        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
+        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindNameAsync is not implemented for ContainerRegistryServerAPICalls.");
         }

src/code/LocalServerApiCalls.cs

@@ -14,6 +14,7 @@
 using System.Management.Automation;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
+using System.Collections.Concurrent;
 
 namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
 {
@@ -40,12 +41,12 @@ public LocalServerAPICalls (PSRepositoryInfo repository, PSCmdlet cmdletPassedIn
 
         #region Overridden Methods
 
-        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type)
+        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException();
         }
 
-        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest)
+        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException();
         }
@@ -119,7 +120,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
             return FindNameHelper(packageName, Utils.EmptyStrArray, includePrerelease, type, out errRecord);
         }
 
-        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
+        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException();
         }

src/code/NuGetServerAPICalls.cs

@@ -13,6 +13,7 @@
 using System.Net;
 using System.Runtime.ExceptionServices;
 using System.Management.Automation;
+using System.Collections.Concurrent;
 
 namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
 {
@@ -48,12 +49,12 @@ public NuGetServerAPICalls (PSRepositoryInfo repository, PSCmdlet cmdletPassedIn
 
         #region Overridden Methods
 
-        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type)
+        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionAsync is not implemented for NuGetServerAPICalls.");
         }
 
-        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest)
+        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionGlobbingAsync is not implemented for NuGetServerAPICalls.");
         }
@@ -192,7 +193,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
             return new FindResults(stringResponse: new string[]{ response }, hashtableResponse: emptyHashResponses, responseType: FindResponseType);
         }
 
-        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
+        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindNameAsync is not implemented for NuGetServerAPICalls.");
         }

src/code/V2ServerAPICalls.cs

@@ -981,7 +981,33 @@ public override Stream InstallPackage(string packageName, string packageVersion,
                 return results;
             }
 
-            results = InstallVersionAsync(packageName, packageVersion).GetAwaiter().GetResult();
+            results = InstallVersion(packageName, packageVersion, out errRecord);
+            return results;
+        }
+
+        /// <summary>
+        /// Installs a specific package.
+        /// User may request to install package with or without providing version (as seen in examples below), but prior to calling this method the package is located and package version determined.
+        /// Therefore, package version should not be null in this method.
+        /// Name: no wildcard support.
+        /// Examples: Install "PowerShellGet"
+        ///           Install "PowerShellGet" -Version "3.0.0"
+        /// </summary>
+        public async Task<Stream> InstallPackageAsync(string packageName, string packageVersion, bool includePrerelease, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
+        {
+            Stream results = new MemoryStream();
+            if (string.IsNullOrEmpty(packageVersion))
+            {
+                errorMsgs.Enqueue(new ErrorRecord(
+                    exception: new ArgumentNullException($"Package version could not be found for {packageName}"),
+                    "PackageVersionNullOrEmptyError",
+                    ErrorCategory.InvalidArgument,
+                    this));
+
+                return results;
+            }
+
+            results = await InstallVersionAsync(packageName, packageVersion, errorMsgs, debugMsgs);
             return results;
         }
 

src/code/V3ServerAPICalls.cs

@@ -14,6 +14,7 @@
 using System.Threading.Tasks;
 using System.Collections;
 using System.Management.Automation;
+using System.Collections.Concurrent;
 
 namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
 {
@@ -88,12 +89,12 @@ public V3ServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmdletPassedIn, Ne
 
         #region Overridden Methods
 
-        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type)
+        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionAsync is not implemented for V3ServerAPICalls.");
         }
 
-        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest)
+        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionAsync is not implemented for V3ServerAPICalls.");
         }
@@ -165,7 +166,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
             return FindNameHelper(packageName, tags: Utils.EmptyStrArray, includePrerelease, type, out errRecord);
         }
 
-        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
+        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> debugMsgs)
         {
             throw new NotImplementedException("FindVersionAsync is not implemented for V3ServerAPICalls.");
         }