Browse Source

Update to NuGet 2.8.3

Fixes error when installing xunit.core 2.0.0-rc1-build2826:

System.InvalidOperationException: 'xunit.core' already has a
dependency defined for 'xunit.extensibility.core'.
pull/661/head
Matt Ward 11 years ago
parent
commit
c7e6319925
  1. 78
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeSettings.cs
  2. 14
      src/AddIns/Misc/PackageManagement/Project/Src/PackageSourceConverter.cs
  3. 4
      src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSourceSettings.cs
  4. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll
  5. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
  6. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.exe

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

@ -26,18 +26,18 @@ namespace ICSharpCode.PackageManagement.Design
{ {
public class FakeSettings : ISettings public class FakeSettings : ISettings
{ {
public List<KeyValuePair<string, string>> PackageSources public List<SettingValue> PackageSources
= new List<KeyValuePair<string, string>>(); = new List<SettingValue> ();
public List<KeyValuePair<string, string>> DisabledPackageSources public List<SettingValue> DisabledPackageSources
= new List<KeyValuePair<string, string>>(); = new List<SettingValue> ();
public List<KeyValuePair<string, string>> ActivePackageSourceSettings = public List<SettingValue> ActivePackageSourceSettings =
new List<KeyValuePair<string, string>>(); new List<SettingValue> ();
public Dictionary<string, IList<SettingValue>> Sections
= new Dictionary<string, IList<SettingValue>> ();
public Dictionary<string, IList<KeyValuePair<string, string>>> Sections
= new Dictionary<string, IList<KeyValuePair<string, string>>>();
public const string ConfigSectionName = "config"; public const string ConfigSectionName = "config";
public FakeSettings() public FakeSettings()
@ -47,29 +47,24 @@ namespace ICSharpCode.PackageManagement.Design
Sections.Add(RegisteredPackageSourceSettings.DisabledPackageSourceSectionName, DisabledPackageSources); Sections.Add(RegisteredPackageSourceSettings.DisabledPackageSourceSectionName, DisabledPackageSources);
} }
public string GetValue(string section, string key) public string GetValue(string section, string key, bool isPath)
{ {
if (!Sections.ContainsKey(section)) if (Sections.ContainsKey(section)) {
return null; var matchedSection = Sections[section];
return matchedSection.FirstOrDefault(item => item.Key == key).Value;
IList<KeyValuePair<string, string>> values = Sections[section];
foreach (KeyValuePair<string, string> keyPair in values) {
if (keyPair.Key == key) {
return keyPair.Value;
}
} }
return null; return null;
} }
public IList<KeyValuePair<string, string>> GetValues(string section) public IList<SettingValue> GetValues(string section, bool isPath)
{ {
return Sections[section]; return Sections[section];
} }
public void AddFakePackageSource(PackageSource packageSource) public void AddFakePackageSource(PackageSource packageSource)
{ {
var valuePair = new KeyValuePair<string, string>(packageSource.Name, packageSource.Source); var setting = new SettingValue (packageSource.Name, packageSource.Source, false);
PackageSources.Add(valuePair); PackageSources.Add(setting);
} }
public Dictionary<string, KeyValuePair<string, string>> SavedSectionValues = public Dictionary<string, KeyValuePair<string, string>> SavedSectionValues =
@ -134,8 +129,8 @@ namespace ICSharpCode.PackageManagement.Design
public void SetFakeActivePackageSource(PackageSource packageSource) public void SetFakeActivePackageSource(PackageSource packageSource)
{ {
ActivePackageSourceSettings.Clear(); ActivePackageSourceSettings.Clear();
var valuePair = new KeyValuePair<string, string>(packageSource.Name, packageSource.Source); var setting = new SettingValue(packageSource.Name, packageSource.Source, false);
ActivePackageSourceSettings.Add(valuePair); ActivePackageSourceSettings.Add(setting);
} }
public void MakeActivePackageSourceSectionNull() public void MakeActivePackageSourceSectionNull()
@ -157,9 +152,9 @@ namespace ICSharpCode.PackageManagement.Design
} }
} }
public IList<KeyValuePair<string, string>> GetNestedValues(string section, string key) public IList<SettingValue> GetNestedValues(string section, string key)
{ {
return new List<KeyValuePair<string, string>>(); return new List<SettingValue>();
} }
public virtual void SetNestedValues(string section, string key, IList<KeyValuePair<string, string>> values) public virtual void SetNestedValues(string section, string key, IList<KeyValuePair<string, string>> values)
@ -169,8 +164,8 @@ namespace ICSharpCode.PackageManagement.Design
public void AddDisabledPackageSource(PackageSource packageSource) public void AddDisabledPackageSource(PackageSource packageSource)
{ {
var valuePair = new KeyValuePair<string, string>(packageSource.Name, packageSource.Source); var setting = new SettingValue(packageSource.Name, packageSource.Source, false);
DisabledPackageSources.Add(valuePair); DisabledPackageSources.Add(setting);
} }
public IList<KeyValuePair<string, string>> GetValuesPassedToSetValuesForDisabledPackageSourcesSection() public IList<KeyValuePair<string, string>> GetValuesPassedToSetValuesForDisabledPackageSourcesSection()
@ -186,8 +181,8 @@ namespace ICSharpCode.PackageManagement.Design
public virtual void SetPackageRestoreSetting(bool enabled) public virtual void SetPackageRestoreSetting(bool enabled)
{ {
var items = new List<KeyValuePair<string, string>>(); var items = new List<SettingValue> ();
items.Add(new KeyValuePair<string, string>("enabled", enabled.ToString())); items.Add(new SettingValue("enabled", enabled.ToString(), false));
Sections.Add("packageRestore", items); Sections.Add("packageRestore", items);
} }
@ -202,31 +197,10 @@ namespace ICSharpCode.PackageManagement.Design
} }
} }
public string GetValue(string section, string key, bool isPath)
{
if (Sections.ContainsKey(section)) {
var matchedSection = Sections[section];
return matchedSection.FirstOrDefault(item => item.Key == key).Value;
}
return null;
}
public IList<KeyValuePair<string, string>> GetValues(string section, bool isPath)
{
throw new NotImplementedException();
}
public IList<SettingValue> GetSettingValues(string section, bool isPath)
{
return Sections[section]
.Select(item => new SettingValue(item.Key, item.Value, false))
.ToList();
}
public void SetRepositoryPathSetting(string fullPath) public void SetRepositoryPathSetting(string fullPath)
{ {
var items = new List<KeyValuePair<string, string>> (); var items = new List<SettingValue>();
items.Add (new KeyValuePair<string, string>("repositoryPath", fullPath)); items.Add (new SettingValue("repositoryPath", fullPath, false));
Sections.Add(ConfigSectionName, items); Sections.Add(ConfigSectionName, items);
} }
} }

14
src/AddIns/Misc/PackageManagement/Project/Src/PackageSourceConverter.cs

@ -25,16 +25,16 @@ namespace ICSharpCode.PackageManagement
{ {
public static class PackageSourceConverter public static class PackageSourceConverter
{ {
public static IEnumerable<PackageSource> ConvertFromKeyValuePairs(IEnumerable<KeyValuePair<string, string>> packageSources) public static IEnumerable<PackageSource> ConvertFromSettings(IEnumerable<SettingValue> packageSources)
{ {
if (HasAny(packageSources)) { if (HasAny(packageSources)) {
foreach (KeyValuePair<string, string> packageSource in packageSources) { foreach (SettingValue packageSource in packageSources) {
yield return CreatePackageSourceFromKeyValuePair(packageSource); yield return CreatePackageSourceFromSetting(packageSource);
} }
} }
} }
static bool HasAny(IEnumerable<KeyValuePair<string, string>> packageSources) static bool HasAny(IEnumerable<SettingValue> packageSources)
{ {
if (packageSources != null) { if (packageSources != null) {
return packageSources.Any(); return packageSources.Any();
@ -42,17 +42,17 @@ namespace ICSharpCode.PackageManagement
return false; return false;
} }
static PackageSource CreatePackageSourceFromKeyValuePair(KeyValuePair<string, string> savedPackageSource) static PackageSource CreatePackageSourceFromSetting(SettingValue savedPackageSource)
{ {
string source = savedPackageSource.Value; string source = savedPackageSource.Value;
string name = savedPackageSource.Key; string name = savedPackageSource.Key;
return new PackageSource(source, name); return new PackageSource(source, name);
} }
public static PackageSource ConvertFromFirstKeyValuePair(IEnumerable<KeyValuePair<string, string>> packageSources) public static PackageSource ConvertFromFirstSetting(IEnumerable<SettingValue> packageSources)
{ {
if (HasAny(packageSources)) { if (HasAny(packageSources)) {
return CreatePackageSourceFromKeyValuePair(packageSources.First()); return CreatePackageSourceFromSetting(packageSources.First());
} }
return null; return null;
} }

4
src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSourceSettings.cs

@ -76,8 +76,8 @@ namespace ICSharpCode.PackageManagement
void ReadActivePackageSource() void ReadActivePackageSource()
{ {
IList<KeyValuePair<string, string>> packageSources = settings.GetValues(ActivePackageSourceSectionName); IList<SettingValue> packageSources = settings.GetValues(ActivePackageSourceSectionName, false);
activePackageSource = PackageSourceConverter.ConvertFromFirstKeyValuePair(packageSources); activePackageSource = PackageSourceConverter.ConvertFromFirstSetting(packageSources);
} }
public RegisteredPackageSources PackageSources { public RegisteredPackageSources PackageSources {

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll

Binary file not shown.

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll

Binary file not shown.

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.exe

Binary file not shown.
Loading…
Cancel
Save