diff options
author | Geoff Norton <grompf@sublimeintervention.com> | 2011-03-21 04:53:16 +0300 |
---|---|---|
committer | Geoff Norton <grompf@sublimeintervention.com> | 2011-03-21 04:53:26 +0300 |
commit | 1e38c9d065e4fecad427f5bd0b534f51de0c09ea (patch) | |
tree | d4c0e6fcea4e59abbb656eec289498c7bf83225b | |
parent | 30719eac23b6b2dc2b5f49e9304de202f40e859d (diff) |
Add some missing types to the mobile profile
12 files changed, 55 insertions, 37 deletions
diff --git a/mcs/class/System/System.Collections.ObjectModel/ObservableCollection.cs b/mcs/class/System/System.Collections.ObjectModel/ObservableCollection.cs index d13930dadcc..4acbbeae25a 100644 --- a/mcs/class/System/System.Collections.ObjectModel/ObservableCollection.cs +++ b/mcs/class/System/System.Collections.ObjectModel/ObservableCollection.cs @@ -23,7 +23,7 @@ // Chris Toshok (toshok@novell.com) // Brian O'Keefe (zer0keefie@gmail.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; @@ -32,7 +32,9 @@ using System.Runtime.CompilerServices; namespace System.Collections.ObjectModel { [Serializable] +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public class ObservableCollection<T> : Collection<T>, INotifyCollectionChanged, INotifyPropertyChanged { private class Reentrant : IDisposable { @@ -183,4 +185,4 @@ namespace System.Collections.ObjectModel } } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs b/mcs/class/System/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs index bcbc52df931..815e40fd524 100644 --- a/mcs/class/System/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs +++ b/mcs/class/System/System.Collections.ObjectModel/ReadOnlyObservableCollection.cs @@ -23,14 +23,16 @@ // Chris Toshok (toshok@novell.com) // Brian O'Keefe (zer0keefie@gmail.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Collections.Specialized; using System.ComponentModel; using System.Runtime.CompilerServices; namespace System.Collections.ObjectModel { +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public class ReadOnlyObservableCollection<T> : ReadOnlyCollection<T>, INotifyCollectionChanged, INotifyPropertyChanged { public ReadOnlyObservableCollection(ObservableCollection<T> list) @@ -82,4 +84,4 @@ namespace System.Collections.ObjectModel } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.Specialized/INotifyCollectionChanged.cs b/mcs/class/System/System.Collections.Specialized/INotifyCollectionChanged.cs index a94b267a46e..f73384ce945 100644 --- a/mcs/class/System/System.Collections.Specialized/INotifyCollectionChanged.cs +++ b/mcs/class/System/System.Collections.Specialized/INotifyCollectionChanged.cs @@ -23,16 +23,18 @@ // Chris Toshok (toshok@ximian.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Runtime.CompilerServices; namespace System.Collections.Specialized { +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public interface INotifyCollectionChanged { event NotifyCollectionChangedEventHandler CollectionChanged; } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedAction.cs b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedAction.cs index 2c924640307..d10d8b5fbfb 100644 --- a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedAction.cs +++ b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedAction.cs @@ -22,12 +22,14 @@ // Authors: // Chris Toshok (toshok@ximian.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Runtime.CompilerServices; namespace System.Collections.Specialized { +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public enum NotifyCollectionChangedAction { Add, @@ -38,4 +40,4 @@ namespace System.Collections.Specialized } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs index e3ff98d77a0..dcc3177d600 100644 --- a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs +++ b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs @@ -23,12 +23,14 @@ // Chris Toshok (toshok@ximian.com) // Brian O'Keefe (zer0keefie@gmail.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Runtime.CompilerServices; namespace System.Collections.Specialized { +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public class NotifyCollectionChangedEventArgs : EventArgs { private NotifyCollectionChangedAction action; @@ -214,4 +216,4 @@ namespace System.Collections.Specialized #endregion } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs index 5192c8ab2bb..5d49e502fd1 100644 --- a/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs +++ b/mcs/class/System/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs @@ -22,13 +22,15 @@ // Authors: // Chris Toshok (toshok@ximian.com) // -#if NET_4_0 +#if NET_4_0 || MOBILE using System.Runtime.CompilerServices; namespace System.Collections.Specialized { +#if !MOBILE [TypeForwardedFrom (Consts.WindowsBase_3_0)] +#endif public delegate void NotifyCollectionChangedEventHandler (object sender, NotifyCollectionChangedEventArgs e); } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources index cf090608cfb..ac12bc5ee18 100644 --- a/mcs/class/System/mobile_System.dll.sources +++ b/mcs/class/System/mobile_System.dll.sources @@ -14,6 +14,8 @@ System.Collections.Generic/RBTree.cs System.Collections.Generic/SortedDictionary.cs System.Collections.Generic/SortedList.cs System.Collections.Generic/Stack.cs +System.Collections.ObjectModel/ObservableCollection.cs +System.Collections.ObjectModel/ReadOnlyObservableCollection.cs System.Collections.Specialized/BitVector32.cs System.Collections.Specialized/CollectionsUtil.cs System.Collections.Specialized/HybridDictionary.cs @@ -24,6 +26,10 @@ System.Collections.Specialized/ProcessStringDictionary.cs System.Collections.Specialized/StringCollection.cs System.Collections.Specialized/StringDictionary.cs System.Collections.Specialized/StringEnumerator.cs +System.Collections.Specialized/INotifyCollectionChanged.cs +System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs +System.Collections.Specialized/NotifyCollectionChangedAction.cs +System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs System.ComponentModel.Design.Serialization/InstanceDescriptor.cs System.ComponentModel.Design/CommandID.cs System.ComponentModel.Design/ComponentChangedEventArgs.cs diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs index 95728851d58..deb570d6b5d 100644 --- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs +++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs @@ -82,7 +82,7 @@ namespace System.IO.IsolatedStorage { } [CLSCompliant (false)] -#if NET_4_0 +#if NET_4_0 || MOBILE [Obsolete] #endif public virtual ulong CurrentSize { @@ -105,7 +105,7 @@ namespace System.IO.IsolatedStorage { } [CLSCompliant (false)] -#if NET_4_0 +#if NET_4_0 || MOBILE [Obsolete] #endif public virtual ulong MaximumSize { @@ -119,7 +119,7 @@ namespace System.IO.IsolatedStorage { get { return storage_scope; } } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public virtual long AvailableFreeSpace { get { @@ -183,7 +183,7 @@ namespace System.IO.IsolatedStorage { } public abstract void Remove (); -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public virtual bool IncreaseQuotaTo (long newQuotaSize) { diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs index cb527254f34..bfc4627446c 100644 --- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs +++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs @@ -56,7 +56,7 @@ namespace System.IO.IsolatedStorage { private ulong _maxSize; private Evidence _fullEvidences; private static Mutex mutex = new Mutex (); -#if NET_4_0 +#if NET_4_0 || MOBILE private bool closed; private bool disposed; #endif @@ -257,7 +257,7 @@ namespace System.IO.IsolatedStorage { return storageFile; } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public static IsolatedStorageFile GetUserStoreForSite () { @@ -415,7 +415,7 @@ namespace System.IO.IsolatedStorage { } [CLSCompliant(false)] -#if NET_4_0 +#if NET_4_0 || MOBILE [Obsolete] #endif public override ulong CurrentSize { @@ -423,7 +423,7 @@ namespace System.IO.IsolatedStorage { } [CLSCompliant(false)] -#if NET_4_0 +#if NET_4_0 || MOBILE [Obsolete] #endif public override ulong MaximumSize { @@ -473,7 +473,7 @@ namespace System.IO.IsolatedStorage { get { return directory.FullName; } } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public override long AvailableFreeSpace { get { @@ -529,7 +529,7 @@ namespace System.IO.IsolatedStorage { public void Close () { -#if NET_4_0 +#if NET_4_0 || MOBILE closed = true; #endif } @@ -541,7 +541,7 @@ namespace System.IO.IsolatedStorage { if (dir.IndexOfAny (Path.PathSeparatorChars) < 0) { if (directory.GetFiles (dir).Length > 0) -#if NET_4_0 +#if NET_4_0 || MOBILE throw new IsolatedStorageException ("Unable to create directory."); #else throw new IOException (Locale.GetText ("Directory name already exists as a file.")); @@ -553,7 +553,7 @@ namespace System.IO.IsolatedStorage { for (int i = 0; i < dirs.Length; i++) { if (dinfo.GetFiles (dirs [i]).Length > 0) -#if NET_4_0 +#if NET_4_0 || MOBILE throw new IsolatedStorageException ("Unable to create directory."); #else throw new IOException (Locale.GetText ( @@ -564,7 +564,7 @@ namespace System.IO.IsolatedStorage { } } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public void CopyFile (string sourceFileName, string destinationFileName) { @@ -643,7 +643,7 @@ namespace System.IO.IsolatedStorage { public void Dispose () { -#if NET_4_0 +#if NET_4_0 || MOBILE // Dispose may be calling Close, but we are not sure disposed = true; #endif @@ -651,7 +651,7 @@ namespace System.IO.IsolatedStorage { GC.SuppressFinalize (this); } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public bool DirectoryExists (string path) { @@ -738,7 +738,7 @@ namespace System.IO.IsolatedStorage { { if (searchPattern == null) throw new ArgumentNullException ("searchPattern"); -#if NET_4_0 +#if NET_4_0 || MOBILE if (searchPattern.Contains ("..")) throw new ArgumentException ("Search pattern cannot contain '..' to move up directories.", "searchPattern"); #endif @@ -765,7 +765,7 @@ namespace System.IO.IsolatedStorage { return GetNames (adi); } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public string [] GetDirectoryNames () { @@ -785,7 +785,7 @@ namespace System.IO.IsolatedStorage { { if (searchPattern == null) throw new ArgumentNullException ("searchPattern"); -#if NET_4_0 +#if NET_4_0 || MOBILE if (searchPattern.Contains ("..")) throw new ArgumentException ("Search pattern cannot contain '..' to move up directories.", "searchPattern"); #endif @@ -812,7 +812,7 @@ namespace System.IO.IsolatedStorage { return GetNames (afi); } -#if NET_4_0 +#if NET_4_0 || MOBILE [ComVisible (false)] public string [] GetFileNames () { @@ -915,7 +915,7 @@ namespace System.IO.IsolatedStorage { public override void Remove () { -#if NET_4_0 +#if NET_4_0 || MOBILE CheckOpen (false); #endif try { @@ -937,7 +937,7 @@ namespace System.IO.IsolatedStorage { } // internal stuff -#if NET_4_0 +#if NET_4_0 || MOBILE void CheckOpen () { CheckOpen (true); diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs index 1ce8017cfbc..fa08ca3482e 100644 --- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs +++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs @@ -62,7 +62,7 @@ namespace System.IO.IsolatedStorage { IsolatedStorageFile.GetAssemblyIdentityFromEvidence (sf.GetMethod ().ReflectedType.Assembly.UnprotectedGetEvidence ())); } -#if NET_4_0 +#if NET_4_0 || MOBILE if (isf.IsDisposed) throw new ObjectDisposedException ("IsolatedStorageFile"); if (isf.IsClosed) @@ -210,7 +210,7 @@ namespace System.IO.IsolatedStorage { base.Flush (); } -#if NET_4_0 +#if NET_4_0 || MOBILE public override void Flush (bool flushToDisk) { base.Flush (flushToDisk); diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityOptions.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityOptions.cs index 0d3b391fbc6..222642ae515 100644 --- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityOptions.cs +++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityOptions.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_4_0 +#if NET_4_0 || MOBILE namespace System.IO.IsolatedStorage { public enum IsolatedStorageSecurityOptions diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityState.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityState.cs index 285b70e331e..2e410057f56 100644 --- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityState.cs +++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageSecurityState.cs @@ -28,7 +28,7 @@ using System.Security; -#if NET_4_0 +#if NET_4_0 || MOBILE namespace System.IO.IsolatedStorage { |