Add a few TypeForwardedTo attributes for types moved to System.dll

* System.Collections.ObjectModel/ObservableCollection.cs [NET_4_0]:
Forward type to System.dll.
* System.Collections.ObjectModel/ReadOnlyObservableCollection.cs: Likewise.
* System.Collections.Specialized/INotifyCollectionChanged.cs: Likewise.
* System.Collections.Specialized/NotifyCollectionChangedAction.cs: Likewise.
* System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs: Likewise.
* System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs:
Likewise.

svn path=/trunk/mcs/; revision=146678

diff --git a/mcs/class/WindowsBase/ChangeLog b/mcs/class/WindowsBase/ChangeLog
index 136ea676ad6e532556130182b40d620376cdabd7..ba054b35d0a88f117c99f850d5dab32c3a4fb097 100644 (file)
--- a/mcs/class/WindowsBase/ChangeLog
+++ b/mcs/class/WindowsBase/ChangeLog
@@ -1,11 +1,18 @@
-2009-06-25  Sandy Armstrong  <sanfordarmstrong@gmail.com>
-
-       * System.Windows/Rect.cs: Implement unimplemented ToString methods to
-       support custom and culture-based formatting. Fixes bug #516165.
-       * Test/System.Windows/RectTest.cs: Expand ToStringTest to cover above
-       changes. Add new ToString_FormatException test, currently set to
-       NotWorking category because of Mono bug #516172.
-
+2009-11-21  Raja R Harinath  <harinath@hurrynot.org>\r
+\r
+       * System.Collections.ObjectModel/ObservableCollection.cs [NET_4_0]:\r
+       Forward type to System.dll.\r
+       * System.Collections.ObjectModel/ReadOnlyObservableCollection.cs:\r
+       Likewise.\r
+\r
+2009-06-25  Sandy Armstrong  <sanfordarmstrong@gmail.com>\r
+\r
+       * System.Windows/Rect.cs: Implement unimplemented ToString methods to\r
+       support custom and culture-based formatting. Fixes bug #516165.\r
+       * Test/System.Windows/RectTest.cs: Expand ToStringTest to cover above\r
+       changes. Add new ToString_FormatException test, currently set to\r
+       NotWorking category because of Mono bug #516172.\r
+\r
 2009-03-19  Alan McGovern  <amcgovern@novell.com>\r
 \r
        * Test/System.IO.Packaging/FakePackageTests.cs:\r

diff --git a/mcs/class/WindowsBase/System.Collections.ObjectModel/ObservableCollection.cs b/mcs/class/WindowsBase/System.Collections.ObjectModel/ObservableCollection.cs
index 951e3a39cfa474c1f77e6d6337bb97042c951b9f..52e7ee3c159312b19179aa844f790b2b2f2dd89c 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.ObjectModel/ObservableCollection.cs
+++ b/mcs/class/WindowsBase/System.Collections.ObjectModel/ObservableCollection.cs
@@ -24,6 +24,14 @@
 //     Brian O'Keefe (zer0keefie@gmail.com)
 //
 
+#if NET_4_0
+
+using System.Collections.ObjectModel;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (ObservableCollection<>))]
+
+#else
+
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -180,3 +188,4 @@ namespace System.Collections.ObjectModel {
                }
        }
 }
+#endif

diff --git a/mcs/class/WindowsBase/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs b/mcs/class/WindowsBase/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
index a074ec07f831c1a3e3188f4645bc8654f2e52e8f..b88daa26ded17802ee130bafb906109d7692b4f3 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
+++ b/mcs/class/WindowsBase/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
@@ -24,6 +24,14 @@
 //     Brian O'Keefe (zer0keefie@gmail.com)
 //
 
+#if NET_4_0
+
+using System.Collections.ObjectModel;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (ReadOnlyObservableCollection<>))]
+
+#else
+
 using System.Collections.Specialized;
 using System.ComponentModel;
 
@@ -79,3 +87,4 @@ namespace System.Collections.ObjectModel {
        }
 
 }
+#endif

diff --git a/mcs/class/WindowsBase/System.Collections.Specialized/ChangeLog b/mcs/class/WindowsBase/System.Collections.Specialized/ChangeLog
index 5f3dcbdcb603f810c251ef4d4bb38d5f7e0a0905..2b5cb14d44217f603a13cf4ac4b41b43f39a1b13 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.Specialized/ChangeLog
+++ b/mcs/class/WindowsBase/System.Collections.Specialized/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-21  Raja R Harinath  <harinath@hurrynot.org>
+
+       * INotifyCollectionChanged.cs [NET_4_0]: Forward type to System.dll.
+       * NotifyCollectionChangedAction.cs: Likewise.
+       * NotifyCollectionChangedEventArgs.cs: Likewise.
+       * NotifyCollectionChangedEventHandler.cs: Likewise.
+
 2008-11-04  Chris Toshok  <toshok@ximian.com>
 
        * CollectionChangedEventManager.cs: implement this using the msdn

diff --git a/mcs/class/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs b/mcs/class/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
index 544380c257919e06a20ee458a831c78ccb9a845f..e0d6a102ffdd3a3f65e909d6f716c5a8920b8b0a 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
+++ b/mcs/class/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
@@ -23,6 +23,14 @@
 //     Chris Toshok (toshok@ximian.com)
 //
 
+#if NET_4_0
+
+using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (INotifyCollectionChanged))]
+
+#else
+
 using System;
 using System.Windows;
 
@@ -34,3 +42,4 @@ namespace System.Collections.Specialized {
        }
 
 }
+#endif

diff --git a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
index a6ec65c7cf3080069b03b2e19a8960ffc58e513e..82ad8cac2eb9efe906da37d054ae7756a2509756 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
+++ b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
@@ -23,6 +23,14 @@
 //     Chris Toshok (toshok@ximian.com)
 //
 
+#if NET_4_0
+
+using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (NotifyCollectionChangedAction))]
+
+#else
+
 using System;
 
 namespace System.Collections.Specialized {
@@ -36,3 +44,4 @@ namespace System.Collections.Specialized {
        }
 
 }
+#endif

diff --git a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
index 24a05722ac1ab60c345374377eb68c49fe8f1c2a..e913190db3b26269f3d1c73497adb912bed753d5 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
+++ b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
@@ -24,6 +24,14 @@
 //     Brian O'Keefe (zer0keefie@gmail.com)
 //
 
+#if NET_4_0
+
+using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (NotifyCollectionChangedEventArgs))]
+
+#else
+
 namespace System.Collections.Specialized {
        public class NotifyCollectionChangedEventArgs : EventArgs {
                private NotifyCollectionChangedAction action;
@@ -209,3 +217,4 @@ namespace System.Collections.Specialized {
                #endregion
        }
 }
+#endif
\ No newline at end of file

diff --git a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
index 0a522966bb6ca0ca22c358372f3d5e75daa81637..85e5d909ec4c50b480e925f60a80e7972ffaa83f 100644 (file)
--- a/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
+++ b/mcs/class/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
@@ -23,6 +23,14 @@
 //     Chris Toshok (toshok@ximian.com)
 //
 
+#if NET_4_0
+
+using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
+[assembly:TypeForwardedTo (typeof (NotifyCollectionChangedEventHandler))]
+
+#else
+
 using System;
 
 namespace System.Collections.Specialized {
@@ -30,3 +38,4 @@ namespace System.Collections.Specialized {
        public delegate void NotifyCollectionChangedEventHandler (object sender, NotifyCollectionChangedEventArgs e);
 
 }
+#endif