Removed all SL4 & WP7 defines (code cleanup)

Author: GeertvanHorrik

src/Catel.Core/Catel.Core.NET40/Data/ModelBase.cs

@@ -106,15 +106,13 @@ public abstract partial class ModelBase : ObservableObject, IModel
 #endif
         internal readonly PropertyBag _propertyBag = new PropertyBag();
 
-#if !WP7
         /// <summary>
         /// The change notification wrappers for all property values.
         /// </summary>
 #if NET
         [field: NonSerialized]
 #endif
         private readonly Dictionary<string, ChangeNotificationWrapper> _propertyValueChangeNotificationWrappers = new Dictionary<string, ChangeNotificationWrapper>();
-#endif
 
         /// <summary>
         /// Lock object for the <see cref="_propertyBag"/> field.
@@ -796,7 +794,6 @@ private void HandleObjectEventsSubscription(string propertyName, object property
                 return;
             }
 
-#if !WP7
             lock (_propertyValuesLock)
             {
                 if (_propertyValueChangeNotificationWrappers.ContainsKey(propertyName))
@@ -824,10 +821,8 @@ private void HandleObjectEventsSubscription(string propertyName, object property
                     _propertyValueChangeNotificationWrappers[propertyName] = wrapper;
                 }
             }
-#endif
         }
 
-#if !WP7
         /// <summary>
         /// Called when a property that implements <see cref="INotifyPropertyChanged"/> raises the event.
         /// </summary>
@@ -869,8 +864,6 @@ protected virtual void OnPropertyObjectCollectionItemPropertyChanged(object send
 
             SetDirtyAndAutomaticallyValidate(string.Empty, true);
         }
-
-#endif
         #endregion
 
         #region INotifyPropertyChanged Members

src/Catel.Core/Catel.Core.NET40/Messaging/Helpers/MessageMediatorHelper.cs

@@ -28,7 +28,7 @@ public static class MessageMediatorHelper
         /// <param name="messageMediator">The message mediator. If <c>null</c>, the default will be used.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="instance"/> is <c>null</c>.</exception>
         /// <exception cref="NotSupportedException">The object has non-public methods decorated with the <see cref="MessageRecipientAttribute"/>, but the
-        /// application is not written in .NET (but in SL, WP7 or WinRT).</exception>
+        /// application is not written in .NET (but in Silverlight, Windows Phone or WinRT).</exception>
         /// <exception cref="InvalidCastException">One of the methods cannot be casted to a valid message method.</exception>
         public static void SubscribeRecipient(object instance, IMessageMediator messageMediator = null)
         {

src/Catel.Core/Catel.Core.NET40/Reflection/Extensions/AssemblyExtensions.cs

@@ -30,7 +30,7 @@ public static string Title(this Assembly assembly)
 #if NET
             return System.IO.Path.GetFileNameWithoutExtension(assembly.CodeBase);
 #else
-            throw new NotSupportedException("Only supported in .NET, not in SL, WP7 or WinRT");
+            throw new NotSupportedInPlatform();
 #endif
         }
 

src/Catel.Core/Catel.Core.NET40/Reflection/Extensions/ReflectionExtensions.type.cs

@@ -1015,7 +1015,7 @@ public static MethodInfo[] GetMethodsEx(this Type type, BindingFlags bindingFlag
 #endif
         }
 
-#if NET40 || SILVERLIGHT || WP7 || PCL
+#if NET40 || SILVERLIGHT || PCL
 
         /// <summary>
         /// The type infos cache.

src/Catel.Core/Catel.Core.NET40/Reflection/Helpers/AssemblyHelper.cs

@@ -18,7 +18,7 @@ namespace Catel.Reflection
     using System.Windows;
 #endif
 
-#if SL4 || SL5
+#if SL5
     using System.Windows.Resources;
     using System.Xml.Linq;
     using Threading;
@@ -43,22 +43,7 @@ public static class AssemblyHelper
 
         private static readonly Dictionary<string, string> _assemblyMappings = new Dictionary<string, string>();
 
-#if SL4
-        private static readonly List<Assembly> _frameworkAssemblies = new List<Assembly>(); 
-#endif
-
-        /// <summary>
-        /// Initializes static members of the <see cref="AssemblyHelper"/> class.
-        /// </summary>
-        static AssemblyHelper()
-        {
-#if SL4
-            _frameworkAssemblies.Add(Assembly.Load("mscorlib"));
-            _frameworkAssemblies.Add(typeof(Uri).Assembly); // system
-#endif
-        }
-
-#if SL4 || SL5
+#if SL5
         private static readonly List<Assembly> _externalAssemblies = new List<Assembly>();
 
         /// <summary>
@@ -255,11 +240,7 @@ public static List<Assembly> GetLoadedAssemblies(this AppDomain appDomain)
         {
             var assemblies = new List<Assembly>();
 
-#if SL4
-            assemblies.AddRange(_frameworkAssemblies);
-#else
             assemblies.AddRange(appDomain.GetAssemblies());
-#endif
 
 #if SILVERLIGHT
             try
@@ -271,7 +252,7 @@ public static List<Assembly> GetLoadedAssemblies(this AppDomain appDomain)
 #if WINDOWS_PHONE
                         try
                         {
-                            // It's not much, but it's the best we could do for WP7
+                            // It's not much, but it's the best we could do for Windows Phone
                             assemblies.Add(Assembly.Load(assemblyPart.Source.Replace(".dll", string.Empty)));
                         }
                         catch (Exception)
@@ -294,7 +275,7 @@ public static List<Assembly> GetLoadedAssemblies(this AppDomain appDomain)
                 Log.Error(ex, "Failed to load Deployment.Current.Parts");
             }
 
-#if SL4 || SL5
+#if SL5
             // Add the loaded xap cache
             assemblies.AddRange(_externalAssemblies);
 #endif

src/Catel.Core/Catel.Core.NET40/SupportedPlatforms.cs

@@ -38,14 +38,14 @@ private static SupportedPlatforms DeterminePlatform()
             return SupportedPlatforms.NET45;
 #elif NET50
             return SupportedPlatforms.NET50;
-#elif SL4
-            throw new System.NotSupportedException("SL4 is not supported");
 #elif SL5
             return SupportedPlatforms.Silverlight5;
-#elif WP7
-            throw new System.NotSupportedException("WP7 is not supported");
 #elif WP80
             return SupportedPlatforms.WindowsPhone80;
+#elif WP81 && SILVERLIGHT
+            return SupportedPlatforms.WindowsPhone81Silverlight;
+#elif WP81 && NETFX_CORE
+            return SupportedPlatforms.WindowsPhone81Runtime;
 #elif WIN80
             return SupportedPlatforms.Windows80;
 #elif WIN81
@@ -90,6 +90,16 @@ public enum SupportedPlatforms
         /// </summary>
         WindowsPhone80,
 
+        /// <summary>
+        /// Windows Phone 8.1 (Silverlight).
+        /// </summary>
+        WindowsPhone81Silverlight,
+
+        /// <summary>
+        /// Windows Phone 8.1 (Runtime).
+        /// </summary>
+        WindowsPhone81Runtime,
+
         /// <summary>
         /// Windows Runtime 8.0.
         /// </summary>
@@ -100,11 +110,6 @@ public enum SupportedPlatforms
         /// </summary>
         Windows81,
 
-        /// <summary>
-        /// The portable class libraries (PCL).
-        /// </summary>
-        PCL,
-
         /// <summary>
         /// The Android platform.
         /// </summary>

src/Catel.MVVM/Catel.MVVM.NET40/CatelEnvironment.cs

@@ -99,7 +99,7 @@ public static void RegisterDefaultViewModelServices()
 #if !WINDOWS_PHONE && !PCL && !XAMARIN
         /// <summary>
         /// Gets the main window of the application. This is a convenience call to easily allow the retrieval of the main window
-        /// for each target framework (WPF, SL, WP7).
+        /// for each target framework (WPF, Silverlight, Windows Phone, etc).
         /// </summary>
         public static Window MainWindow
         {

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Commands/AsynchronousCommand.cs

@@ -173,7 +173,7 @@ protected override void Execute(TExecuteParameter parameter, bool ignoreCanExecu
 
             RaiseCanExecuteChanged();
 
-            // Run the action on a new thread from the thread pool (this will therefore work in SL and WP7 as well)
+            // Run the action on a new thread from the thread pool (this will therefore work in Silverlight and Windows Phone as well)
 #if NETFX_CORE
             ThreadPool.RunAsync(state =>
 #else

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Commands/EventArgs/CommandProgressChangedEventArgs.cs

@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-#if !NET40 && !SILVERLIGHT && !WP7
+#if !NET40 && !SILVERLIGHT
 
 namespace Catel.MVVM
 {

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Commands/Interfaces/ICatelTaskCommand.cs

@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-#if !NET40 && !SILVERLIGHT && !WP7
+#if !NET40 && !SILVERLIGHT
 
 namespace Catel.MVVM
 {

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Commands/Interfaces/ITaskProgressReport.cs

@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-#if !NET40 && !SILVERLIGHT && !WP7
+#if !NET40 && !SILVERLIGHT
 
 namespace Catel.MVVM
 {

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Commands/TaskCommand.cs

@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-#if !NET40 && !SILVERLIGHT && !WP7
+#if !NET40 && !SILVERLIGHT
 
 namespace Catel.MVVM
 {

src/Catel.MVVM/Catel.MVVM.NET40/MVVM/Providers/UserControlLogic.cs

@@ -45,7 +45,7 @@ public class UserControlLogic : LogicBase
         private IViewModelContainer _parentViewModelContainer;
         private IViewModel _parentViewModel;
 
-#if NET || SL4 || SL5
+#if NET ||SL5
         private InfoBarMessageControl _infoBarMessageControl;
 #endif
         #endregion
@@ -860,7 +860,7 @@ private void ClearWarningsAndErrorsForObject(object obj)
                 return;
             }
 
-#if NET || SL4 || SL5
+#if NET || SL5
             if (_infoBarMessageControl != null)
             {
                 _infoBarMessageControl.ClearObjectMessages(obj);

src/Catel.MVVM/Catel.MVVM.NET40/Properties/Exceptions.SL5.Designer.cs

@@ -91,7 +91,7 @@ private NavigationWindow RootFrame
         #region Methods
         partial void Initialize()
         {
-#if NET || SL4 || SL5
+#if NET || SL5
             var mainWindow = CatelEnvironment.MainWindow;
             if (mainWindow != null)
             {

src/Catel.MVVM/Catel.MVVM.NET40/Services/NavigationService.xaml.cs

@@ -50,7 +50,7 @@ public string[] Arguments
         }
 #endif
 
-#if SL4 || SL5
+#if SL5
         /// <summary>
         /// Gets the silverlight application initialization parameters.
         /// </summary>

src/Catel.MVVM/Catel.MVVM.NET40/Services/StartUpInfoProvider.cs

@@ -297,7 +297,7 @@ public static bool DefaultTransferStylesAndTransitionsToViewModelGridValue
             set { UserControlLogic.DefaultTransferStylesAndTransitionsToViewModelGridValue = value; }
         }
 
-#if NET || SL4 || SL5
+#if NET || SL5
         /// <summary>
         /// Gets or sets a value indicating whether to skip the search for an info bar message control. If not skipped,
         /// the user control will search for a the first <see cref="InfoBarMessageControl"/> that can be found. 

src/Catel.MVVM/Catel.MVVM.NET40/Windows/Controls/UserControl.cs

@@ -40,7 +40,7 @@ public static class DependencyPropertyHelper
 
         /// <summary>
         /// Cache containing the names of all found dependency properties, required because it is not possible to get the name of a 
-        /// dependency property in Silverlight and WP7.
+        /// dependency property in Silverlight and Windows Phone.
         /// </summary>
         private static readonly Dictionary<DependencyProperty, string> _cacheByDependencyProperty = new Dictionary<DependencyProperty, string>();
 

src/Catel.MVVM/Catel.MVVM.NET40/Windows/Data/Helpers/DependencyPropertyHelper.cs

@@ -340,7 +340,7 @@ private void OnTimerTick(object sender, TimerTickEventArgs e)
         /// </summary>
         private bool SetFocus()
         {
-#if SL4 || SL5
+#if SL5
             System.Windows.Browser.HtmlPage.Plugin.Focus();
 #endif
 

src/Catel.MVVM/Catel.MVVM.NET40/Windows/Interactivity/Focus.cs

@@ -98,7 +98,7 @@ private static object ExitFrame(object state)
 #endif
 
         /// <summary>
-        /// Gets the current dispatcher. This property is compatible with WPF, SL and WP7, and also works
+        /// Gets the current dispatcher. This property is compatible with WPF, Silverlight, Windows Phone, etc, and also works
         /// when there is no application object (for example, during unit tests).
         /// </summary>
         /// <value>The current dispatcher.</value>

src/Catel.MVVM/Catel.MVVM.NET40/Windows/Threading/Helpers/Dispatcherhelper.cs

@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-#if !NET40 && !SILVERLIGHT && !WP7
+#if !NET40 && !SILVERLIGHT
 
 namespace Catel.MVVM
 {

src/Catel.MVVM/Catel.MVVM.NET45/MVVM/Commands/EventArgs/CommandProgressChangedEventArgs.cs

@@ -444,7 +444,7 @@ public void NotifyPropertyChangingPreventsSetValue()
         #endregion
 
         #region Attribute validation
-#if NET || SL4 || SL5
+#if NET || SL5
         [TestMethod]
         public void AttributeValidation_DoNotValidate()
         {

src/Catel.Test/Catel.Test.NET40/Data/ModelBaseTest.cs

@@ -40,20 +40,14 @@
 
 #if DEBUG
 
-#if NET35
-[assembly: AssemblyConfiguration("NET35, Debug")]
-#elif NET40
+#if NET40
 [assembly: AssemblyConfiguration("NET40, Debug")]
 #elif NET45
 [assembly: AssemblyConfiguration("NET45, Debug")]
 #elif NET50
 [assembly: AssemblyConfiguration("NET50, Debug")]
-#elif SL4
-[assembly: AssemblyConfiguration("Silverlight 4, Debug")]
 #elif SL5
 [assembly: AssemblyConfiguration("Silverlight 5, Debug")]
-#elif WP7
-[assembly: AssemblyConfiguration("Windows Phone 7.x, Debug")]
 #elif WP80
 [assembly: AssemblyConfiguration("Windows Phone 8.0, Debug")]
 #elif WPSL81
@@ -76,20 +70,14 @@
 
 #else
 
-#if NET35
-[assembly: AssemblyConfiguration("NET35, Release")]
-#elif NET40
+#if NET40
 [assembly: AssemblyConfiguration("NET40, Release")]
 #elif NET45
 [assembly: AssemblyConfiguration("NET45, Release")]
 #elif NET50
 [assembly: AssemblyConfiguration("NET50, Release")]
-#elif SL4
-[assembly: AssemblyConfiguration("Silverlight 4, Release")]
 #elif SL5
 [assembly: AssemblyConfiguration("Silverlight 5, Release")]
-#elif WP7
-[assembly: AssemblyConfiguration("Windows Phone 7.x, Release")]
 #elif WP80
 [assembly: AssemblyConfiguration("Windows Phone 8.0, Release")]
 #elif WPSL81