Update to NuGet 2.8.7

NuGet.Core is updated to version 2.8.7 but NuGet.exe has only been
updated to version 2.8.6 since there has been no 2.8.7 version
released. The difference between 2.8.6 and 2.8.7 is one change to
how PowerShell is configured for Visual Studio which will have no
impact on NuGet.exe.

src/AddIns/Misc/AddInManager2/AddInManager2.Tests/Fakes/FakePackage.cs

@@ -204,5 +204,10 @@ namespace ICSharpCode.AddInManager2.Tests.Fakes
 		}
 
 		public bool DevelopmentDependency { get; set; }
+
+		public void ExtractContents(IFileSystem fileSystem, string extractPath)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

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

@@ -213,5 +213,14 @@ namespace ICSharpCode.PackageManagement.Design
 		public Uri GalleryUrl { get; set; }
 		
 		public bool DevelopmentDependency { get; set; }
+		
+		public IFileSystem FileSystemPassedToExtractContents;
+		public string ExtractPathPassedToExtractContents;
+		
+		public void ExtractContents(IFileSystem fileSystem, string extractPath)
+		{
+			FileSystemPassedToExtractContents = fileSystem;
+			ExtractPathPassedToExtractContents = extractPath;
+		}
 	}
 }

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

@@ -67,30 +67,30 @@ namespace ICSharpCode.PackageManagement.Design
 			PackageSources.Add(setting);
 		}
 		
-		public Dictionary<string, KeyValuePair<string, string>> SavedSectionValues =
-			new Dictionary<string, KeyValuePair<string, string>>();
+		public Dictionary<string, SettingValue> SavedSectionValues =
+			new Dictionary<string, SettingValue>();
 		
 		public void SetValue(string section, string key, string value)
 		{
 			SavedSectionValues.Remove(section);
-			SavedSectionValues.Add(section, new KeyValuePair<string, string>(key, value));
+			SavedSectionValues.Add(section, new SettingValue(key, value, false));
 		}
 		
-		public KeyValuePair<string, string> GetValuePassedToSetValueForActivePackageSourceSection()
+		public SettingValue GetValuePassedToSetValueForActivePackageSourceSection()
 		{
 			return SavedSectionValues[RegisteredPackageSourceSettings.ActivePackageSourceSectionName];
 		}
 		
-		public void SetValues(string section, IList<KeyValuePair<string, string>> values)
+		public void SetValues(string section, IList<SettingValue> values)
 		{
 			SavedSectionValueLists.Remove(section);
 			SavedSectionValueLists.Add(section, values);
 		}
 		
-		public Dictionary<string, IList<KeyValuePair<string, string>>> SavedSectionValueLists
-			= new Dictionary<string, IList<KeyValuePair<string, string>>>();
+		public Dictionary<string, IList<SettingValue>> SavedSectionValueLists
+			= new Dictionary<string, IList<SettingValue>>();
 		
-		public IList<KeyValuePair<string, string>> GetValuesPassedToSetValuesForPackageSourcesSection()
+		public IList<SettingValue> GetValuesPassedToSetValuesForPackageSourcesSection()
 		{
 			return SavedSectionValueLists[RegisteredPackageSourceSettings.PackageSourcesSectionName];
 		}
@@ -168,7 +168,7 @@ namespace ICSharpCode.PackageManagement.Design
 			DisabledPackageSources.Add(setting);
 		}
 		
-		public IList<KeyValuePair<string, string>> GetValuesPassedToSetValuesForDisabledPackageSourcesSection()
+		public IList<SettingValue> GetValuesPassedToSetValuesForDisabledPackageSourcesSection()
 		{
 			return SavedSectionValueLists[RegisteredPackageSourceSettings.DisabledPackageSourceSectionName];
 		}
@@ -186,7 +186,7 @@ namespace ICSharpCode.PackageManagement.Design
 			Sections.Add("packageRestore", items);
 		}
 		
-		public KeyValuePair<string, string> GetValuePassedToSetValueForPackageRestoreSection()
+		public SettingValue GetValuePassedToSetValueForPackageRestoreSection()
 		{
 			return SavedSectionValues["packageRestore"];
 		}
@@ -203,5 +203,15 @@ namespace ICSharpCode.PackageManagement.Design
 			items.Add (new SettingValue("repositoryPath", fullPath, false));
 			Sections.Add(ConfigSectionName, items);
 		}
+		
+		public Dictionary<string, IList<SettingValue>> SectionsUpdated =
+			new Dictionary<string, IList<SettingValue>>();
+		
+		public void UpdateSections(string section, IList<SettingValue> values)
+		{
+			SectionsUpdated.Remove(section);
+			SectionsUpdated.Add(section, values);
+			SetValues(section, values);
+		}
 	}
 }

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

@@ -211,5 +211,10 @@ namespace ICSharpCode.PackageManagement
 		public bool DevelopmentDependency {
 			get { return package.DevelopmentDependency; }
 		}
+		
+		public void ExtractContents(IFileSystem fileSystem, string extractPath)
+		{
+			package.ExtractContents(fileSystem, extractPath);
+		}
 	}
 }

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

@@ -1,4 +1,4 @@
- Copyright 2010-2012 Outercurve Foundation
+ Copyright 2010-2014 Outercurve Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 NuGet Project
 ASP.NET Open Source Gallery at Outercurve Foundation
-Copyright 2010 Outercurve Foundation
+Copyright 2010-2014 Outercurve Foundation
 
 This product includes software developed at
 The Outercurve Foundation (http://www.outercurve.org/).
@@ -29,4 +29,10 @@ Ninject 2.1
 ----- 
 Website:      http://ninject.org/
 Copyright:    Copyright (c) 2010 Nate Kohari
-License:      Apache 2.0
+License:      Apache 2.0
+
+QueryInterceptor 0.2
+-----
+Website:      https://github.com/davidfowl/QueryInterceptor
+Copyright:    Copyright (c) 2011 David Fowler
+License:      The MIT License

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

@@ -458,5 +458,18 @@ namespace PackageManagement.Tests
 			
 			Assert.IsTrue(dependency);
 		}
+		
+		[Test]
+		public void ExtractPath_WrappedPackage_WrappedPackageExtractContentsCalled()
+		{
+			CreatePackage();
+			var expectedFileSystem = new FakeFileSystem();
+			string expectedPath = @"d:\projects\test\packages";
+			
+			package.ExtractContents(expectedFileSystem, expectedPath);
+			
+			Assert.AreEqual(expectedFileSystem, fakePackage.FileSystemPassedToExtractContents);
+			Assert.AreEqual(expectedPath, fakePackage.ExtractPathPassedToExtractContents);
+		}
 	}
 }

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

@@ -18,9 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml;
 using ICSharpCode.Core;
 using ICSharpCode.PackageManagement;
 using ICSharpCode.PackageManagement.Design;
@@ -171,16 +168,16 @@ namespace PackageManagement.Tests
 			registeredPackageSources.Clear();
 			registeredPackageSources.Add(packageSource);
 			
-			var expectedSavedPackageSourceSettings = new List<KeyValuePair<string, string>>();
-			expectedSavedPackageSourceSettings.Add(new KeyValuePair<string, string>("Test", "http://codeplex.com"));
+			var expectedSavedPackageSourceSettings = new List<SettingValue>();
+			expectedSavedPackageSourceSettings.Add(new SettingValue("Test", "http://codeplex.com", false));
 			
-			IList<KeyValuePair<string, string>> actualSavedPackageSourceSettings = fakeSettings.GetValuesPassedToSetValuesForPackageSourcesSection();
+			IList<SettingValue> actualSavedPackageSourceSettings = fakeSettings.GetValuesPassedToSetValuesForPackageSourcesSection();
 			
 			Assert.AreEqual(expectedSavedPackageSourceSettings, actualSavedPackageSourceSettings);
 		}
 		
 		[Test]
-		public void PackageSources_OnePackageSourceAdded_PackageSourcesSectionDeletedFromSettings()
+		public void PackageSources_OnePackageSourceAdded_PackageSourcesSectionUpdated()
 		{
 			CreateSettings();
 			CreateOptions(fakeSettings);
@@ -190,9 +187,11 @@ namespace PackageManagement.Tests
 			registeredPackageSources.Clear();
 			registeredPackageSources.Add(packageSource);
 			
-			bool sectionDeleted = fakeSettings.IsPackageSourcesSectionDeleted;
+			IList<SettingValue> settings = fakeSettings.SectionsUpdated[RegisteredPackageSourceSettings.PackageSourcesSectionName];
 			
-			Assert.IsTrue(sectionDeleted);
+			Assert.AreEqual(1, settings.Count);
+			Assert.AreEqual("Test", settings[0].Key);
+			Assert.AreEqual("http://codeplex.com", settings[0].Value);
 		}
 		
 		[Test]
@@ -222,10 +221,10 @@ namespace PackageManagement.Tests
 			
 			options.ActivePackageSource = packageSource;
 			
-			var expectedKeyValuePair = new KeyValuePair<string, string>("Test", "http://sharpdevelop.com");
-			KeyValuePair<string, string> actualKeyValuePair = fakeSettings.GetValuePassedToSetValueForActivePackageSourceSection();
+			var expectedKeyValuePair = new SettingValue("Test", "http://sharpdevelop.com", false);
+			SettingValue actualSetting = fakeSettings.GetValuePassedToSetValueForActivePackageSourceSection();
 			
-			Assert.AreEqual(expectedKeyValuePair, actualKeyValuePair);
+			Assert.AreEqual(expectedKeyValuePair, actualSetting);
 		}
 		
 		[Test]
@@ -387,9 +386,9 @@ namespace PackageManagement.Tests
 			registeredPackageSources.Clear();
 			registeredPackageSources.Add(packageSource);
 			
-			bool sectionDeleted = fakeSettings.IsDisabledPackageSourcesSectionDeleted;
+			IList<SettingValue> settings = fakeSettings.SectionsUpdated[RegisteredPackageSourceSettings.DisabledPackageSourceSectionName];
 			
-			Assert.IsTrue(sectionDeleted);
+			Assert.AreEqual(0, settings.Count);
 		}
 		
 		[Test]
@@ -403,10 +402,10 @@ namespace PackageManagement.Tests
 			registeredPackageSources.Clear();
 			registeredPackageSources.Add(packageSource);
 			
-			var expectedSavedPackageSourceSettings = new List<KeyValuePair<string, string>>();
-			expectedSavedPackageSourceSettings.Add(new KeyValuePair<string, string>(packageSource.Name, "true"));
+			var expectedSavedPackageSourceSettings = new List<SettingValue>();
+			expectedSavedPackageSourceSettings.Add(new SettingValue(packageSource.Name, "true", false));
 			
-			IList<KeyValuePair<string, string>> actualSavedPackageSourceSettings = 
+			IList<SettingValue> actualSavedPackageSourceSettings = 
 				fakeSettings.GetValuesPassedToSetValuesForDisabledPackageSourcesSection();
 			Assert.AreEqual(expectedSavedPackageSourceSettings, actualSavedPackageSourceSettings);
 		}
@@ -424,7 +423,7 @@ namespace PackageManagement.Tests
 			
 			bool result = fakeSettings.AnyValuesPassedToSetValuesForDisabledPackageSourcesSection;
 			
-			IList<KeyValuePair<string, string>> actualSavedPackageSourceSettings = 
+			IList<SettingValue> actualSavedPackageSourceSettings = 
 				fakeSettings.GetValuesPassedToSetValuesForDisabledPackageSourcesSection();
 			Assert.AreEqual(0, actualSavedPackageSourceSettings.Count);
 		}
@@ -458,10 +457,10 @@ namespace PackageManagement.Tests
 			
 			options.IsPackageRestoreEnabled = true;
 			
-			KeyValuePair<string, string> keyPair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
+			SettingValue setting = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
 			
-			Assert.AreEqual("enabled", keyPair.Key);
-			Assert.AreEqual("True", keyPair.Value);
+			Assert.AreEqual("enabled", setting.Key);
+			Assert.AreEqual("True", setting.Value);
 		}
 		
 		[Test]
@@ -486,8 +485,8 @@ namespace PackageManagement.Tests
 			
 			options.IsPackageRestoreEnabled = false;
 			
-			KeyValuePair<string, string> keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
-			Assert.AreEqual("False", keyValuePair.Value);
+			SettingValue setting = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
+			Assert.AreEqual("False", setting.Value);
 		}
 		
 		[Test]

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

@@ -21,6 +21,7 @@ using System.Collections.Generic;
 using ICSharpCode.Core;
 using ICSharpCode.PackageManagement;
 using ICSharpCode.PackageManagement.Design;
+using NuGet;
 using NUnit.Framework;
 using PackageManagement.Tests.Helpers;
 
@@ -366,8 +367,8 @@ namespace PackageManagement.Tests
 			
 			viewModel.SaveOptions();
 			
-			KeyValuePair<string, string> keyPair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
-			Assert.AreEqual("True", keyPair.Value);
+			SettingValue setting = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
+			Assert.AreEqual("True", setting.Value);
 		}
 	}
 }