Update to NuGet 1.7

src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@@ -70,6 +70,7 @@
     </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\AcceptLicensesEventArgs.cs" />
+    <Compile Include="Src\ConfigSettingsFileSystem.cs" />
     <Compile Include="Src\Design\DesignTimeSelectProjectsViewModel.cs" />
     <Compile Include="Src\Design\FakePackageOperation.cs" />
     <Compile Include="Src\Design\FakeSelectedProject.cs" />

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

@@ -0,0 +1,24 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.IO;
+using ICSharpCode.SharpDevelop.Project;
+using NuGet;
+
+namespace ICSharpCode.PackageManagement
+{
+	public class ConfigSettingsFileSystem : PhysicalFileSystem
+	{
+		ConfigSettingsFileSystem(string root)
+			: base(root)
+		{
+		}
+		
+		public static ConfigSettingsFileSystem CreateConfigSettingsFileSystem(Solution solution)
+		{
+			string configSettingsFolder = Path.Combine(solution.Directory, ".nuget");
+			return new ConfigSettingsFileSystem(configSettingsFolder);
+		}
+	}
+}

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

@@ -54,5 +54,7 @@ namespace ICSharpCode.PackageManagement.Design
 		{
 			throw new NotImplementedException();
 		}
+		
+		public bool IsBindingRedirectSupported { get; set; }
 	}
 }

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

@@ -118,5 +118,15 @@ namespace ICSharpCode.PackageManagement.Design
 				AddFakePackageSource(packageSource);
 			}
 		}
+		
+		public IList<KeyValuePair<string, string>> GetNestedValues(string section, string key)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public void SetNestedValues(string section, string key, IList<KeyValuePair<string, string>> values)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

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

@@ -11,7 +11,8 @@ namespace ICSharpCode.PackageManagement
 	{
 		ISharedPackageRepository CreateSharedRepository(
 			IPackagePathResolver pathResolver,
-			IFileSystem fileSystem);
+			IFileSystem fileSystem,
+			IFileSystem configSettingsFileSystem);
 		
 		IRecentPackageRepository CreateRecentPackageRepository(
 			IList<RecentPackageInfo> recentPackages,

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

@@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement
 		}
 		
 		public PackageManagementOptions(Properties properties)
-			: this(properties, Settings.DefaultSettings)
+			: this(properties, Settings.LoadDefaultSettings())
 		{
 		}
 		

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

@@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement
 		
 		void GetFileNameForProject(IProject project)
 		{
-			FileName = Path.Combine(project.Directory, PackageReferenceRepository.PackageReferenceFile);
+			FileName = Path.Combine(project.Directory, Constants.PackageReferenceFile);
 		}
 		
 		public string FileName { get; private set; }

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

@@ -62,9 +62,9 @@ namespace ICSharpCode.PackageManagement
 			return repository;
 		}
 		
-		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem)
+		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem, IFileSystem configSettingsFileSystem)
 		{
-			return factory.CreateSharedRepository(pathResolver, fileSystem);
+			return factory.CreateSharedRepository(pathResolver, fileSystem, configSettingsFileSystem);
 		}
 		
 		public IPackageRepository CreateAggregateRepository()

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

@@ -46,7 +46,7 @@ namespace ICSharpCode.PackageManagement
 			}
 		}
 		
-		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem)
+		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem, IFileSystem configSettingsFileSystem)
 		{
 			throw new NotImplementedException();
 		}

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

@@ -55,10 +55,5 @@ namespace ICSharpCode.PackageManagement
 		{
 			return projectSystemFactory.CreateProjectSystem(project);
 		}
-		
-		ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem)
-		{
-			return packageRepositoryFactory.CreateSharedRepository(pathResolver, fileSystem);
-		}
 	}
 }

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

@@ -23,9 +23,10 @@ namespace ICSharpCode.PackageManagement
 		
 		public ISharedPackageRepository CreateSharedRepository(
 			IPackagePathResolver pathResolver,
-			IFileSystem fileSystem)
+			IFileSystem fileSystem,
+			IFileSystem configSettingsFileSystem)
 		{
-			return new SharedPackageRepository(pathResolver, fileSystem);
+			return new SharedPackageRepository(pathResolver, fileSystem, configSettingsFileSystem);
 		}
 		
 		public IRecentPackageRepository CreateRecentPackageRepository(

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

@@ -40,6 +40,8 @@ namespace ICSharpCode.PackageManagement
 			return directory + @"\";
 		}
 		
+		public bool IsBindingRedirectSupported { get; set; }
+		
 		public FrameworkName TargetFramework {
 			get { return GetTargetFramework(); }
 		}

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

@@ -35,7 +35,7 @@ namespace ICSharpCode.PackageManagement
 			repositoryPath = new SolutionPackageRepositoryPath(solution, options);
 			CreatePackagePathResolver();
 			CreateFileSystem();
-			CreateRepository();
+			CreateRepository(ConfigSettingsFileSystem.CreateConfigSettingsFileSystem(solution));
 		}
 		
 		void CreatePackagePathResolver()
@@ -48,9 +48,9 @@ namespace ICSharpCode.PackageManagement
 			fileSystem = new PhysicalFileSystem(repositoryPath.PackageRepositoryPath);
 		}
 		
-		void CreateRepository()
+		void CreateRepository(ConfigSettingsFileSystem configSettingsFileSystem)
 		{
-			repository = repositoryFactory.CreateSharedRepository(packagePathResolver, fileSystem);			
+			repository = repositoryFactory.CreateSharedRepository(packagePathResolver, fileSystem, configSettingsFileSystem);			
 		}
 		
 		public ISharedPackageRepository Repository {

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

@@ -53,7 +53,7 @@ namespace ICSharpCode.PackageManagement
 		
 		IEnumerable<IPackage> GetUpdatedPackages(IPackageRepository sourceRepository, IQueryable<IPackage> localPackages)
 		{
-			return sourceRepository.GetUpdates(localPackages, false);
+			return sourceRepository.GetUpdates(localPackages, false, false);
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml

@@ -420,6 +420,10 @@ Returns a list of recently installed packages.
         <command:parameter required="false" position="named">
           <maml:name>RemoveDependencies</maml:name>
         </command:parameter>
+        <command:parameter required="false" position="named">
+          <maml:name>ProjectName</maml:name>
+          <command:parameterValue required="true">string</command:parameterValue>
+        </command:parameter>
         <command:parameter required="false" position="named">
           <maml:name>Force</maml:name>
         </command:parameter>
@@ -457,6 +461,12 @@ Returns a list of recently installed packages.
           string
         </command:parameterValue>
       </command:parameter>
+      <command:parameter required="false" position="named">
+        <maml:name>Force</maml:name>
+        <maml:description>
+          <maml:para>Forces an uninstall of the package even if another package depends on it.</maml:para>
+        </maml:description>
+      </command:parameter>
       <command:parameter required="false" position="named">
         <maml:name>Version</maml:name>
         <maml:description>
@@ -707,124 +717,6 @@ available in the feed, the -Safe flag updates the package to 1.0.2.
     </maml:relatedLinks>
   </command:command>
 
-  <!-- New-Package command -->
-  <command:command
-      xmlns:maml="http://schemas.microsoft.com/maml/2004/10"
-      xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10"
-      xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
-
-    <command:details>
-      <command:name>
-        New-Package
-      </command:name>
-      <maml:description>
-        <maml:para>Creates a package.</maml:para>
-      </maml:description>
-      <command:verb>New</command:verb>
-      <command:noun>Package</command:noun>
-      <dev:version></dev:version>
-    </command:details>
-
-    <maml:description>
-      <maml:para>Creates a new package when supplied with a Nuspec package specification file.</maml:para>
-    </maml:description>
-
-    <!-- Cmdlet syntax section-->
-    <command:syntax>
-      <command:syntaxItem>
-        <maml:name>New-Package</maml:name>
-        <command:parameter required="false" position="0">
-          <maml:name>ProjectName</maml:name>
-          <command:parameterValue required="true">string</command:parameterValue>
-        </command:parameter>
-        <command:parameter required="true" position="1">
-          <maml:name>SpecFileName</maml:name>
-          <command:parameterValue required="true">string</command:parameterValue>
-        </command:parameter>
-        <command:parameter required="true" position="2">
-          <maml:name>TargetFile </maml:name>
-          <command:parameterValue required="true">string</command:parameterValue>
-        </command:parameter>
-        <command:parameter required="false" position="named">
-          <maml:name>NoClobber</maml:name>
-        </command:parameter>
-      </command:syntaxItem>
-    </command:syntax>
-
-    <!-- Cmdlet parameter section  -->
-    <command:parameters>
-      <command:parameter required="false" position="0">
-        <maml:name>ProjectName</maml:name>
-        <maml:description>
-          <maml:para>Specifies the project containing the NuSpec file to use when creating the package. If omitted, the current project selected in the console is used.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true">string</command:parameterValue>
-      </command:parameter>
-      <command:parameter required="true" position="1">
-        <maml:name>SpecFileName</maml:name>
-        <maml:description>
-          <maml:para>Specifies the NuSpec file used to create the package. If omitted, the NuSpec file within the current project is used if there is only one such file.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true">string</command:parameterValue>
-      </command:parameter>
-      <command:parameter required="true" position="2">
-        <maml:name>TargetFile </maml:name>
-        <maml:description>
-          <maml:para>Specifes the full name of the output NuPkg file.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true">string</command:parameterValue>
-      </command:parameter>
-      <command:parameter required="false" position="named">
-        <maml:name>NoClobber</maml:name>
-        <maml:description>
-          <maml:para>If specified, the target file is not overwritten.</maml:para>
-        </maml:description>
-      </command:parameter>
-    </command:parameters>
-
-    <command:examples>
-      <command:example>
-        <maml:title>----------  EXAMPLE 1 ----------</maml:title>
-        <dev:code>PM&gt; New-Package</dev:code>
-        <dev:remarks>
-          <maml:para>
-Description
-------------------------------------------------------------------
-Creates a new package based on the current project using a Nuspec file within the project if only one such file is found.
-          </maml:para>
-          <maml:para></maml:para>
-          <maml:para></maml:para>
-        </dev:remarks>
-      </command:example>
-
-      <command:example>
-        <maml:title>----------  EXAMPLE 2  ----------</maml:title>
-        <dev:code>PM&gt; New-Package -Project MyProjectName -SpecFileName MyPackage.nuspec</dev:code>
-        <dev:remarks>
-          <maml:para>
-Description
-------------------------------------------------------------------
-Creates a new package from the specified project, MyProjectName using the specified Nuspec file, MyPackage.nuspec.
-          </maml:para>
-          <maml:para></maml:para>
-          <maml:para></maml:para>
-        </dev:remarks>
-      </command:example>
-    </command:examples>
-    
-    <!-- Link section  -->
-    <maml:relatedLinks>
-      <maml:navigationLink>
-        <maml:linkText>Online version:</maml:linkText>
-        <maml:uri>http://docs.nuget.org/</maml:uri>
-      </maml:navigationLink>
-      <maml:navigationLink>
-        <maml:linkText>New-Package</maml:linkText>
-        <maml:uri/>
-      </maml:navigationLink>
-    </maml:relatedLinks>
-  </command:command>
-
   <!-- Add-BindingRedirect command -->
   <command:command
       xmlns:maml="http://schemas.microsoft.com/maml/2004/10"

src/AddIns/Misc/PackageManagement/RequiredLibraries/about_NuGet.Cmdlets.help.txt

@@ -22,16 +22,16 @@ LONG DESCRIPTION
 
         Update-Package			Updates a package and its dependencies to a newer version.
 
-        New-Package				Creates a new package when supplied with a Nuspec package specification file.
-
-        Add-BindingRedirect		Examines all assemblies within the output path for a project and adds binding 
-                                redirects to the application (or web) configuration file where necessary.
+        Add-BindingRedirect		Examines all assemblies within the output path for a project
+                                and adds binding redirects to the application (or web) 
+                                configuration file where necessary.
                             
-        Get-Project				Returns a reference to the DTE (Development Tools Environment) for the specified project. 
-                                If none is specifed, returns the default project selected in the Package Manager Console.
+        Get-Project				Returns a reference to the DTE (Development Tools Environment) 
+                                for the specified project. If none is specifed, returns the 
+                                default project selected in the Package Manager Console.
 
-        Open-PackagePage        Open the browser pointing to ProjectUrl, LicenseUrl or ReportAbuseUrl of the
-                                specified package.
+        Open-PackagePage        Open the browser pointing to ProjectUrl, LicenseUrl or 
+                                ReportAbuseUrl of the specified package.
 
         Register-TabExpansion	Registers a tab expansion for the parameters of a command.
 
@@ -41,7 +41,6 @@ SEE ALSO
     Install-Package
     Uninstall-Package
     Update-Package
-    New-Package
     Add-BindingRedirect
     Get-Project
     Open-PackagePage

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

@@ -37,12 +37,14 @@ namespace PackageManagement.Tests.Helpers
 		
 		public IPackagePathResolver PathResolverPassedToCreateSharedRepository;
 		public IFileSystem FileSystemPassedToCreateSharedRepository;
+		public IFileSystem ConfigSettingsFileSystemPassedToCreateSharedRepository;
 		public FakeSharedPackageRepository FakeSharedRepository = new FakeSharedPackageRepository();
 		
-		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem)
+		public ISharedPackageRepository CreateSharedRepository(IPackagePathResolver pathResolver, IFileSystem fileSystem, IFileSystem configSettingsFileSystem)
 		{
 			PathResolverPassedToCreateSharedRepository = pathResolver;
 			FileSystemPassedToCreateSharedRepository = fileSystem;
+			ConfigSettingsFileSystemPassedToCreateSharedRepository = configSettingsFileSystem;
 			return FakeSharedRepository;
 		}
 		

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

@@ -112,7 +112,7 @@ namespace PackageManagement.Tests
 		public void CreateSharedRepository_MethodCalled_ReturnsSharedPackageRepository()
 		{
 			CreateCache();
-			ISharedPackageRepository repository = cache.CreateSharedRepository(null, null);
+			ISharedPackageRepository repository = cache.CreateSharedRepository(null, null, null);
 			Assert.IsNotNull(repository);
 		}
 		
@@ -121,7 +121,7 @@ namespace PackageManagement.Tests
 		{
 			CreateCache();
 			FakePackagePathResolver resolver = new FakePackagePathResolver();
-			cache.CreateSharedRepository(resolver, null);
+			cache.CreateSharedRepository(resolver, null, null);
 			
 			Assert.AreEqual(resolver, fakePackageRepositoryFactory.PathResolverPassedToCreateSharedRepository);
 		}
@@ -131,11 +131,21 @@ namespace PackageManagement.Tests
 		{
 			CreateCache();
 			FakeFileSystem fileSystem = new FakeFileSystem();
-			cache.CreateSharedRepository(null, fileSystem);
+			cache.CreateSharedRepository(null, fileSystem, null);
 			
 			Assert.AreEqual(fileSystem, fakePackageRepositoryFactory.FileSystemPassedToCreateSharedRepository);
 		}
 		
+		[Test]
+		public void CreatedSharedRepository_ConfigSettingsFileSystemPassed_FileSystemUsedToCreatedSharedRepository()
+		{
+			CreateCache();
+			FakeFileSystem fileSystem = new FakeFileSystem();
+			cache.CreateSharedRepository(null, null, fileSystem);
+			
+			Assert.AreEqual(fileSystem, fakePackageRepositoryFactory.ConfigSettingsFileSystemPassedToCreateSharedRepository);
+		}
+		
 		[Test]
 		public void CreateAggregatePackageRepository_TwoRegisteredPackageRepositories_ReturnsAggregateRepositoryFromFactory()
 		{

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs

@@ -46,8 +46,7 @@ namespace PackageManagement.Tests.Scripting
 		
 		PackageOperationEventArgs CreatePackageOperationEventArgs(FakePackage package, string installPath)
 		{
-			string targetPath = @"d:\projects\myproject\packages\target";
-			return new PackageOperationEventArgs(package, null, targetPath, installPath);
+			return new PackageOperationEventArgs(package, null, installPath);
 		}
 		
 		[Test]

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

@@ -120,13 +120,10 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void GetPackagesByDependencyOrder_OnePackageInSharedRepository_SharedRepositoryCreatedWithFileSystemForSolutionPackagesFolder()
+		public void Constructor_CreateInstance_SharedRepositoryCreatedWithFileSystemForSolutionPackagesFolder()
 		{
 			CreateSolution(@"d:\projects\myproject\myproject.sln");
 			CreateRepository(solution);
-			FakePackage package = AddPackageToSharedRepository("Test");
-						
-			List<IPackage> actualPackages = repository.GetPackagesByDependencyOrder().ToList();
 			
 			IFileSystem fileSystem = fakeRepositoryFactory.FileSystemPassedToCreateSharedRepository;
 			string rootPath = fileSystem.Root;
@@ -136,6 +133,20 @@ namespace PackageManagement.Tests
 			Assert.AreEqual(expectedRootPath, rootPath);
 		}
 		
+		[Test]
+		public void Constructor_CreateInstance_SharedRepositoryCreatedWithConfigSettingsFileSystemForSolutionNuGetFolder()
+		{
+			CreateSolution(@"d:\projects\myproject\myproject.sln");
+			CreateRepository(solution);
+			
+			IFileSystem fileSystem = fakeRepositoryFactory.ConfigSettingsFileSystemPassedToCreateSharedRepository;
+			string rootPath = fileSystem.Root;
+			
+			string expectedRootPath = @"d:\projects\myproject\.nuget";
+			
+			Assert.AreEqual(expectedRootPath, rootPath);
+		}
+		
 		[Test]
 		public void GetPackagesByDependencyOrder_TwoPackagesInSharedRepositoryFirstPackageDependsOnSecond_ReturnsSecondPackageFirst()
 		{