From 0f91dd0bf272813dbe8768406e4ad1052c11a8e1 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 15:16:49 -0500 Subject: [PATCH 01/11] add progress bar for install --- src/code/FindPSResource.cs | 2 ++ src/code/InstallHelper.cs | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/code/FindPSResource.cs b/src/code/FindPSResource.cs index f6a3c9ccf..393190bd2 100644 --- a/src/code/FindPSResource.cs +++ b/src/code/FindPSResource.cs @@ -229,8 +229,10 @@ private void ProcessResourceNameParameterSet() IncludeDependencies)) { foundPackages.Add(package); + WriteVerbose("pkgName: " + package.Name); } + foreach (var uniquePackageVersion in foundPackages.GroupBy( m => new {m.Name, m.Version, m.Repository}).Select( group => group.First()).ToList()) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index a08011eff..7057a31ac 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -218,6 +218,7 @@ private void ProcessRepositories( List pkgsInstalled = InstallPackage( pkgsFromRepoToInstall, + pckgNamesToInstall, repoName, repo.Url.AbsoluteUri, credential, @@ -279,13 +280,22 @@ private IEnumerable FilterByInstalledPkgs(IEnumerable InstallPackage( - IEnumerable pkgsToInstall, + IEnumerable pkgsToInstall, // those found to be required to be installed (includes Dependency packages as well) + List pckgNamesPassedInToInstall, // those requested by the user to be installed string repoName, string repoUrl, PSCredential credential, bool isLocalRepo) { List pkgsSuccessfullyInstalled = new List(); + int totalPkgs = pkgsToInstall.Count(); + + // by default this is 1, because if a parent package was already installed and only the dependent package + // needs to be installed we don't want a default value of 0 which throws a division error. + // if parent package isn't already installed we'll set this value properly in the below if condition anyways + int currentPkgNumOfDependentPkgs = 1; + int i = 1; + int j = 1; foreach (PSResourceInfo pkgInfo in pkgsToInstall) { var tempInstallPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); @@ -302,7 +312,31 @@ private List InstallPackage( _cmdletPassedIn.WriteVerbose(string.Format("Begin installing package: '{0}'", pkgInfo.Name)); - // TODO: add progress bar here + int activityId = 0; + string activity = ""; + string statusDescription = ""; + + if (pckgNamesPassedInToInstall.ToList().Contains(pkgInfo.Name, StringComparer.InvariantCultureIgnoreCase)) + { + // Installing parent package (one whose name was passed in to install) + activityId = 0; + activity = string.Format("Installing {0}...", pkgInfo.Name); + statusDescription = string.Format("{0}% Complete:", ((i++/totalPkgs) * 100)); + + currentPkgNumOfDependentPkgs = pkgInfo.Dependencies.Count(); + j = 1; + } + else + { + // Installing dependent package + activityId = 1; + activity = string.Format("Installing dependent package {0}...", pkgInfo.Name); + statusDescription = string.Format("{0}% Complete:", ((j++/currentPkgNumOfDependentPkgs) * 100)); + } + + var progressRecord = new ProgressRecord(activityId, activity, statusDescription); + _cmdletPassedIn.WriteProgress(progressRecord); + // Create PackageIdentity in order to download string createFullVersion = pkgInfo.Version.ToString(); From c58e7d96879a882611a7785a0580fd8d48cb24bb Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 15:16:49 -0500 Subject: [PATCH 02/11] add progress bar for install --- src/code/FindPSResource.cs | 2 ++ src/code/InstallHelper.cs | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/code/FindPSResource.cs b/src/code/FindPSResource.cs index f6a3c9ccf..393190bd2 100644 --- a/src/code/FindPSResource.cs +++ b/src/code/FindPSResource.cs @@ -229,8 +229,10 @@ private void ProcessResourceNameParameterSet() IncludeDependencies)) { foundPackages.Add(package); + WriteVerbose("pkgName: " + package.Name); } + foreach (var uniquePackageVersion in foundPackages.GroupBy( m => new {m.Name, m.Version, m.Repository}).Select( group => group.First()).ToList()) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index a08011eff..7057a31ac 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -218,6 +218,7 @@ private void ProcessRepositories( List pkgsInstalled = InstallPackage( pkgsFromRepoToInstall, + pckgNamesToInstall, repoName, repo.Url.AbsoluteUri, credential, @@ -279,13 +280,22 @@ private IEnumerable FilterByInstalledPkgs(IEnumerable InstallPackage( - IEnumerable pkgsToInstall, + IEnumerable pkgsToInstall, // those found to be required to be installed (includes Dependency packages as well) + List pckgNamesPassedInToInstall, // those requested by the user to be installed string repoName, string repoUrl, PSCredential credential, bool isLocalRepo) { List pkgsSuccessfullyInstalled = new List(); + int totalPkgs = pkgsToInstall.Count(); + + // by default this is 1, because if a parent package was already installed and only the dependent package + // needs to be installed we don't want a default value of 0 which throws a division error. + // if parent package isn't already installed we'll set this value properly in the below if condition anyways + int currentPkgNumOfDependentPkgs = 1; + int i = 1; + int j = 1; foreach (PSResourceInfo pkgInfo in pkgsToInstall) { var tempInstallPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); @@ -302,7 +312,31 @@ private List InstallPackage( _cmdletPassedIn.WriteVerbose(string.Format("Begin installing package: '{0}'", pkgInfo.Name)); - // TODO: add progress bar here + int activityId = 0; + string activity = ""; + string statusDescription = ""; + + if (pckgNamesPassedInToInstall.ToList().Contains(pkgInfo.Name, StringComparer.InvariantCultureIgnoreCase)) + { + // Installing parent package (one whose name was passed in to install) + activityId = 0; + activity = string.Format("Installing {0}...", pkgInfo.Name); + statusDescription = string.Format("{0}% Complete:", ((i++/totalPkgs) * 100)); + + currentPkgNumOfDependentPkgs = pkgInfo.Dependencies.Count(); + j = 1; + } + else + { + // Installing dependent package + activityId = 1; + activity = string.Format("Installing dependent package {0}...", pkgInfo.Name); + statusDescription = string.Format("{0}% Complete:", ((j++/currentPkgNumOfDependentPkgs) * 100)); + } + + var progressRecord = new ProgressRecord(activityId, activity, statusDescription); + _cmdletPassedIn.WriteProgress(progressRecord); + // Create PackageIdentity in order to download string createFullVersion = pkgInfo.Version.ToString(); From c3b73bb1c99920edab5787af483551a57a611cd2 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 15:26:17 -0500 Subject: [PATCH 03/11] remove extra whiteline --- src/code/InstallHelper.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 7057a31ac..72f357a6a 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -337,7 +337,6 @@ private List InstallPackage( var progressRecord = new ProgressRecord(activityId, activity, statusDescription); _cmdletPassedIn.WriteProgress(progressRecord); - // Create PackageIdentity in order to download string createFullVersion = pkgInfo.Version.ToString(); if (pkgInfo.IsPrerelease) From 818de5f6e10e7b1eaac74d12a5757f35c2deb9a1 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 15:28:03 -0500 Subject: [PATCH 04/11] remove uneeded verbose message --- src/code/FindPSResource.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/code/FindPSResource.cs b/src/code/FindPSResource.cs index 393190bd2..475f34cbb 100644 --- a/src/code/FindPSResource.cs +++ b/src/code/FindPSResource.cs @@ -229,7 +229,6 @@ private void ProcessResourceNameParameterSet() IncludeDependencies)) { foundPackages.Add(package); - WriteVerbose("pkgName: " + package.Name); } From 95290df50d2136f1455e85edd0953d5ef8a776d4 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 15:29:12 -0500 Subject: [PATCH 05/11] remove extra whiteline --- src/code/FindPSResource.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/code/FindPSResource.cs b/src/code/FindPSResource.cs index 475f34cbb..f6a3c9ccf 100644 --- a/src/code/FindPSResource.cs +++ b/src/code/FindPSResource.cs @@ -231,7 +231,6 @@ private void ProcessResourceNameParameterSet() foundPackages.Add(package); } - foreach (var uniquePackageVersion in foundPackages.GroupBy( m => new {m.Name, m.Version, m.Repository}).Select( group => group.First()).ToList()) From ebb925af610246a27565416207bd6d250441c1a8 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 16:27:56 -0500 Subject: [PATCH 06/11] fix division bug in code --- src/code/InstallHelper.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 72f357a6a..5b6857796 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -321,7 +321,8 @@ private List InstallPackage( // Installing parent package (one whose name was passed in to install) activityId = 0; activity = string.Format("Installing {0}...", pkgInfo.Name); - statusDescription = string.Format("{0}% Complete:", ((i++/totalPkgs) * 100)); + statusDescription = string.Format("{0}% Complete:", Math.Round(((double) i/totalPkgs) * 100), 2); + i++; currentPkgNumOfDependentPkgs = pkgInfo.Dependencies.Count(); j = 1; @@ -331,10 +332,13 @@ private List InstallPackage( // Installing dependent package activityId = 1; activity = string.Format("Installing dependent package {0}...", pkgInfo.Name); - statusDescription = string.Format("{0}% Complete:", ((j++/currentPkgNumOfDependentPkgs) * 100)); + statusDescription = string.Format("{0}% Complete:", Math.Round(((double) j/currentPkgNumOfDependentPkgs) * 100), 2); + j++; + i++; } var progressRecord = new ProgressRecord(activityId, activity, statusDescription); + _cmdletPassedIn.WriteVerbose(statusDescription); _cmdletPassedIn.WriteProgress(progressRecord); // Create PackageIdentity in order to download From 639a648033a1b3640d215f92fb8ad5e51df63635 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 23 Nov 2021 16:36:57 -0500 Subject: [PATCH 07/11] refactor for loop --- src/code/InstallHelper.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 5b6857796..a10996ab5 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -294,10 +294,11 @@ private List InstallPackage( // needs to be installed we don't want a default value of 0 which throws a division error. // if parent package isn't already installed we'll set this value properly in the below if condition anyways int currentPkgNumOfDependentPkgs = 1; - int i = 1; + // counter for dependency packages int j = 1; - foreach (PSResourceInfo pkgInfo in pkgsToInstall) + for (int i = 0; i < pkgsToInstall.Count(); i++) { + PSResourceInfo pkgInfo = pkgsToInstall.ElementAt(i); var tempInstallPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); try { @@ -321,8 +322,7 @@ private List InstallPackage( // Installing parent package (one whose name was passed in to install) activityId = 0; activity = string.Format("Installing {0}...", pkgInfo.Name); - statusDescription = string.Format("{0}% Complete:", Math.Round(((double) i/totalPkgs) * 100), 2); - i++; + statusDescription = string.Format("{0}% Complete:", Math.Round(((double) (i+1)/totalPkgs) * 100), 2); currentPkgNumOfDependentPkgs = pkgInfo.Dependencies.Count(); j = 1; @@ -334,11 +334,9 @@ private List InstallPackage( activity = string.Format("Installing dependent package {0}...", pkgInfo.Name); statusDescription = string.Format("{0}% Complete:", Math.Round(((double) j/currentPkgNumOfDependentPkgs) * 100), 2); j++; - i++; } var progressRecord = new ProgressRecord(activityId, activity, statusDescription); - _cmdletPassedIn.WriteVerbose(statusDescription); _cmdletPassedIn.WriteProgress(progressRecord); // Create PackageIdentity in order to download From 3c4674c12cef9be2887f3de6b92d381c95a24c8f Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 30 Nov 2021 13:02:37 -0500 Subject: [PATCH 08/11] address PR feedback to use foreach loop --- src/code/InstallHelper.cs | 57 ++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index a10996ab5..dfa7c7c21 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -290,15 +290,17 @@ private List InstallPackage( List pkgsSuccessfullyInstalled = new List(); int totalPkgs = pkgsToInstall.Count(); + // counters for tracking dependent package and current package out of total + int totalPkgsCount = 0; + int dependentPkgCount = 1; // by default this is 1, because if a parent package was already installed and only the dependent package // needs to be installed we don't want a default value of 0 which throws a division error. // if parent package isn't already installed we'll set this value properly in the below if condition anyways int currentPkgNumOfDependentPkgs = 1; - // counter for dependency packages - int j = 1; - for (int i = 0; i < pkgsToInstall.Count(); i++) + + foreach (PSResourceInfo pkg in pkgsToInstall) { - PSResourceInfo pkgInfo = pkgsToInstall.ElementAt(i); + totalPkgsCount++; var tempInstallPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); try { @@ -311,48 +313,47 @@ private List InstallPackage( // TODO: are there Linux accommodations we need to consider here? dir.Attributes = dir.Attributes & ~FileAttributes.ReadOnly; - _cmdletPassedIn.WriteVerbose(string.Format("Begin installing package: '{0}'", pkgInfo.Name)); + _cmdletPassedIn.WriteVerbose(string.Format("Begin installing package: '{0}'", pkg.Name)); int activityId = 0; string activity = ""; string statusDescription = ""; - if (pckgNamesPassedInToInstall.ToList().Contains(pkgInfo.Name, StringComparer.InvariantCultureIgnoreCase)) + if (pckgNamesPassedInToInstall.ToList().Contains(pkg.Name, StringComparer.InvariantCultureIgnoreCase)) { // Installing parent package (one whose name was passed in to install) activityId = 0; - activity = string.Format("Installing {0}...", pkgInfo.Name); - statusDescription = string.Format("{0}% Complete:", Math.Round(((double) (i+1)/totalPkgs) * 100), 2); - - currentPkgNumOfDependentPkgs = pkgInfo.Dependencies.Count(); - j = 1; + activity = string.Format("Installing {0}...", pkg.Name); + statusDescription = string.Format("{0}% Complete:", Math.Round(((double) totalPkgsCount/totalPkgs) * 100), 2); + currentPkgNumOfDependentPkgs = pkg.Dependencies.Count(); + dependentPkgCount = 1; } else { // Installing dependent package activityId = 1; - activity = string.Format("Installing dependent package {0}...", pkgInfo.Name); - statusDescription = string.Format("{0}% Complete:", Math.Round(((double) j/currentPkgNumOfDependentPkgs) * 100), 2); - j++; + activity = string.Format("Installing dependent package {0}...", pkg.Name); + statusDescription = string.Format("{0}% Complete:", Math.Round(((double) dependentPkgCount/currentPkgNumOfDependentPkgs) * 100), 2); + dependentPkgCount++; } var progressRecord = new ProgressRecord(activityId, activity, statusDescription); _cmdletPassedIn.WriteProgress(progressRecord); // Create PackageIdentity in order to download - string createFullVersion = pkgInfo.Version.ToString(); - if (pkgInfo.IsPrerelease) + string createFullVersion = pkg.Version.ToString(); + if (pkg.IsPrerelease) { - createFullVersion = pkgInfo.Version.ToString() + "-" + pkgInfo.PrereleaseLabel; + createFullVersion = pkg.Version.ToString() + "-" + pkg.PrereleaseLabel; } if (!NuGetVersion.TryParse(createFullVersion, out NuGetVersion pkgVersion)) { _cmdletPassedIn.WriteVerbose(string.Format("Error parsing package '{0}' version '{1}' into a NuGetVersion", - pkgInfo.Name, pkgInfo.Version.ToString())); + pkg.Name, pkg.Version.ToString())); continue; } - var pkgIdentity = new PackageIdentity(pkgInfo.Name, pkgVersion); + var pkgIdentity = new PackageIdentity(pkg.Name, pkgVersion); var cacheContext = new SourceCacheContext(); if (isLocalRepo) @@ -447,8 +448,8 @@ private List InstallPackage( string tempDirNameVersion = isLocalRepo ? tempInstallPath : Path.Combine(tempInstallPath, pkgIdentity.Id.ToLower(), newVersion); var version4digitNoPrerelease = pkgIdentity.Version.Version.ToString(); string moduleManifestVersion = string.Empty; - var scriptPath = Path.Combine(tempDirNameVersion, pkgInfo.Name + ".ps1"); - var modulePath = Path.Combine(tempDirNameVersion, pkgInfo.Name + ".psd1"); + var scriptPath = Path.Combine(tempDirNameVersion, pkg.Name + ".ps1"); + var modulePath = Path.Combine(tempDirNameVersion, pkg.Name + ".psd1"); // Check if the package is a module or a script var isModule = File.Exists(modulePath); @@ -474,13 +475,13 @@ private List InstallPackage( moduleManifestVersion = parsedMetadataHashtable["ModuleVersion"] as string; // Accept License verification - if (!_savePkg && !CallAcceptLicense(pkgInfo, moduleManifest, tempInstallPath, newVersion)) + if (!_savePkg && !CallAcceptLicense(pkg, moduleManifest, tempInstallPath, newVersion)) { continue; } // If NoClobber is specified, ensure command clobbering does not happen - if (_noClobber && !DetectClobber(pkgInfo.Name, parsedMetadataHashtable)) + if (_noClobber && !DetectClobber(pkg.Name, parsedMetadataHashtable)) { continue; } @@ -506,11 +507,11 @@ private List InstallPackage( if (_includeXML) { - CreateMetadataXMLFile(tempDirNameVersion, installPath, pkgInfo, isModule); + CreateMetadataXMLFile(tempDirNameVersion, installPath, pkg, isModule); } MoveFilesIntoInstallPath( - pkgInfo, + pkg, isModule, isLocalRepo, tempDirNameVersion, @@ -520,15 +521,15 @@ private List InstallPackage( moduleManifestVersion, scriptPath); - _cmdletPassedIn.WriteVerbose(String.Format("Successfully installed package '{0}' to location '{1}'", pkgInfo.Name, installPath)); - pkgsSuccessfullyInstalled.Add(pkgInfo.Name); + _cmdletPassedIn.WriteVerbose(String.Format("Successfully installed package '{0}' to location '{1}'", pkg.Name, installPath)); + pkgsSuccessfullyInstalled.Add(pkg.Name); } catch (Exception e) { _cmdletPassedIn.WriteError( new ErrorRecord( new PSInvalidOperationException( - message: $"Unable to successfully install package '{pkgInfo.Name}': '{e.Message}'", + message: $"Unable to successfully install package '{pkg.Name}': '{e.Message}'", innerException: e), "InstallPackageFailed", ErrorCategory.InvalidOperation, From 4ac13a4855a17e5ca3d4b60bb0e8a15416ad3799 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 30 Nov 2021 13:09:59 -0500 Subject: [PATCH 09/11] rename packages names variable --- src/code/InstallHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index dfa7c7c21..24107de3d 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -281,7 +281,7 @@ private IEnumerable FilterByInstalledPkgs(IEnumerable InstallPackage( IEnumerable pkgsToInstall, // those found to be required to be installed (includes Dependency packages as well) - List pckgNamesPassedInToInstall, // those requested by the user to be installed + List pkgNamesToInstall, // those requested by the user to be installed string repoName, string repoUrl, PSCredential credential, @@ -319,7 +319,7 @@ private List InstallPackage( string activity = ""; string statusDescription = ""; - if (pckgNamesPassedInToInstall.ToList().Contains(pkg.Name, StringComparer.InvariantCultureIgnoreCase)) + if (pkgNamesToInstall.ToList().Contains(pkg.Name, StringComparer.InvariantCultureIgnoreCase)) { // Installing parent package (one whose name was passed in to install) activityId = 0; From e7559a6dc97477cc069de6a656b72187de575f95 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 30 Nov 2021 13:14:01 -0500 Subject: [PATCH 10/11] rename pckgNamesToInstall variable to pkgNamesToInstall --- src/code/InstallHelper.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 24107de3d..c44d4e40f 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -138,7 +138,7 @@ private void ProcessRepositories( PSCredential credential) { var listOfRepositories = RepositorySettings.Read(repository, out string[] _); - List pckgNamesToInstall = packageNames.ToList(); + List pkgNamesToInstall = packageNames.ToList(); var yesToAll = false; var noToAll = false; @@ -146,7 +146,7 @@ private void ProcessRepositories( foreach (var repo in listOfRepositories) { // If no more packages to install, then return - if (!pckgNamesToInstall.Any()) return; + if (!pkgNamesToInstall.Any()) return; string repoName = repo.Name; _cmdletPassedIn.WriteVerbose(string.Format("Attempting to search for packages in '{0}'", repoName)); @@ -178,7 +178,7 @@ private void ProcessRepositories( // Finds parent packages and dependencies IEnumerable pkgsFromRepoToInstall = findHelper.FindByResourceName( - name: pckgNamesToInstall.ToArray(), + name: pkgNamesToInstall.ToArray(), type: ResourceType.None, version: _versionRange != null ? _versionRange.OriginalString : null, prerelease: _prerelease, @@ -218,7 +218,7 @@ private void ProcessRepositories( List pkgsInstalled = InstallPackage( pkgsFromRepoToInstall, - pckgNamesToInstall, + pkgNamesToInstall, repoName, repo.Url.AbsoluteUri, credential, @@ -226,7 +226,7 @@ private void ProcessRepositories( foreach (string name in pkgsInstalled) { - pckgNamesToInstall.Remove(name); + pkgNamesToInstall.Remove(name); } } } From acaefceea4304b2d2c5a32ed1cf69660ae443c44 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Tue, 30 Nov 2021 16:12:54 -0500 Subject: [PATCH 11/11] remove unused parameter being passed to InstallPackage() --- src/code/InstallHelper.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index c44d4e40f..cfee4e02c 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -219,7 +219,6 @@ private void ProcessRepositories( List pkgsInstalled = InstallPackage( pkgsFromRepoToInstall, pkgNamesToInstall, - repoName, repo.Url.AbsoluteUri, credential, isLocalRepo); @@ -282,7 +281,6 @@ private IEnumerable FilterByInstalledPkgs(IEnumerable InstallPackage( IEnumerable pkgsToInstall, // those found to be required to be installed (includes Dependency packages as well) List pkgNamesToInstall, // those requested by the user to be installed - string repoName, string repoUrl, PSCredential credential, bool isLocalRepo)