Browse Source

Fix .nuget folder not being checked for a NuGet.Config file.

pull/484/head
Matt Ward 11 years ago
parent
commit
50b2f02f0d
  1. 2
      src/AddIns/Misc/PackageManagement/Project/Src/SettingsProvider.cs
  2. 4
      src/AddIns/Misc/PackageManagement/Test/Src/SettingsProviderTests.cs

2
src/AddIns/Misc/PackageManagement/Project/Src/SettingsProvider.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.PackageManagement @@ -45,7 +45,7 @@ namespace ICSharpCode.PackageManagement
{
ISolution solution = projectService.OpenSolution;
if (solution != null) {
return solution.Directory;
return Path.Combine(solution.Directory, ".nuget");
}
return null;
}

4
src/AddIns/Misc/PackageManagement/Test/Src/SettingsProviderTests.cs

@ -66,14 +66,14 @@ namespace PackageManagement.Tests @@ -66,14 +66,14 @@ namespace PackageManagement.Tests
}
[Test]
public void LoadSettings_SolutionOpen_FileSystemWithRootSetToSolutionDirectoryUsedToLoadSettings()
public void LoadSettings_SolutionOpen_FileSystemWithRootSetToSolutionDotNuGetDirectoryUsedToLoadSettings()
{
string fileName = @"d:\projects\MyProject\MyProject.sln";
OpenSolution(fileName);
ISettings settings = settingsProvider.LoadSettings();
Assert.AreEqual(@"d:\projects\MyProject", fileSystemUsedToLoadSettings.Root);
Assert.AreEqual(@"d:\projects\MyProject\.nuget", fileSystemUsedToLoadSettings.Root);
Assert.AreEqual(fakeSettings, settings);
}
}

Loading…
Cancel
Save