Hello community, here is the log from the commit of package monodevelop for openSUSE:Factory checked in at 2015-10-30 13:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monodevelop (Old) and /work/SRC/openSUSE:Factory/.monodevelop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monodevelop" Changes: -------- --- /work/SRC/openSUSE:Factory/monodevelop/monodevelop.changes 2015-08-25 08:52:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.monodevelop.new/monodevelop.changes 2015-10-30 13:43:24.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 27 00:00:00 UTC 2015 - fwdsbs.to.1...@xoxy.net + +- Update to 5.9.6.23 + * Added nuget-2.8.7-support.patch for nuget 2.8.7 support + +------------------------------------------------------------------- Old: ---- monodevelop-5.9.5.9.tar.bz2 New: ---- monodevelop-5.9.6.23.tar.bz2 nuget-2.8.7-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop.spec ++++++ --- /var/tmp/diff_new_pack.NLxzpP/_old 2015-10-30 13:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.NLxzpP/_new 2015-10-30 13:43:26.000000000 +0100 @@ -50,14 +50,15 @@ # Mono.Cecil.dll requires rsync after it's build BuildRequires: rsync Url: http://www.monodevelop.com/ -Version: 5.9.5 +Version: 5.9.6 Release: 0 Summary: Full-Featured IDE for Mono and Gtk-Sharp License: LGPL-2.1 and MIT Group: Development/Tools/IDE -Source: http://download.mono-project.com/sources/%{name}/%{name}-%{version}.9.tar.bz2 +Source: http://download.mono-project.com/sources/%{name}/%{name}-%{version}.23.tar.bz2 Source2: monodevelop-rpmlintrc Patch0: downgrade_to_mvc3.patch +Patch1: nuget-2.8.7-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: mono-basic @@ -96,8 +97,9 @@ %prep # https://bugzilla.xamarin.com/show_bug.cgi?id=33309 -%setup -q -n monodevelop-5.9.4 +%setup -q -n monodevelop-%{version} %patch0 -p 1 +%patch1 -p 1 %build %{?env_options} ++++++ monodevelop-5.9.5.9.tar.bz2 -> monodevelop-5.9.6.23.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/monodevelop/monodevelop-5.9.5.9.tar.bz2 /work/SRC/openSUSE:Factory/.monodevelop.new/monodevelop-5.9.6.23.tar.bz2 differ: char 11, line 1 ++++++ nuget-2.8.7-support.patch ++++++ diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs 2015-08-12 13:56:09.000000000 +0300 @@ -231,5 +231,10 @@ namespace ICSharpCode.PackageManagement return true; } } + + public void ExtractContents (IFileSystem fileSystem, string extractPath) + { + package.ExtractContents (fileSystem, extractPath); + } } } diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs 2015-08-12 13:56:09.000000000 +0300 @@ -39,7 +39,9 @@ namespace ICSharpCode.PackageManagement { public class RegisteredPackageSourceSettings { + public static readonly string PackageSourcesSectionName = "packageSources"; public static readonly string ActivePackageSourceSectionName = "activePackageSource"; + public static readonly string DisabledPackageSourceSectionName = "disabledPackageSources"; public static readonly PackageSource AggregatePackageSource = new PackageSource("(Aggregate source)", "All"); diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs 2015-08-12 13:56:09.000000000 +0300 @@ -462,6 +462,19 @@ namespace MonoDevelop.PackageManagement. 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); + } } } diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs 2015-08-12 13:56:09.000000000 +0300 @@ -179,16 +179,16 @@ namespace MonoDevelop.PackageManagement. 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); @@ -198,9 +198,11 @@ namespace MonoDevelop.PackageManagement. 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] @@ -230,10 +232,10 @@ namespace MonoDevelop.PackageManagement. options.ActivePackageSource = packageSource; - var expectedKeyValuePair = new KeyValuePair<string, string> ("Test", "http://sharpdevelop.com";); - KeyValuePair<string, string> actualKeyValuePair = fakeSettings.GetValuePassedToSetValueForActivePackageSourceSection (); + var expectedSetting = new SettingValue ("Test", "http://sharpdevelop.com";, false); + SettingValue actualSetting = fakeSettings.GetValuePassedToSetValueForActivePackageSourceSection (); - Assert.AreEqual (expectedKeyValuePair, actualKeyValuePair); + Assert.AreEqual (expectedSetting, actualSetting); } [Test] @@ -395,9 +397,9 @@ namespace MonoDevelop.PackageManagement. 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] @@ -411,10 +413,10 @@ namespace MonoDevelop.PackageManagement. 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); } @@ -430,7 +432,7 @@ namespace MonoDevelop.PackageManagement. registeredPackageSources.Clear (); registeredPackageSources.Add (packageSource); - IList<KeyValuePair<string, string>> actualSavedPackageSourceSettings = + IList<SettingValue> actualSavedPackageSourceSettings = fakeSettings.GetValuesPassedToSetValuesForDisabledPackageSourcesSection (); Assert.AreEqual (0, actualSavedPackageSourceSettings.Count); } @@ -464,10 +466,10 @@ namespace MonoDevelop.PackageManagement. 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] @@ -492,8 +494,8 @@ namespace MonoDevelop.PackageManagement. options.IsPackageRestoreEnabled = false; - KeyValuePair<string, string> keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection (); - Assert.AreEqual ("False", keyValuePair.Value); + SettingValue setting = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection (); + Assert.AreEqual ("False", setting.Value); } [Test] diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs 2015-08-12 13:56:09.000000000 +0300 @@ -231,6 +231,15 @@ namespace MonoDevelop.PackageManagement. public bool DevelopmentDependency { get; set; } public bool IsValid { get; set; } + + public IFileSystem FileSystemPassedToExtractContents; + public string ExtractPathPassedToExtractContents; + + public void ExtractContents (IFileSystem fileSystem, string extractPath) + { + FileSystemPassedToExtractContents = fileSystem; + ExtractPathPassedToExtractContents = extractPath; + } } } diff -uprN old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs --- old/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs 2015-08-11 12:05:45.000000000 +0300 +++ new/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs 2015-08-12 13:56:09.000000000 +0300 @@ -83,30 +83,30 @@ namespace MonoDevelop.PackageManagement. PackageSources.Add (valuePair); } - 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 [PackageSourcesSectionName]; } @@ -184,7 +184,7 @@ namespace MonoDevelop.PackageManagement. DisabledPackageSources.Add (setting); } - public IList<KeyValuePair<string, string>> GetValuesPassedToSetValuesForDisabledPackageSourcesSection () + public IList<SettingValue> GetValuesPassedToSetValuesForDisabledPackageSourcesSection () { return SavedSectionValueLists [DisabledPackageSourcesSectionName]; } @@ -202,7 +202,7 @@ namespace MonoDevelop.PackageManagement. Sections.Add ("packageRestore", items); } - public KeyValuePair<string, string> GetValuePassedToSetValueForPackageRestoreSection () + public SettingValue GetValuePassedToSetValueForPackageRestoreSection () { return SavedSectionValues ["packageRestore"]; } @@ -219,6 +219,16 @@ namespace MonoDevelop.PackageManagement. 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); + } } }
