Update to NuGet 2.7 RC

mrward · mrward · commit 762b7609fc5a · 2013-08-17T11:45:57.000+01:00
diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs
@@ -189,7 +189,7 @@ void UpdatePackageInAllProjects()
 		
 		PackageReference CreatePackageReference()
 		{
-			return new PackageReference(Id, Version, null, null);
+			return new PackageReference(Id, Version, null, null, false, false);
 		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs
@@ -193,5 +193,10 @@ public void UpdatePackageReference(IPackage package, IUpdatePackageSettings sett
 			PackagePassedToUpdatePackageReference = package;
 			SettingsPassedToUpdatePackageReference = settings;
 		}
+		
+		public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions, bool ignoreWalkInfo)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll
diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml
@@ -702,7 +702,7 @@
             Description
             ------------------------------------------------------------------
             Updates every package in the project, MvcApplication1, to the latest "safe" version. For example,
-            For example, if version 1.0.0 of a package is installed, and versions 1.0.1, 1.0.2, and 1.1 are
+            if version 1.0.0 of a package is installed, and versions 1.0.1, 1.0.2, and 1.1 are
             available in the feed, the -Safe flag updates the package to 1.0.2.
           </maml:para>
           <maml:para></maml:para>
diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll
diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs
@@ -14,7 +14,7 @@ public class FakePackageReferenceFile : IPackageReferenceFile
 		
 		public void AddFakePackageReference(string packageId, string version)
 		{
-			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);
 			FakePackageReferences.Add(packageReference);
 		}
 		
@@ -27,7 +27,7 @@ public IEnumerable<PackageReference> GetPackageReferences()
 		
 		public void DeleteEntry(string id, SemanticVersion version)
 		{
-			var packageReference = new PackageReference(id, version, null, null);
+			var packageReference = new PackageReference(id, version, null, null, false, false);
 			EntriesDeleted.Add(packageReference);
 		}
 		
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs
@@ -407,13 +407,13 @@ public void IsPackageRestoreEnabled_EnabledInSettings_ReturnsTrue()
 		}
 		
 		[Test]
-		public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsFalse()
+		public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsTrue()
 		{
 			CreateOptions();
 			
 			bool enabled = options.IsPackageRestoreEnabled;
 			
-			Assert.IsFalse(enabled);
+			Assert.IsTrue(enabled);
 		}
 		
 		[Test]
@@ -430,7 +430,7 @@ public void IsPackageRestoreEnabled_NotInSettingsOriginallyButSetToTrue_PackageR
 		}
 		
 		[Test]
-		public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionDeletedFromSettings()
+		public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionIsNotDeletedFromSettings()
 		{
 			CreateSettings();
 			EnablePackageRestoreInSettings();
@@ -439,7 +439,20 @@ public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_Pack
 			options.IsPackageRestoreEnabled = false;
 			
 			bool deleted = fakeSettings.IsPackageRestoreSectionDeleted;
-			Assert.IsTrue(deleted);
+			Assert.IsFalse(deleted);
+		}
+		
+		[Test]
+		public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreIsFalseInSettings()
+		{
+			CreateSettings();
+			EnablePackageRestoreInSettings();
+			CreateOptions(fakeSettings);
+			
+			options.IsPackageRestoreEnabled = false;
+			
+			KeyValuePair<string, string> keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
+			Assert.AreEqual("False", keyValuePair.Value);
 		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs
@@ -24,7 +24,7 @@ public class PackageManagementOptionsViewModelTests
 		
 		void CreateRecentRepository()
 		{
-			fakeRecentRepository = new FakeRecentPackageRepository();			
+			fakeRecentRepository = new FakeRecentPackageRepository();
 		}
 		
 		void CreateMachineCache()
@@ -44,6 +44,11 @@ void EnablePackageRestoreInOptions()
 			fakeSettings.SetPackageRestoreSetting(true);
 		}
 		
+		void DisablePackageRestoreInOptions()
+		{
+			fakeSettings.SetPackageRestoreSetting(false);
+		}
+		
 		void CreateViewModelUsingCreatedMachineCache()
 		{
 			CreateRecentRepository();
@@ -312,10 +317,22 @@ public void IsPackageRestoreEnabled_TrueInOptions_ReturnsTrue()
 			Assert.IsTrue(result);
 		}
 		
+		[Test]
+		public void IsPackageRestoreEnabled_NotSet_ReturnsTrue()
+		{
+			CreateOptions();
+			CreateViewModel(options);
+			
+			bool result = viewModel.IsPackageRestoreEnabled;
+			
+			Assert.IsTrue(result);
+		}
+		
 		[Test]
 		public void IsPackageRestoreEnabled_FalseInOptions_ReturnsFalse()
 		{
 			CreateOptions();
+			DisablePackageRestoreInOptions();
 			CreateViewModel(options);
 			
 			bool result = viewModel.IsPackageRestoreEnabled;
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs
@@ -38,7 +38,7 @@ void InstallPackages()
 		
 		void AddPackageReference(string packageId, string version)
 		{
-			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);
 			packageReferences.Add(packageReference);
 		}
 		
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs
@@ -31,7 +31,7 @@ void CreateUpdatePackageInAllProjects(string packageId, SemanticVersion version)
 		{
 			fakeSolution = new FakePackageManagementSolution();
 			fakeSourceRepository = new FakePackageRepository();
-			var packageReference = new PackageReference(packageId, version, null, null);
+			var packageReference = new PackageReference(packageId, version, null, null, false, false);
 			updatePackageInAllProjects = new UpdatePackageInAllProjects(packageReference, fakeSolution, fakeSourceRepository);
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ void UpdatePackageInAllProjects()`
`189`	`189`
`190`	`190`	`PackageReference CreatePackageReference()`
`191`	`191`	`{`
`192`		`- return new PackageReference(Id, Version, null, null);`
	`192`	`+ return new PackageReference(Id, Version, null, null, false, false);`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,5 +193,10 @@ public void UpdatePackageReference(IPackage package, IUpdatePackageSettings sett`
`193`	`193`	`PackagePassedToUpdatePackageReference = package;`
`194`	`194`	`SettingsPassedToUpdatePackageReference = settings;`
`195`	`195`	`}`
	`196`	`+`
	`197`	`+ public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions, bool ignoreWalkInfo)`
	`198`	`+ {`
	`199`	`+ throw new NotImplementedException();`
	`200`	`+ }`
`196`	`201`	`}`
`197`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class FakePackageReferenceFile : IPackageReferenceFile`
`14`	`14`
`15`	`15`	`public void AddFakePackageReference(string packageId, string version)`
`16`	`16`	`{`
`17`		`- var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);`
	`17`	`+ var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);`
`18`	`18`	`FakePackageReferences.Add(packageReference);`
`19`	`19`	`}`
`20`	`20`
`@@ -27,7 +27,7 @@ public IEnumerable<PackageReference> GetPackageReferences()`
`27`	`27`
`28`	`28`	`public void DeleteEntry(string id, SemanticVersion version)`
`29`	`29`	`{`
`30`		`- var packageReference = new PackageReference(id, version, null, null);`
	`30`	`+ var packageReference = new PackageReference(id, version, null, null, false, false);`
`31`	`31`	`EntriesDeleted.Add(packageReference);`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -407,13 +407,13 @@ public void IsPackageRestoreEnabled_EnabledInSettings_ReturnsTrue()`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`[Test]`
`410`		`- public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsFalse()`
	`410`	`+ public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsTrue()`
`411`	`411`	`{`
`412`	`412`	`CreateOptions();`
`413`	`413`
`414`	`414`	`bool enabled = options.IsPackageRestoreEnabled;`
`415`	`415`
`416`		`- Assert.IsFalse(enabled);`
	`416`	`+ Assert.IsTrue(enabled);`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`[Test]`
`@@ -430,7 +430,7 @@ public void IsPackageRestoreEnabled_NotInSettingsOriginallyButSetToTrue_PackageR`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`[Test]`
`433`		`- public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionDeletedFromSettings()`
	`433`	`+ public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionIsNotDeletedFromSettings()`
`434`	`434`	`{`
`435`	`435`	`CreateSettings();`
`436`	`436`	`EnablePackageRestoreInSettings();`
`@@ -439,7 +439,20 @@ public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_Pack`
`439`	`439`	`options.IsPackageRestoreEnabled = false;`
`440`	`440`
`441`	`441`	`bool deleted = fakeSettings.IsPackageRestoreSectionDeleted;`
`442`		`- Assert.IsTrue(deleted);`
	`442`	`+ Assert.IsFalse(deleted);`
	`443`	`+ }`
	`444`	`+`
	`445`	`+ [Test]`
	`446`	`+ public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreIsFalseInSettings()`
	`447`	`+ {`
	`448`	`+ CreateSettings();`
	`449`	`+ EnablePackageRestoreInSettings();`
	`450`	`+ CreateOptions(fakeSettings);`
	`451`	`+`
	`452`	`+ options.IsPackageRestoreEnabled = false;`
	`453`	`+`
	`454`	`+ KeyValuePair<string, string> keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();`
	`455`	`+ Assert.AreEqual("False", keyValuePair.Value);`
`443`	`456`	`}`
`444`	`457`	`}`
`445`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ void InstallPackages()`
`38`	`38`
`39`	`39`	`void AddPackageReference(string packageId, string version)`
`40`	`40`	`{`
`41`		`- var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null);`
	`41`	`+ var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);`
`42`	`42`	`packageReferences.Add(packageReference);`
`43`	`43`	`}`
`44`	`44`