Merge pull request #240 from umco/develop

Preparing Ditto 0.12.1 release

Author: leekelleher

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 0.12.0.{build}
+version: 0.12.1.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

src/Our.Umbraco.Ditto/ComponentModel/ObjectResolution/AttributedTypeResolver.cs

@@ -30,23 +30,17 @@ private void Initialize(IEnumerable<Type> types, bool inherit = false)
             }
         }
 
-        private static AttributedTypeResolver<TAttribute> _resolver;
-
         /// <summary>
         /// A static instance of the attributed type resolver.
         /// </summary>
-        public static AttributedTypeResolver<TAttribute> Current
-        {
-            get { return _resolver; }
-            set { _resolver = value; }
-        }
+        public static AttributedTypeResolver<TAttribute> Current { get; set; }
 
         /// <summary>
         /// Returns true if the resolver instance is currently available.
         /// </summary>
         public static bool HasCurrent
         {
-            get { return _resolver != null; }
+            get { return Current != null; }
         }
 
         /// <summary>

src/Our.Umbraco.Ditto/Ditto.cs

@@ -204,7 +204,7 @@ public static bool TryGetTypeAttribute<TAttribute>(Type objectType, out TAttribu
         {
             if (AttributedTypeResolver<TAttribute>.HasCurrent == false)
             {
-                AttributedTypeResolver<TAttribute>.Current = AttributedTypeResolver<TAttribute>.Create(new[] { objectType });
+                AttributedTypeResolver<TAttribute>.Current = AttributedTypeResolver<TAttribute>.Create(new[] { objectType }, inherit);
             }
 
             return AttributedTypeResolver<TAttribute>.Current.TryGetTypeAttribute(objectType, out attribute, inherit);