Fixes #107

Author: ENikS

src/Abstracts/IUnityContainerAsync.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Unity.Injection;
 using Unity.Lifetime;
@@ -97,6 +98,17 @@ public interface IUnityContainerAsync : IDisposable
         Task<object> Resolve(Type type, string name, params ResolverOverride[] overrides);
 
 
+        /// <summary>
+        /// Resolve an instance of the requested type from the container.
+        /// </summary>
+        /// <param name="type"><see cref="Type"/> of object to get typeFrom the container.</param>
+        /// <param name="regex">Pattern to match names to. Only these with successful 
+        /// <see cref="Regex.IsMatch(string name)"/> will be resolved</param>
+        /// <param name="overrides">Any overrides for the resolve call.</param>
+        /// <returns>The retrieved object.</returns>
+        Task<IEnumerable<object>> Resolve(Type type, Regex regex, params ResolverOverride[] overrides);
+
+
         /// <summary>
         /// The parent of this container.
         /// </summary>

src/Abstracts/ResolutionOption.cs

@@ -0,0 +1,27 @@
+
+namespace Unity
+{
+    /// <summary>
+    /// Options indicating how dependency should be resolved
+    /// </summary>
+    public enum ResolutionOption
+    {
+        /// <summary>
+        /// Required dependency
+        /// </summary>
+        /// <remarks>
+        /// This dependency should be either resolved or error
+        /// should be reported.
+        /// </remarks>
+        Required,
+
+        /// <summary>
+        /// Optional dependency
+        /// </summary>
+        /// <remarks>
+        /// This dependency should be either resolved or default 
+        /// value will be returned.
+        /// </remarks>
+        Optional
+    }
+}

src/Attributes/Annotation/DependencyAttribute.cs

@@ -14,9 +14,6 @@ namespace Unity
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter | AttributeTargets.Field)]
     public sealed class DependencyAttribute : DependencyResolutionAttribute
     {
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        internal static DependencyAttribute Instance = new DependencyAttribute();
-
         /// <summary>
         /// Create an instance of <see cref="DependencyAttribute"/> with no name.
         /// </summary>

src/Attributes/Annotation/OptionalDependencyAttribute.cs

@@ -11,9 +11,6 @@ namespace Unity
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
     public sealed class OptionalDependencyAttribute : DependencyResolutionAttribute
     {
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        internal static OptionalDependencyAttribute Instance = new OptionalDependencyAttribute();
-
         /// <summary>
         /// Construct a new <see cref="OptionalDependencyAttribute"/> object.
         /// </summary>

src/Dependency/Injection/Members/InjectionField.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 namespace Unity.Injection
@@ -13,10 +12,9 @@ public class InjectionField : MemberInfoBase<FieldInfo>
         /// Configure the container to inject the given field name.
         /// </summary>
         /// <param name="name">Name of property to inject.</param>
-        /// <param name="optional">Tells Unity if this field is optional.</param>
-        public InjectionField(string name, bool optional = false)
-            : base(name, optional ? OptionalDependencyAttribute.Instance 
-                                  : (object)DependencyAttribute.Instance)
+        /// <param name="option">Tells Unity if this field is required or optional.</param>
+        public InjectionField(string name, ResolutionOption option = ResolutionOption.Required)
+            : base(name, option)
         {
         }
 

src/Dependency/Injection/Members/InjectionProperty.cs

@@ -18,10 +18,9 @@ public class InjectionProperty : MemberInfoBase<PropertyInfo>
         /// using the value supplied.
         /// </summary>
         /// <param name="name">Name of property to inject.</param>
-        /// <param name="optional">Tells Unity if this field is optional.</param>
-        public InjectionProperty(string name, bool optional = false)
-            : base(name, optional ? OptionalDependencyAttribute.Instance
-                                  : (object)DependencyAttribute.Instance)
+        /// <param name="option">Tells Unity if this field is optional.</param>
+        public InjectionProperty(string name, ResolutionOption option = ResolutionOption.Required)
+            : base(name, option)
         {
         }
 

src/Dependency/Injection/Parameters/GenericResolvedArrayParameter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Unity.Policy;
 using Unity.Resolution;
 
 namespace Unity.Injection

src/Dependency/Injection/Parameters/ResolvedArrayParameter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Unity.Policy;
 using Unity.Resolution;
 
 namespace Unity.Injection

src/Dependency/Injection/Parameters/ResolvedParameter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using Unity.Policy;
 using Unity.Resolution;
 
 namespace Unity.Injection

src/Extensions/Injection/Resolve.cs

@@ -116,7 +116,7 @@ public static partial class Resolve
 #if !NET40
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #endif
-        public static InjectionMember OptionalField(string name) => new InjectionField(name, true);
+        public static InjectionMember OptionalField(string name) => new InjectionField(name, ResolutionOption.Optional);
 
         #endregion
 
@@ -131,7 +131,7 @@ public static partial class Resolve
 #if !NET40
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #endif
-        public static InjectionMember OptionalProperty(string name) => new InjectionProperty(name ?? throw new ArgumentNullException(nameof(name)), true);
+        public static InjectionMember OptionalProperty(string name) => new InjectionProperty(name ?? throw new ArgumentNullException(nameof(name)), ResolutionOption.Optional);
 
         #endregion
     }