change processor count, revert TryReadPSDataFaile

Author: alerickson

src/code/FindHelper.cs

@@ -1179,10 +1179,10 @@ internal void FindDependencyPackagesHelper(ServerApiCall currentServer, Response
             if (currentPkg.Dependencies.Length > 0)
             {
                 // If finding more than 5 packages, do so concurrently
-                const int PARALLEL_THRESHOLD = 5; // TODO: Trottle limit from user, defaults to 5; 
+                //const int PARALLEL_THRESHOLD = 5; // TODO: Trottle limit from user, defaults to 5; 
                 int processorCount = Environment.ProcessorCount;
                 int maxDegreeOfParallelism = processorCount * 4;
-                if (currentPkg.Dependencies.Length > PARALLEL_THRESHOLD)
+                if (currentPkg.Dependencies.Length > processorCount)
                 {
                     Parallel.ForEach(currentPkg.Dependencies, new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism }, dep =>
                     {

src/code/InstallHelper.cs

@@ -924,7 +924,7 @@ private ConcurrentDictionary<string, Hashtable> InstallParentAndDependencyPackag
             // TODO: figure out a good threshold and parallel count
             int processorCount = Environment.ProcessorCount;
             _cmdletPassedIn.WriteDebug($"parentAndDeps.Count is {parentAndDeps.Count}, processor count is: {processorCount}");
-            if (parentAndDeps.Count > 0)
+            if (parentAndDeps.Count > processorCount)
             {
                  _cmdletPassedIn.WriteDebug($"parentAndDeps.Count is greater than processor count");
                 // Set the maximum degree of parallelism to 32? (Invoke-Command has default of 32, that's where we got this number from)
@@ -938,12 +938,6 @@ private ConcurrentDictionary<string, Hashtable> InstallParentAndDependencyPackag
 
                     Stream responseStream = currentServer.InstallPackage(depPkgName, depPkgVersion, true, out ErrorRecord installNameErrRecord);
 
-                    var nullresp = false;
-                    if (responseStream == null)
-                    {
-                        nullresp = true;
-                    }
-
                     // if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V2)
                     // {
                     //     // See if the network call we're making is already cached, if not, call FindNameAsync() and cache results
@@ -1103,10 +1097,10 @@ private bool TryInstallToTempPath(
             {
                 var pathToFile = Path.Combine(tempInstallPath, $"{pkgName}.{normalizedPkgVersion}.zip");
                 using var fs = File.Create(pathToFile);
-                if (responseStream == null)
-                {
-                    throw new InvalidOperationException("responseStream is null");
-                }
+                // if (responseStream == null)
+                // {
+                //     throw new InvalidOperationException("responseStream is null");
+                // }
                 responseStream.Seek(0, System.IO.SeekOrigin.Begin);
                 responseStream.CopyTo(fs);
                 fs.Close();

src/code/Utils.cs

@@ -1357,66 +1357,78 @@ private static bool TryReadPSDataFile(
                 runspace.Open();
                 runspace.SessionStateProxy.LanguageMode = PSLanguageMode.ConstrainedLanguage;
 
-                // Set the created runspace as the default for the current thread
-                //Runspace.DefaultRunspace = runspace;
-
-                using (System.Management.Automation.PowerShell pwsh = System.Management.Automation.PowerShell.Create())
+                // Save and set the default runspace for the current thread to prevent
+                // stale DefaultRunspace from a prior operation on this reused thread-pool thread.
+                Runspace previousDefaultRunspace = Runspace.DefaultRunspace;
+                try
                 {
-                    pwsh.Runspace = runspace;
-
-                    var cmd = new Command(
-                        command: contents,
-                        isScript: true,
-                        useLocalScope: true);
-                    cmd.MergeMyResults(
-                        myResult: PipelineResultTypes.Error | PipelineResultTypes.Warning | PipelineResultTypes.Verbose | PipelineResultTypes.Debug | PipelineResultTypes.Information,
-                        toResult: PipelineResultTypes.Output);
-                    pwsh.Commands.AddCommand(cmd);
-
+                    Runspace.DefaultRunspace = runspace;
 
-                    try
+                    using (System.Management.Automation.PowerShell pwsh = System.Management.Automation.PowerShell.Create())
                     {
-                        // Invoke the pipeline and retrieve the results
-                        var results = pwsh.Invoke();
+                        pwsh.Runspace = runspace;
+
+                        var cmd = new Command(
+                            command: contents,
+                            isScript: true,
+                            useLocalScope: true);
+                        cmd.MergeMyResults(
+                            myResult: PipelineResultTypes.Error | PipelineResultTypes.Warning | PipelineResultTypes.Verbose | PipelineResultTypes.Debug | PipelineResultTypes.Information,
+                            toResult: PipelineResultTypes.Output);
+                        pwsh.Commands.AddCommand(cmd);
 
-                        if (results[0] is PSObject pwshObj)
+                        try
                         {
-                            switch (pwshObj.BaseObject)
+                            // Invoke the pipeline and retrieve the results
+                            var results = pwsh.Invoke();
+
+                            if (results[0] is PSObject pwshObj)
                             {
-                                case ErrorRecord err:
-                                    //_cmdletPassedIn.WriteError(error);
-                                    break;
+                                switch (pwshObj.BaseObject)
+                                {
+                                    case ErrorRecord err:
+                                        //_cmdletPassedIn.WriteError(error);
+                                        break;
 
-                                case WarningRecord warning:
-                                    //cmdlet.WriteWarning(warning.Message);
-                                    break;
+                                    case WarningRecord warning:
+                                        //cmdlet.WriteWarning(warning.Message);
+                                        break;
 
-                                case VerboseRecord verbose:
-                                    //cmdlet.WriteVerbose(verbose.Message);
-                                    break;
+                                    case VerboseRecord verbose:
+                                        //cmdlet.WriteVerbose(verbose.Message);
+                                        break;
 
-                                case DebugRecord debug:
-                                    //cmdlet.WriteDebug(debug.Message);
-                                    break;
+                                    case DebugRecord debug:
+                                        //cmdlet.WriteDebug(debug.Message);
+                                        break;
 
-                                case InformationRecord info:
-                                    //cmdlet.WriteInformation(info);
-                                    break;
+                                    case InformationRecord info:
+                                        //cmdlet.WriteInformation(info);
+                                        break;
 
-                                case Hashtable result:
-                                    dataFileInfo = result;
-                                    return true;
+                                    case Hashtable result:
+                                        dataFileInfo = result;
+                                        return true;
+                                }
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            error = ex;
+                        }
                     }
-                    catch (Exception ex)
-                    {
-                        error = ex;
-                    }
+                    // Return false to indicate "we couldn't parse a valid Hashtable from this .psd1 file." 
+                    // The only success path is the 'case Hashtable result' branch above which does return true.
+                    return false;
+                }
+                finally
+                {
+                    // Always restore the previous default runspace and close/dispose
+                    // the per-thread runspace, even on success (return true) or exception paths.
+                    Runspace.DefaultRunspace = previousDefaultRunspace;
+                    runspace.Close();
+                    runspace.Dispose();
                 }
-                runspace.Close();
-                
-                return false;
             }
             catch (Exception ex)
             {