From 74bf351727a99604e5736f3ab5ab974460ff01fc Mon Sep 17 00:00:00 2001 From: Markus Ewald Date: Fri, 26 Jun 2009 20:17:59 +0000 Subject: [PATCH] Changed all remaining COMPACTFRAMEWORK constants around serialization code to NO_SERIALIZATION git-svn-id: file:///srv/devel/repo-conversion/nusu@157 d2e56fa2-650e-0410-a79f-9358c0239efd --- Source/Collections/ObservableDictionary.cs | 16 +++++++++------- Source/Collections/ReadOnlyDictionary.cs | 10 +++++----- Source/Plugins/PluginRepository.cs | 4 ++-- Source/Scheduling/WindowsTimeSource.cs | 4 ++++ Source/Tracking/Transaction.cs | 4 ++-- Source/WeakReference.cs | 4 ++-- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Source/Collections/ObservableDictionary.cs b/Source/Collections/ObservableDictionary.cs index 402bd76..f6e96a6 100644 --- a/Source/Collections/ObservableDictionary.cs +++ b/Source/Collections/ObservableDictionary.cs @@ -31,15 +31,15 @@ namespace Nuclex.Support.Collections { /// Type of the values used in the dictionary [Serializable] public class ObservableDictionary : -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION ISerializable, IDeserializationCallback, #endif - IDictionary, + IDictionary, IDictionary, IObservableCollection> { -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION #region class SerializedDictionary /// @@ -87,7 +87,8 @@ namespace Nuclex.Support.Collections { this.objectDictionary = (this.typedDictionary as IDictionary); } -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION + /// /// Initializes a new instance of the System.WeakReference class, using deserialized /// data from the specified serialization and stream objects. @@ -105,7 +106,8 @@ namespace Nuclex.Support.Collections { /// protected ObservableDictionary(SerializationInfo info, StreamingContext context) : this(new SerializedDictionary(info, context)) { } -#endif // !COMPACTFRAMEWORK + +#endif // !NO_SERIALIZATION /// Whether the directory is write-protected public bool IsReadOnly { @@ -374,7 +376,7 @@ namespace Nuclex.Support.Collections { #endregion -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION #region ISerializable implementation /// Serializes the Dictionary @@ -395,7 +397,7 @@ namespace Nuclex.Support.Collections { } #endregion -#endif //!COMPACTFRAMEWORK +#endif //!NO_SERIALIZATION /// The wrapped Dictionary under its type-safe interface private IDictionary typedDictionary; diff --git a/Source/Collections/ReadOnlyDictionary.cs b/Source/Collections/ReadOnlyDictionary.cs index c3c5421..f9ce5c2 100644 --- a/Source/Collections/ReadOnlyDictionary.cs +++ b/Source/Collections/ReadOnlyDictionary.cs @@ -31,14 +31,14 @@ namespace Nuclex.Support.Collections { /// Type of the values used in the dictionary [Serializable] public class ReadOnlyDictionary : -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION ISerializable, IDeserializationCallback, #endif IDictionary, IDictionary { -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION #region class SerializedDictionary @@ -87,7 +87,7 @@ namespace Nuclex.Support.Collections { protected ReadOnlyDictionary(SerializationInfo info, StreamingContext context) : this(new SerializedDictionary(info, context)) { } -#endif // !COMPACTFRAMEWORK +#endif // !NO_SERIALIZATION /// Initializes a new read-only dictionary wrapper /// Dictionary that will be wrapped @@ -367,7 +367,7 @@ namespace Nuclex.Support.Collections { #endregion -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION #region ISerializable implementation /// Serializes the Dictionary @@ -388,7 +388,7 @@ namespace Nuclex.Support.Collections { } #endregion -#endif //!COMPACTFRAMEWORK +#endif //!NO_SERIALIZATION /// The wrapped Dictionary under its type-safe interface private IDictionary typedDictionary; diff --git a/Source/Plugins/PluginRepository.cs b/Source/Plugins/PluginRepository.cs index b3a4568..9547f1b 100644 --- a/Source/Plugins/PluginRepository.cs +++ b/Source/Plugins/PluginRepository.cs @@ -66,7 +66,7 @@ namespace Nuclex.Support.Plugins { loadedAssembly = LoadAssemblyFromFile(path); return true; } -#if !COMPACTFRAMEWORK +#if !XBOX360 // File not found - Most likely a missing dependency of the assembly we // attempted to load since the assembly itself has been found by the GetFiles() method catch(DllNotFoundException) { @@ -74,7 +74,7 @@ namespace Nuclex.Support.Plugins { "Assembly '" + path + "' or one of its dependencies is missing" ); } -#endif // !COMPACTFRAMEWORK +#endif // !XBOX360 // Unauthorized acccess - Either the assembly is not trusted because it contains // code that imposes a security risk on the system or a user rights problem catch(UnauthorizedAccessException) { diff --git a/Source/Scheduling/WindowsTimeSource.cs b/Source/Scheduling/WindowsTimeSource.cs index cb6f362..1055052 100644 --- a/Source/Scheduling/WindowsTimeSource.cs +++ b/Source/Scheduling/WindowsTimeSource.cs @@ -75,9 +75,13 @@ namespace Nuclex.Support.Scheduling { get { return Environment.OSVersion.Platform == PlatformID.Win32NT; } } +#if !XBOX360 + /// Delegate for the timeChanged() callback method private EventHandler onDateTimeAdjustedDelegate; +#endif // !XBOX360 + } } // namespace Nuclex.Support.Scheduling diff --git a/Source/Tracking/Transaction.cs b/Source/Tracking/Transaction.cs index 3a4a1f3..09ecfaf 100644 --- a/Source/Tracking/Transaction.cs +++ b/Source/Tracking/Transaction.cs @@ -133,7 +133,7 @@ namespace Nuclex.Support.Tracking { } } -#if !COMPACTFRAMEWORK +#if !XBOX360 /// Waits until the background process finishes or a timeout occurs /// @@ -150,7 +150,7 @@ namespace Nuclex.Support.Tracking { return WaitHandle.WaitOne(timeout, false); } -#endif // !COMPACTFRAMEWORK +#endif // !XBOX360 /// Waits until the background process finishes or a timeout occurs /// diff --git a/Source/WeakReference.cs b/Source/WeakReference.cs index 095095c..6bc3440 100644 --- a/Source/WeakReference.cs +++ b/Source/WeakReference.cs @@ -52,7 +52,7 @@ namespace Nuclex.Support { public WeakReference(ReferencedType target, bool trackResurrection) : base(target, trackResurrection) { } -#if !COMPACTFRAMEWORK +#if !NO_SERIALIZATION /// /// Initializes a new instance of the WeakReference class, using deserialized @@ -72,7 +72,7 @@ namespace Nuclex.Support { protected WeakReference(SerializationInfo info, StreamingContext context) : base(info, context) { } -#endif // !COMPACTFRAMEWORK +#endif // !NO_SERIALIZATION /// /// Gets or sets the object (the target) referenced by the current WeakReference