Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
deepakaravindr committed Jul 29, 2015
1 parent 3c82710 commit 176916c
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions src/NuGet.CommandLine/Commands/RestoreCommand.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Diagnostics;
Expand Down Expand Up @@ -186,7 +187,7 @@ private void ReadSettings(PackageRestoreInputs packageRestoreInputs)
}
}

private Task PerformNuGetV2RestoreAsync(PackageRestoreInputs packageRestoreInputs)
private async Task PerformNuGetV2RestoreAsync(PackageRestoreInputs packageRestoreInputs)
{
ReadSettings(packageRestoreInputs);
var packagesFolderPath = GetPackagesFolder(packageRestoreInputs);
Expand Down Expand Up @@ -237,10 +238,10 @@ private Task PerformNuGetV2RestoreAsync(PackageRestoreInputs packageRestoreInput
"packages.config");

Console.LogInformation(message);
return Task.FromResult(0);
return;
}

var packageRestoreData = installedPackageReferences.Select(reference =>
var packageRestoreData = missingPackageReferences.Select(reference =>
new PackageRestoreData(
reference,
new[] { packageRestoreInputs.RestoringWithSolutionFile ? packageRestoreInputs.DirectoryOfSolutionFile : packageRestoreInputs.PackageReferenceFiles[0] },
Expand All @@ -251,17 +252,24 @@ private Task PerformNuGetV2RestoreAsync(PackageRestoreInputs packageRestoreInput
.Select(sourceRepositoryProvider.CreateRepository)
.ToArray();

var bag = new ConcurrentBag<PackageRestoreFailedEventArgs>();

var packageRestoreContext = new PackageRestoreContext(
nuGetPackageManager,
packageRestoreData,
CancellationToken.None,
packageRestoredEvent: null,
packageRestoreFailedEvent: null,
packageRestoreFailedEvent: (sender, args) => { bag.Add(args); },
sourceRepositories: repositories,
maxNumberOfParallelTasks: DisableParallelProcessing ? 1 : PackageManagementConstants.DefaultMaxDegreeOfParallelism);

CheckRequireConsent();
return PackageRestoreManager.RestoreMissingPackagesAsync(packageRestoreContext, new ConsoleProjectContext(Console));
await PackageRestoreManager.RestoreMissingPackagesAsync(packageRestoreContext, new ConsoleProjectContext(Console));

foreach(var item in bag)
{
Console.WriteError(item.Exception.Message);
}
}

private void CheckRequireConsent()
Expand Down

0 comments on commit 176916c

Please sign in to comment.