szogun1987 · szogun1987 · Sep 6, 2016 · Sep 6, 2016 · Nov 9, 2016 · Dec 4, 2016
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -12,4 +12,5 @@
 
 Geert van Horrik <geert@catenalogic.com>
 Daniel Kühner <daniel.kuehner@gmail.com>
+Trezamere <trezamere@outlook.com>
 Wojciech Gomoła <szogun1987@gmail.com>
diff --git a/doc/history.txt b/doc/history.txt
@@ -66,18 +66,21 @@ Added/fixed:
 (*) CTL-905 Always log Argument logging (even when Catel logging is being ignored)
 (*) CTL-911 Refactor UrlHelper to extension methods
 (*) CTL-919 Replace parameters in ServiceLocator.ResolveTypeFromKnownContainer by ServiceInfo
+(*) CTL-921 TypeFactory optimizations for multi-thread usage
 (*) CTL-922 Don't cache RootFrame in NavigationService to allow dynamic navigation frames
 (*) CTL-941 Update to json.net 9.x
+(*) CTL-948  Allow setting the status in IPleaseWaitServiceExtensions.PushInScope
 (*) CTL-988 Allow view models without model injection to stay alive on DataContext changes
 (x) CTL-899 Navigation in WPF is not working when using custom frame
 (x) CTL-906 Clear current navigation context when (re)navigating to the same view in WPF
 (x) CTL-910 Introduce special lock for null keys in CacheStorage to prevent ArgumentNullException
 (x) CTL-925 LanguageBinding markup now uses weak events to allow specific controls (such as the ComboBox with ComboBoxItem 
     elements) to be updated after they have been collapsed
-(x) CTL-991 Equals method in ServiceLocator.ServiceInfo class returns false positives
-(-) CTL-935 Remove InterestedIn attributes because services are a better way to communicate 
-(-) CTL-975 Remove EventHandlerExtensions.SplitInvoke and use regular event invocation
-(-) CTL-987 Delete MVVM logic behaviors (should only be available as logic)
+(x) CTL-991  Equals method in ServiceLocator.ServiceInfo class returns false positives
+(x) CTL-1000 NumericTextBox behavior doesn't allow some values (e.g. 2.05)
+(-) CTL-935  Remove InterestedIn attributes because services are a better way to communicate 
+(-) CTL-975  Remove EventHandlerExtensions.SplitInvoke and use regular event invocation
+(-) CTL-987  Delete MVVM logic behaviors (should only be available as logic)
 (-) Removed test implementations of services
 
 Roadmap:

diff --git a/snippets/C#/model.snippet b/snippets/C#/model.snippet
@@ -23,7 +23,9 @@
 /// $name$ model which fully supports serialization, property changed notifications,
 /// backwards compatibility and error checking.
 /// </summary>
-#if !SILVERLIGHT
+#if NETFX_CORE
+[DataContract]
+#else
 [Serializable]
 #endif
 public class $name$ : ModelBase
@@ -37,7 +39,7 @@ public class $name$ : ModelBase
     /// </summary>
     public $name$() { }
 
-#if !SILVERLIGHT	
+#if !NETFX_CORE
     /// <summary>
     /// Initializes a new object based on <see cref="SerializationInfo"/>.
     /// </summary>

diff --git a/snippets/C#/modelprop.snippet b/snippets/C#/modelprop.snippet
@@ -37,6 +37,11 @@
                 <![CDATA[/// <summary>
 /// $description$.
 /// </summary>
+#if NETFX_CORE
+[DataMember]
+// TODO: use the following line instead of the one above, if you want to ignore the property for (de)serialization
+//[IgnoreDataMember]
+#endif
 public $type$ $name$
 {
 	get { return GetValue<$type$>($name$Property); }

diff --git a/snippets/C#/modelpropchanged.snippet b/snippets/C#/modelpropchanged.snippet
@@ -43,6 +43,11 @@
                 <![CDATA[/// <summary>
 /// $description$.
 /// </summary>
+#if NETFX_CORE
+[DataMember]
+// TODO: use the following line instead of the one above, if you want to ignore the property for (de)serialization
+//[IgnoreDataMember]
+#endif
 public $type$ $name$
 {
 	get { return GetValue<$type$>($name$Property); }

diff --git a/src/Catel.Core/Catel.Core.NET40/Catel.Core.NET40.csproj b/src/Catel.Core/Catel.Core.NET40/Catel.Core.NET40.csproj
@@ -49,6 +49,10 @@
       <HintPath>..\..\..\lib\Catel.Fody.2.14.0\lib\portable-net4+sl4+wp7+win8+wpa81+MonoAndroid14+MonoTouch40\Catel.Fody.Attributes.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MethodTimer, Version=1.16.0.0, Culture=neutral, PublicKeyToken=cb1364609f40a1dc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\lib\MethodTimer.Fody.1.16.0.0\Lib\portable-net4+sl5+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\MethodTimer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\..\..\lib\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>

diff --git a/src/Catel.Core/Catel.Core.NET40/FodyWeavers.xml b/src/Catel.Core/Catel.Core.NET40/FodyWeavers.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true">
-  <ModuleInit/>
-  <Obsolete/>
+  <ModuleInit />
+  <Obsolete />
   <Catel WeaveProperties="false" />
+  <MethodTimer />
 </Weavers>
diff --git a/src/Catel.Core/Catel.Core.NET40/packages.config b/src/Catel.Core/Catel.Core.NET40/packages.config
@@ -3,6 +3,7 @@
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net40-client" developmentDependency="true" />
   <package id="Catel.Fody" version="2.14.0" targetFramework="net40-client" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net40-client" developmentDependency="true" />
+  <package id="MethodTimer.Fody" version="1.16.0.0" targetFramework="net40-client" developmentDependency="true" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net4-client" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net4-client" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net4-client" />

diff --git a/src/Catel.Core/Catel.Core.NET45/Catel.Core.NET45.csproj b/src/Catel.Core/Catel.Core.NET45/Catel.Core.NET45.csproj
@@ -44,6 +44,10 @@
       <HintPath>..\..\..\lib\Catel.Fody.2.14.0\lib\portable-net4+sl4+wp7+win8+wpa81+MonoAndroid14+MonoTouch40\Catel.Fody.Attributes.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MethodTimer, Version=1.16.0.0, Culture=neutral, PublicKeyToken=cb1364609f40a1dc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\lib\MethodTimer.Fody.1.16.0.0\Lib\dotnet\MethodTimer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Obsolete, Version=4.1.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
       <HintPath>..\..\..\lib\Obsolete.Fody.4.1.0\Lib\dotnet\Obsolete.dll</HintPath>
       <Private>False</Private>

diff --git a/src/Catel.Core/Catel.Core.NET45/FodyWeavers.xml b/src/Catel.Core/Catel.Core.NET45/FodyWeavers.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true">
   <Obsolete />
   <ModuleInit />
   <Catel WeaveProperties="false" />
+  <MethodTimer />
 </Weavers>
diff --git a/src/Catel.Core/Catel.Core.NET45/packages.config b/src/Catel.Core/Catel.Core.NET45/packages.config
@@ -3,6 +3,7 @@
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Catel.Fody" version="2.14.0" targetFramework="net45" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
+  <package id="MethodTimer.Fody" version="1.16.0.0" targetFramework="net45" developmentDependency="true" />
   <package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
   <package id="Obsolete.Fody" version="4.1.0" targetFramework="net45" developmentDependency="true" />
   <package id="WpfAnalyzers" version="0.2.4.0-dev" targetFramework="net45" developmentDependency="true" />

diff --git a/src/Catel.Core/Catel.Core.NET46/Catel.Core.NET46.csproj b/src/Catel.Core/Catel.Core.NET46/Catel.Core.NET46.csproj
@@ -42,6 +42,10 @@
       <HintPath>..\..\..\lib\Catel.Fody.2.14.0\lib\portable-net4+sl4+wp7+win8+wpa81+MonoAndroid14+MonoTouch40\Catel.Fody.Attributes.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MethodTimer, Version=1.16.0.0, Culture=neutral, PublicKeyToken=cb1364609f40a1dc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\lib\MethodTimer.Fody.1.16.0.0\Lib\dotnet\MethodTimer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Obsolete, Version=4.1.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
       <HintPath>..\..\..\lib\Obsolete.Fody.4.1.0\Lib\dotnet\Obsolete.dll</HintPath>
       <Private>False</Private>

diff --git a/src/Catel.Core/Catel.Core.NET46/FodyWeavers.xml b/src/Catel.Core/Catel.Core.NET46/FodyWeavers.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true">
   <Obsolete />
   <ModuleInit />
   <Catel WeaveProperties="false" />
+  <MethodTimer />
 </Weavers>
diff --git a/src/Catel.Core/Catel.Core.NET46/packages.config b/src/Catel.Core/Catel.Core.NET46/packages.config
@@ -3,6 +3,7 @@
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net46" developmentDependency="true" />
   <package id="Catel.Fody" version="2.14.0" targetFramework="net46" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net46" developmentDependency="true" />
+  <package id="MethodTimer.Fody" version="1.16.0.0" targetFramework="net46" developmentDependency="true" />
   <package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net46" developmentDependency="true" />
   <package id="Obsolete.Fody" version="4.1.0" targetFramework="net46" developmentDependency="true" />
   <package id="WpfAnalyzers" version="0.2.4.0-dev" targetFramework="net46" developmentDependency="true" />

diff --git a/src/Catel.Core/Catel.Core.PCL/Catel.Core.PCL.csproj b/src/Catel.Core/Catel.Core.PCL/Catel.Core.PCL.csproj
@@ -52,6 +52,10 @@
       <HintPath>..\..\..\lib\Catel.Fody.2.14.0\lib\portable-net4+sl4+wp7+win8+wpa81+MonoAndroid14+MonoTouch40\Catel.Fody.Attributes.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MethodTimer, Version=1.16.0.0, Culture=neutral, PublicKeyToken=cb1364609f40a1dc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\lib\MethodTimer.Fody.1.16.0.0\Lib\portable-net4+sl5+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\MethodTimer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Obsolete, Version=4.1.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
       <HintPath>..\..\..\lib\Obsolete.Fody.4.1.0\Lib\portable-net4+sl5+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\Obsolete.dll</HintPath>
       <Private>False</Private>

diff --git a/src/Catel.Core/Catel.Core.PCL/FodyWeavers.xml b/src/Catel.Core/Catel.Core.PCL/FodyWeavers.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true">
   <Obsolete />
   <ModuleInit />
   <Catel WeaveProperties="false" />
+  <MethodTimer />
 </Weavers>
diff --git a/src/Catel.Core/Catel.Core.PCL/packages.config b/src/Catel.Core/Catel.Core.PCL/packages.config
@@ -3,6 +3,7 @@
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
   <package id="Catel.Fody" version="2.14.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+  <package id="MethodTimer.Fody" version="1.16.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
   <package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
   <package id="Obsolete.Fody" version="4.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
   <package id="WpfAnalyzers" version="0.2.4.0-dev" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />

diff --git a/src/Catel.Core/Catel.Core.Shared/AppDomain.cs b/src/Catel.Core/Catel.Core.Shared/AppDomain.cs
@@ -13,7 +13,8 @@ namespace System
     using Collections.Generic;
     using Reflection;
     using System.Linq;
-
+    using Catel.Reflection;
+    using MethodTimer;
 #if NETFX_CORE
     using global::Windows.ApplicationModel;
     using global::Windows.Storage.Search;
@@ -61,6 +62,7 @@ static AppDomain()
         /// Gets the assemblies in the current application domain.
         /// </summary>
         /// <returns></returns>
+        [Time]
         public Assembly[] GetAssemblies()
         {
             lock (_lock)
@@ -74,7 +76,7 @@ public Assembly[] GetAssemblies()
 
                     // Note: normally it's bad practice to use task.Wait(), but GetAssemblies must be blocking to cache it all
 
-                    var queryOptions = new QueryOptions(CommonFileQuery.OrderByName, new[] { ".dll", ".exe" });
+                    var queryOptions = new QueryOptions(CommonFileQuery.OrderByName, new[] { ".dll", ".exe", ".winmd" });
                     queryOptions.FolderDepth = FolderDepth.Shallow;
 
                     var queryResult = folder.CreateFileQueryWithOptions(queryOptions);
@@ -88,25 +90,15 @@ public Assembly[] GetAssemblies()
 
                     foreach (var file in files)
                     {
-                        try
+                        if (file.Name.StartsWithAnyIgnoreCase(arrayToIgnore))
                         {
-                            if (file.Name.StartsWithAnyIgnoreCase(arrayToIgnore))
-                            {
-                                continue;
-                            }
-
-                            var filename = file.Name.Substring(0, file.Name.Length - file.FileType.Length);
-                            var name = new AssemblyName
-                            {
-                                Name = filename
-                            };
-
-                            var assembly = Assembly.Load(name);
-                            loadedAssemblies.Add(assembly);
+                            continue;
                         }
-                        catch (Exception ex)
+
+                        var assembly = LoadAssemblyFromFile(file);
+                        if (assembly != null)
                         {
-                            Log.Warning(ex, $"Failed to load assembly '{file.Name}'");
+                            loadedAssemblies.Add(assembly);
                         }
                     }
 #else
@@ -122,6 +114,54 @@ public Assembly[] GetAssemblies()
                 return _loadedAssemblies;
             }
         }
+
+#if NETFX_CORE
+        //[Time]
+        private Assembly LoadAssemblyFromFile(global::Windows.Storage.StorageFile file)
+        {
+            try
+            {
+                var assemblyName = file.Name.Substring(0, file.Name.Length - file.FileType.Length);
+                var name = new AssemblyName
+                {
+                    Name = assemblyName
+                };
+
+                Assembly assembly = null;
+
+                //// Step 1: try to fast load if already in memory via Fody type
+                //var expectedTypeName = $"ProcessedByFody, {assemblyName}";
+                //var expectedType = Type.GetType(expectedTypeName);
+                //if (expectedType != null)
+                //{
+                //    assembly = expectedType.GetAssemblyEx();
+                //}
+                //else
+                //{
+                //    // Step 2: try different type
+                //    expectedTypeName = $"<Module>, {assemblyName}";
+                //    expectedType = Type.GetType(expectedTypeName);
+                //    if (expectedType != null)
+                //    {
+                //        assembly = expectedType.GetAssemblyEx();
+                //    }
+                //}
+
+                // Step 3: load the assembly from file (slowest)
+                if (assembly == null)
+                {
+                    assembly = Assembly.Load(name);
+                }
+
+                return assembly;
+            }
+            catch (Exception ex)
+            {
+                Log.Warning(ex, $"Failed to load assembly '{file.Name}'");
+                return null;
+            }
+        }
+#endif
         #endregion
     }
 }

diff --git a/src/Catel.Core/Catel.Core.Shared/Catel.Core.Shared.projitems b/src/Catel.Core/Catel.Core.Shared/Catel.Core.Shared.projitems
@@ -189,7 +189,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\TagHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\UniqueIdentifierHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interfaces\IDisposableToken.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interfaces\ILockable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interfaces\IUniqueIdentifyable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IoC\Attributes\InjectAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IoC\Attributes\InjectionConstructorAttribute.cs" />
@@ -294,6 +293,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Pooling\PoolManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)..\..\SolutionAssemblyInfo.cs" />
+	<Compile Include="$(MSBuildThisFileDirectory)..\..\MethodTimeLogger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Reflection\BindingFlags.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Reflection\CachedPropertyInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Reflection\EventArgs\AssemblyLoadedEventArgs.cs" />

diff --git a/src/Catel.Core/Catel.Core.Shared/Helpers/HttpContextHelper.cs b/src/Catel.Core/Catel.Core.Shared/Helpers/HttpContextHelper.cs
@@ -23,7 +23,7 @@ public static bool HasHttpContext()
 
         public static object GetHttpContext()
         {
-            var httpContextType = TypeCache.GetTypeWithoutAssembly("System.Web.HttpContext");
+            var httpContextType = TypeCache.GetTypeWithoutAssembly("System.Web.HttpContext", allowInitialization: false);
             if (httpContextType != null)
             {
                 var currentPropertyInfo = httpContextType.GetProperty("Current", BindingFlags.Public | BindingFlags.Static);

diff --git a/src/Catel.Core/Catel.Core.Shared/Interfaces/ILockable.cs b/src/Catel.Core/Catel.Core.Shared/Interfaces/ILockable.cs
diff --git a/src/Catel.Core/Catel.Core.Shared/IoC/Configuration/Registration.cs b/src/Catel.Core/Catel.Core.Shared/IoC/Configuration/Registration.cs
@@ -100,15 +100,15 @@ public string Tag
         /// </summary>
         public Type InterfaceType
         {
-            get { return TypeCache.GetType(InterfaceTypeName); }
+            get { return TypeCache.GetType(InterfaceTypeName, allowInitialization: false); }
         }
 
         /// <summary>
         /// Gets the implementation type.
         /// </summary>
         public Type ImplementationType
         {
-            get { return TypeCache.GetType(ImplementationTypeName); }
+            get { return TypeCache.GetType(ImplementationTypeName, allowInitialization: false); }
         }
         #endregion
     }