Update to NuGet 1.1

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageRepository.cs

@@ -26,5 +26,7 @@ namespace ICSharpCode.PackageManagement.Design
 		{
 			IsRemovePackageCalled = true;
 		}
+		
+		public string Source { get; set; }
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs

@@ -17,7 +17,8 @@ namespace ICSharpCode.PackageManagement
 		IPackageManagementService packageManagementService;
 		ILicenseAcceptanceService licenseAcceptanceService;
 		IPackage package;
-		IPackageRepository packageRepository;
+		IPackageRepository sourcePackageRepository;
+		IPackageRepository localPackageRepository;
 		bool? hasDependencies;
 		
 		public PackageViewModel(
@@ -26,7 +27,7 @@ namespace ICSharpCode.PackageManagement
 			ILicenseAcceptanceService licenseAcceptanceService)
 		{
 			this.package = package;
-			this.packageRepository = packageManagementService.ActivePackageRepository;
+			this.sourcePackageRepository = packageManagementService.ActivePackageRepository;
 			this.packageManagementService = packageManagementService;
 			this.licenseAcceptanceService = licenseAcceptanceService;
 			
@@ -39,8 +40,22 @@ namespace ICSharpCode.PackageManagement
 			removePackageCommand = new DelegateCommand(param => RemovePackage());
 		}
 		
-		public IPackageRepository Repository {
+		public IPackageRepository SourcePackageRepository {
-			get { return packageRepository; }
+			get { return sourcePackageRepository; }
+		}
+		
+		public IPackageRepository LocalPackageRepository {
+			get {
+				if (localPackageRepository == null) {
+					GetLocalPackageRepository();
+				}
+				return localPackageRepository;
+			}
+		}
+		
+		void GetLocalPackageRepository()
+		{
+			localPackageRepository = packageManagementService.ActiveProjectManager.LocalRepository;
 		}
 		
 		public ICommand AddPackageCommand { 
@@ -179,8 +194,13 @@ namespace ICSharpCode.PackageManagement
 		
 		IList<IPackage> GetPackagesToBeInstalled()
 		{
-			var resolver = new DependencyResolver(packageRepository);
+			var walker = new InstallWalker(LocalPackageRepository,
-			return resolver.GetDependencies(package).ToList();
+                sourcePackageRepository,
+                NullLogger.Instance,
+                ignoreDependencies: false);
+			
+			IEnumerable<PackageOperation> packageOperations = walker.ResolveOperations(package);
+			return GetPackages(packageOperations);
 		}
 		
 		bool PackageRequiresLicenseAcceptance(IPackage package)
@@ -188,15 +208,24 @@ namespace ICSharpCode.PackageManagement
 			return package.RequireLicenseAcceptance && !IsPackageInstalled(package);
 		}
 		
+		IList<IPackage> GetPackages(IEnumerable<PackageOperation> packageOperations)
+		{
+			List<IPackage> packages = new List<IPackage>();
+			foreach (PackageOperation operation in packageOperations) {
+				packages.Add(operation.Package);
+			}
+			return packages;
+		}
+		
 		void InstallPackage()
 		{
-			packageManagementService.InstallPackage(packageRepository, package);
+			packageManagementService.InstallPackage(sourcePackageRepository, package);
 			OnPropertyChanged(model => model.IsAdded);
 		}
 		
 		public void RemovePackage()
 		{
-			packageManagementService.UninstallPackage(packageRepository, package);
+			packageManagementService.UninstallPackage(sourcePackageRepository, package);
 			OnPropertyChanged(model => model.IsAdded);
 		}
 	}

src/AddIns/Misc/PackageManagement/RequiredLibraries/LICENSE.txt

@@ -174,4 +174,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
  
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageManager.cs

@@ -91,5 +91,15 @@ namespace PackageManagement.Tests.Helpers
 			PackagePassedToUninstallPackage = package;
 			IsRefreshProjectBrowserCalledWhenUninstallPackageCalled = FakeProjectService.IsRefreshProjectBrowserCalled;
 		}
+		
+		public void UpdatePackage(IPackage oldPackage, IPackage newPackage, bool updateDependencies)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public void UpdatePackage(string packageId, Version version, bool updateDependencies)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PackageCollectionAssert.cs

@@ -27,5 +27,13 @@ namespace PackageManagement.Tests.Helpers
 			}
 			return packages;
 		}
+		
+		public static void AreEqual(IEnumerable<IPackage> expectedPackages, IEnumerable<IPackage> actualPackages)
+		{
+			List<IPackage> expectedPackagesAsList = new List<IPackage>(expectedPackages);
+			List<IPackage> actualPackagesAsList = new List<IPackage>(actualPackages);
+			
+			CollectionAssert.AreEqual(expectedPackagesAsList, actualPackagesAsList);			
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs

@@ -16,17 +16,17 @@ namespace PackageManagement.Tests
 		PackageViewModel viewModel;
 		FakePackage package;
 		FakePackageManagementService packageManagementService;
-		FakePackageRepository packageSourceRepository;
+		FakePackageRepository sourcePackageRepository;
 		FakeLicenseAcceptanceService licenseAcceptanceService;
 		
 		void CreateViewModel()
 		{
 			package = new FakePackage();
-			packageSourceRepository = new FakePackageRepository();
+			sourcePackageRepository = new FakePackageRepository();
 			packageManagementService = new FakePackageManagementService();
 			licenseAcceptanceService = new FakeLicenseAcceptanceService();
 			PackageViewModelFactory factory = new PackageViewModelFactory(packageManagementService, licenseAcceptanceService);
-			packageManagementService.ActivePackageRepository = packageSourceRepository;
+			packageManagementService.ActivePackageRepository = sourcePackageRepository;
 			viewModel = factory.CreatePackageViewModel(package);
 		}
 		
@@ -52,7 +52,7 @@ namespace PackageManagement.Tests
 			var packageDependedUpon = new FakePackage(packageId);
 			packageDependedUpon.RequireLicenseAcceptance = requiresLicenseAcceptance;
 			
-			packageSourceRepository.FakePackages.Add(packageDependedUpon);
+			sourcePackageRepository.FakePackages.Add(packageDependedUpon);
 			
 			return packageDependedUpon;
 		}
@@ -64,7 +64,7 @@ namespace PackageManagement.Tests
 			viewModel.AddPackageCommand.Execute(null);
 						
 			Assert.AreEqual(package, packageManagementService.PackagePassedToInstallPackage);
-			Assert.AreEqual(packageSourceRepository, packageManagementService.RepositoryPassedToInstallPackage);
+			Assert.AreEqual(sourcePackageRepository, packageManagementService.RepositoryPassedToInstallPackage);
 		}
 		
 		[Test]
@@ -170,7 +170,7 @@ namespace PackageManagement.Tests
 			viewModel.RemovePackageCommand.Execute(null);
 						
 			Assert.AreEqual(package, packageManagementService.PackagePassedToUninstallPackage);
-			Assert.AreEqual(packageSourceRepository, packageManagementService.RepositoryPassedToUninstallPackage);
+			Assert.AreEqual(sourcePackageRepository, packageManagementService.RepositoryPassedToUninstallPackage);
 		}
 		
 		[Test]
@@ -334,13 +334,13 @@ namespace PackageManagement.Tests
 			viewModel.AddPackage();
 			
 			var expectedPackages = new FakePackage[] {
-				package,
+				packageDependedUpon,
-				packageDependedUpon
+				package
 			};
 			
 			var actualPackages = licenseAcceptanceService.PackagesPassedToAcceptLicenses;
 			
-			CollectionAssert.AreEqual(expectedPackages, actualPackages);
+			PackageCollectionAssert.AreEqual(expectedPackages, actualPackages);
 		}
 		
 		[Test]