Merge branch 'nuget-2.7'

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

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

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

@@ -193,5 +193,10 @@ namespace ICSharpCode.PackageManagement.Design
 			PackagePassedToUpdatePackageReference = package;
 			SettingsPassedToUpdatePackageReference = settings;
 		}
+		
+		public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions, bool ignoreWalkInfo)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

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

@@ -11,8 +11,8 @@ namespace ICSharpCode.PackageManagement
 {
 	public class RegisteredPackageSources : ObservableCollection<PackageSource>
 	{
-		public static readonly string DefaultPackageSourceUrl = "https://nuget.org/api/v2/";
-		public static readonly string DefaultPackageSourceName = "NuGet Official Package Source";
+		public static readonly string DefaultPackageSourceUrl = "https://www.nuget.org/api/v2/";
+		public static readonly string DefaultPackageSourceName = "nuget.org";
 		
 		public static readonly PackageSource DefaultPackageSource = 
 			new PackageSource(DefaultPackageSourceUrl, DefaultPackageSourceName);

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>

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, null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);
 			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, null);
+			var packageReference = new PackageReference(id, version, null, null, false, false);
 			EntriesDeleted.Add(packageReference);
 		}
 		

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

@@ -407,13 +407,13 @@ namespace PackageManagement.Tests
 		}
 		
 		[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 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionDeletedFromSettings()
+		public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionIsNotDeletedFromSettings()
 		{
 			CreateSettings();
 			EnablePackageRestoreInSettings();
@@ -439,7 +439,20 @@ namespace PackageManagement.Tests
 			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);
 		}
 	}
 }

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

@@ -24,7 +24,7 @@ namespace PackageManagement.Tests
 		
 		void CreateRecentRepository()
 		{
-			fakeRecentRepository = new FakeRecentPackageRepository();			
+			fakeRecentRepository = new FakeRecentPackageRepository();
 		}
 		
 		void CreateMachineCache()
@@ -44,6 +44,11 @@ namespace PackageManagement.Tests
 			fakeSettings.SetPackageRestoreSetting(true);
 		}
 		
+		void DisablePackageRestoreInOptions()
+		{
+			fakeSettings.SetPackageRestoreSetting(false);
+		}
+		
 		void CreateViewModelUsingCreatedMachineCache()
 		{
 			CreateRecentRepository();
@@ -312,10 +317,22 @@ namespace PackageManagement.Tests
 			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;

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, null);
+			var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false);
 			packageReferences.Add(packageReference);
 		}
 		

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, null);
+			var packageReference = new PackageReference(packageId, version, null, null, false, false);
 			updatePackageInAllProjects = new UpdatePackageInAllProjects(packageReference, fakeSolution, fakeSourceRepository);
 		}