diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs index 361d5ff64d..33679edf5b 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Microsoft.AspNet.Mvc.ModelBinding { - public class DictionaryBasedValueProvider : MakerAwareValueProvider + public class DictionaryBasedValueProvider : MarkerAwareValueProvider where TBinderMarker : IValueBinderMarker { private readonly IDictionary _values; diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs index 47b37f50a5..043608ab86 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding /// based on . /// /// Represents a type implementing - public abstract class MakerAwareValueProvider : IMarkerAwareValueProvider + public abstract class MarkerAwareValueProvider : IMarkerAwareValueProvider where TBinderMarker : IValueBinderMarker { public abstract Task ContainsPrefixAsync(string prefix); diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs index 4e322574f7..7ca83309ca 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs @@ -11,7 +11,8 @@ using Microsoft.AspNet.Mvc.ModelBinding.Internal; namespace Microsoft.AspNet.Mvc.ModelBinding { - public class ReadableStringCollectionValueProvider : MakerAwareValueProvider, IEnumerableValueProvider + public class ReadableStringCollectionValueProvider : + MarkerAwareValueProvider, IEnumerableValueProvider where TBinderMarker : IValueBinderMarker { private readonly CultureInfo _culture; diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs index 58604d37aa..9c2cb6c596 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServices.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs @@ -84,7 +84,6 @@ namespace Microsoft.AspNet.Mvc yield return describe.Scoped(); yield return describe.Transient(); yield return describe.Scoped(); - yield return describe.Transient(); yield return describe.Transient(); yield return describe.Instance(new JsonOutputFormatter());