Merge from 'develop' branch

valdisiljuconoks · Mar 4, 2016 · 55a81d8 · 55a81d8
2 parents 8befb0b + 24d25ee
commit 55a81d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/DbLocalizationProvider/DataAnnotations/CachedLocalizedMetadataProvider.cs b/DbLocalizationProvider/DataAnnotations/CachedLocalizedMetadataProvider.cs
@@ -21,6 +21,9 @@ protected override CachedDataAnnotationsModelMetadata CreateMetadataFromPrototyp
                 metadataFromPrototype.AdditionalValues.Add(keyValuePair.Key, keyValuePair.Value);
             }
 
+            // we need to preserve DisplayName fetched during prototype creation
+            metadataFromPrototype.DisplayName = prototype.DisplayName;
+
             return metadataFromPrototype;
         }
 

diff --git a/DbLocalizationProvider/Properties/AssemblyInfo.cs b/DbLocalizationProvider/Properties/AssemblyInfo.cs
@@ -5,9 +5,9 @@
 [assembly: AssemblyTitle("DbLocalizationProvider")]
 [assembly: AssemblyDescription("Database driven localization provider for EPiServer")]
 [assembly: Guid("17ca5d23-46c3-44b1-8fa6-0f40b2e447ba")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
 [assembly: InternalsVisibleTo("DbLocalizationProvider.AdminUI")]
 [assembly: InternalsVisibleTo("DbLocalizationProvider.MigrationTool")]
 [assembly: InternalsVisibleTo("DbLocalizationProvider.Tests")]
diff --git a/DbLocalizationProvider/Sync/DbLocalizationProviderInitializationModule.cs b/DbLocalizationProvider/Sync/DbLocalizationProviderInitializationModule.cs
@@ -26,7 +26,7 @@ public void Initialize(InitializationEngine context)
                 return;
             }
 
-            context.InitComplete += ContextOnInitComplete;
+            context.InitComplete += DiscoverAndRegister;
             _eventHandlerAttached = true;
         }
 
@@ -38,10 +38,10 @@ public void ConfigureContainer(ServiceConfigurationContext context)
 
         public void Uninitialize(InitializationEngine context)
         {
-            context.InitComplete -= ContextOnInitComplete;
+            context.InitComplete -= DiscoverAndRegister;
         }
 
-        private void ContextOnInitComplete(object sender, EventArgs eventArgs)
+        private void DiscoverAndRegister(object sender, EventArgs eventArgs)
         {
             if (!ConfigurationContext.Current.DiscoverAndRegisterResources)
             {

diff --git a/DbLocalizationProvider/Sync/TypeDiscoveryHelper.cs b/DbLocalizationProvider/Sync/TypeDiscoveryHelper.cs
@@ -152,7 +152,9 @@ private static string GetResourceValue(PropertyInfo pi, string defaultResourceVa
 
         private static IEnumerable<Assembly> GetAssemblies()
         {
-            return AppDomain.CurrentDomain.GetAssemblies();
+            return AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.FullName.StartsWith("Microsoft")
+                                                                      || !a.FullName.StartsWith("System")
+                                                                      || !a.FullName.StartsWith("EPiServer"));
         }
 
         private static IEnumerable<Type> GetTypesChildOfInAssembly(Type type, Assembly assembly)