Update NuGet to version 2.0

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs

@@ -165,7 +165,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		PackageReference CreatePackageReference()
 		{
-			return new PackageReference(Id, Version, null);
+			return new PackageReference(Id, Version, null, null);
 		}
 	}
 }

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

@@ -84,5 +84,15 @@ namespace ICSharpCode.PackageManagement.Design
 		{
 			throw new NotImplementedException();
 		}
+		
+		public IEnumerable<string> GetFiles(string path, string filter, bool recursive)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public DateTimeOffset GetLastAccessed(string path)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

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

@@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement.Design
 		
 		public List<PackageDependency> DependenciesList = 
 			new List<PackageDependency>();
-
+		
 		public List<IPackageAssemblyReference> AssemblyReferenceList =
 			new List<IPackageAssemblyReference>();
 		
@@ -77,10 +77,6 @@ namespace ICSharpCode.PackageManagement.Design
 			get { return OwnersList; }
 		}
 		
-		public IEnumerable<PackageDependency> Dependencies {
-			get { return DependenciesList; }
-		}
-		
 		public IEnumerable<IPackageFile> GetFiles()
 		{
 			return FilesList;
@@ -158,5 +154,13 @@ namespace ICSharpCode.PackageManagement.Design
 		public string Copyright { get; set; }
 		public bool IsAbsoluteLatestVersion { get; set; }
 		public bool Listed { get; set; }
+		
+		public IEnumerable<PackageDependencySet> DependencySets {
+			get {
+				return new PackageDependencySet[] {
+					new PackageDependencySet(null, DependenciesList)
+				};
+			}
+		}
 	}
 }

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

@@ -11,7 +11,7 @@ using NuGet;
 namespace ICSharpCode.PackageManagement.Design
 {
 	public class FakePackageAssemblyReference : IPackageAssemblyReference
-	{		
+	{
 		public FrameworkName TargetFramework {
 			get {
 				throw new NotImplementedException();
@@ -36,5 +36,11 @@ namespace ICSharpCode.PackageManagement.Design
 				throw new NotImplementedException();
 			}
 		}
+		
+		public string EffectivePath {
+			get {
+				throw new NotImplementedException();
+			}
+		}
 	}
 }

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

@@ -2,8 +2,10 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Versioning;
+
 using NuGet;
 
 namespace ICSharpCode.PackageManagement.Design
@@ -11,9 +13,7 @@ namespace ICSharpCode.PackageManagement.Design
 	public class FakeProjectSystem : FakeFileSystem, IProjectSystem
 	{
 		public FrameworkName TargetFramework {
-			get {
-				throw new NotImplementedException();
-			}
+			get { return new FrameworkName(".NETFramework, Version=v4.0"); }
 		}
 		
 		public string ProjectName {

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

@@ -83,7 +83,7 @@ namespace ICSharpCode.PackageManagement
 		}
 		
 		public IEnumerable<PackageDependency> Dependencies {
-			get { return package.Dependencies; }
+			get { return package.GetCompatiblePackageDependencies(null); }
 		}
 		
 		public Uri ReportAbuseUrl {
@@ -159,5 +159,9 @@ namespace ICSharpCode.PackageManagement
 		public bool Listed {
 			get { return package.Listed; }
 		}
+		
+		public IEnumerable<PackageDependencySet> DependencySets {
+			get { return package.DependencySets; }
+		}
 	}
 }

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

@@ -126,7 +126,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public IEnumerable<IPackage> GetPackagesInReverseDependencyOrder()
 		{
-			var packageSorter = new PackageSorter();
+			var packageSorter = new PackageSorter(null);
 			return packageSorter
 				.GetPackagesByDependencyOrder(projectManager.LocalRepository)
 				.Reverse();

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

@@ -17,6 +17,7 @@ namespace ICSharpCode.PackageManagement
 			return new InstallWalker(
 				localRepository,
 				sourceRepository,
+				null,
 				logger,
 				installAction.IgnoreDependencies,
 				installAction.AllowPrereleaseVersions);

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

@@ -101,8 +101,8 @@ namespace ICSharpCode.PackageManagement
 			return selectedProjects.IsPackageInstalled(package);
 		}
 		
-		public IEnumerable<PackageDependency> Dependencies {
-			get { return package.Dependencies; }
+		public IEnumerable<PackageDependencySet> Dependencies {
+			get { return package.DependencySets; }
 		}
 		
 		public bool HasDependencies {

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

@@ -72,7 +72,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public IEnumerable<IPackage> GetPackagesByDependencyOrder()
 		{
-			var packageSorter = new PackageSorter();
+			var packageSorter = new PackageSorter(null);
 			return packageSorter.GetPackagesByDependencyOrder(repository);
 		}
 		

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

@@ -14,7 +14,7 @@ namespace PackageManagement.Tests.Helpers
 		
 		public void AddFakePackageReference(string packageId, string version)
 		{
-			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);
 			FakePackageReferences.Add(packageReference);
 		}
 		
@@ -27,7 +27,7 @@ namespace PackageManagement.Tests.Helpers
 		
 		public void DeleteEntry(string id, SemanticVersion version)
 		{
-			var packageReference = new PackageReference(id, version, null);
+			var packageReference = new PackageReference(id, version, null, null);
 			EntriesDeleted.Add(packageReference);
 		}
 		

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

@@ -33,5 +33,10 @@ namespace PackageManagement.Tests.Helpers
 		{
 			throw new NotImplementedException();
 		}
+		
+		public void AddPackageReferenceEntry(string packageId, SemanticVersion version)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

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

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 
 using ICSharpCode.PackageManagement;
@@ -212,12 +213,11 @@ namespace PackageManagement.Tests
 		public void Dependencies_WrappedPackageHasOneDependency_ReturnsOneDependency()
 		{
 			CreatePackage();
-			fakePackage.DependenciesList.Add(new PackageDependency("Test"));
+			fakePackage.AddDependency("Test");
 			
 			IEnumerable<PackageDependency> dependencies = package.Dependencies;
-			IEnumerable<PackageDependency> expectedDependencies = fakePackage.Dependencies;
 			
-			CollectionAssert.AreEqual(expectedDependencies, dependencies);
+			CollectionAssert.AreEqual(fakePackage.DependenciesList, dependencies);
 		}
 		
 		[Test]
@@ -268,7 +268,7 @@ namespace PackageManagement.Tests
 		public void HasDependencies_WrappedPackageHasOneDependency_ReturnsTrue()
 		{
 			CreatePackage();
-			fakePackage.DependenciesList.Add(new PackageDependency("Test"));
+			fakePackage.AddDependency("Test");
 			bool result = package.HasDependencies;
 			
 			Assert.IsTrue(result);
@@ -369,5 +369,18 @@ namespace PackageManagement.Tests
 			
 			Assert.IsTrue(result);
 		}
+		
+		[Test]
+		public void DependencySets_WrappedPackageIsListed_ReturnsTrue()
+		{
+			CreatePackage();
+			fakePackage.AddDependency("Test");
+			List<PackageDependencySet> expectedDependencies = fakePackage.DependencySets.ToList();
+			
+			List<PackageDependencySet> dependencies = package.DependencySets.ToList();
+			
+			Assert.AreEqual(1, dependencies.Count);
+			Assert.AreEqual(expectedDependencies[0].Dependencies, dependencies[0].Dependencies);
+		}
 	}
 }

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

@@ -38,7 +38,7 @@ namespace PackageManagement.Tests
 		
 		void AddPackageReference(string packageId, string version)
 		{
-			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);
 			packageReferences.Add(packageReference);
 		}
 		

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

@@ -155,7 +155,7 @@ namespace PackageManagement.Tests
 			FakePackage firstPackage = AddPackageToSharedRepository("First");
 			firstPackage.AddDependency("Second");
 			FakePackage secondPackage = AddPackageToSharedRepository("Second");
-						
+			
 			List<IPackage> actualPackages = repository.GetPackagesByDependencyOrder().ToList();
 			
 			var expectedPackages = new IPackage[] {

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

@@ -31,7 +31,7 @@ namespace PackageManagement.Tests
 		{
 			fakeSolution = new FakePackageManagementSolution();
 			fakeSourceRepository = new FakePackageRepository();
-			var packageReference = new PackageReference(packageId, version, null);
+			var packageReference = new PackageReference(packageId, version, null, null);
 			updatePackageInAllProjects = new UpdatePackageInAllProjects(packageReference, fakeSolution, fakeSourceRepository);
 		}