diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs index a3ba7a533f..a41212f1db 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs @@ -33,11 +33,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding private static Dictionary AttributeFactories = new Dictionary(); -#if NET45 // Factories for IValidatableObject models private static DataAnnotationsValidatableObjectAdapterFactory DefaultValidatableFactory = () => new ValidatableObjectAdapter(); -#endif private static Dictionary ValidatableFactories = new Dictionary(); @@ -63,7 +61,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding results.Add(factory(attribute)); } -#if NET45 // Produce a validator if the type supports IValidatableObject if (typeof(IValidatableObject).IsAssignableFrom(metadata.ModelType)) { @@ -74,7 +71,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } results.Add(factory()); } -#endif return results; } diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/ValidatableObjectAdapter.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/ValidatableObjectAdapter.cs index 1fbc9a8b15..c3cd630a94 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/ValidatableObjectAdapter.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/ValidatableObjectAdapter.cs @@ -1,5 +1,4 @@ -#if NET45 -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -56,5 +55,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs index 067dd92d0b..07831f8101 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs @@ -37,8 +37,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } // Default IValidatableObject adapter factory - -#if NET45 [Fact] public void IValidatableObjectGetsAValidator() { @@ -53,7 +51,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding // Assert Assert.Single(validators); } -#endif // Integration with metadata system