Merge branch 'jnyrup-IsDefined'

Author: JoshClose

src/CsvHelper/Configuration/ClassMap.cs

@@ -346,7 +346,7 @@ protected virtual void AutoMapMembers(ClassMap map, CsvContext context, LinkedLi
 					continue;
 				}
 
-				if (!field.GetCustomAttributes(typeof(CompilerGeneratedAttribute), false).Any())
+				if (!Attribute.IsDefined(field, typeof(CompilerGeneratedAttribute), false))
 				{
 					fields.Add(ReflectionHelper.GetDeclaringField(type, field, flags));
 				}
@@ -357,7 +357,7 @@ protected virtual void AutoMapMembers(ClassMap map, CsvContext context, LinkedLi
 
 		foreach (var member in members)
 		{
-			if (member.GetCustomAttribute<IgnoreAttribute>() != null)
+			if (Attribute.IsDefined(member, typeof(IgnoreAttribute)))
 			{
 				// Ignore this member including its tree if it's a reference.
 				continue;
@@ -459,7 +459,7 @@ protected virtual void AutoMapConstructorParameters(ClassMap map, CsvContext con
 		{
 			var parameterMap = new ParameterMap(parameter);
 
-			if (parameter.GetCustomAttributes<IgnoreAttribute>(true).Any() || parameter.GetCustomAttributes<ConstantAttribute>(true).Any())
+			if (Attribute.IsDefined(parameter, typeof(IgnoreAttribute), true) || Attribute.IsDefined(parameter, typeof(ConstantAttribute), true))
 			{
 				// If there is an IgnoreAttribute or ConstantAttribute, we still need to add a map because a constructor requires
 				// all parameters to be present. A default value will be used later on.

src/CsvHelper/Configuration/CsvConfiguration.cs

@@ -297,8 +297,8 @@ public static CsvConfiguration FromAttributes<T>(CultureInfo cultureInfo)
 	/// <exception cref="CultureNotFoundException">If the argument to the <see cref="CultureInfoAttribute"/> does not specify a supported culture.</exception>
 	public static CsvConfiguration FromAttributes(Type type)
 	{
-		var cultureInfoAttribute = (CultureInfoAttribute?)Attribute.GetCustomAttribute(type, typeof(CultureInfoAttribute));
-		if (cultureInfoAttribute == null)
+		var hasCultureInfoAttribute = Attribute.IsDefined(type, typeof(CultureInfoAttribute));
+		if (!hasCultureInfoAttribute)
 		{
 			throw new ConfigurationException($"A {nameof(CultureInfoAttribute)} is required on type '{type.Name}' to use this method.");
 		}

src/CsvHelper/ReflectionHelper.cs

@@ -61,7 +61,7 @@ public static FieldInfo GetDeclaringField(Type type, FieldInfo field, BindingFla
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static List<PropertyInfo> GetUniqueProperties(Type type, BindingFlags flags, bool overwrite = false)
 	{
-		var ignoreBase = type.GetCustomAttribute(typeof(IgnoreBaseAttribute)) != null;
+		var ignoreBase = Attribute.IsDefined(type, typeof(IgnoreBaseAttribute));
 
 		var properties = new Dictionary<string, PropertyInfo>();
 
@@ -99,7 +99,7 @@ public static List<PropertyInfo> GetUniqueProperties(Type type, BindingFlags fla
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static List<FieldInfo> GetUniqueFields(Type type, BindingFlags flags, bool overwrite = false)
 	{
-		var ignoreBase = type.GetCustomAttribute(typeof(IgnoreBaseAttribute)) != null;
+		var ignoreBase = Attribute.IsDefined(type, typeof(IgnoreBaseAttribute));
 
 		var fields = new Dictionary<string, FieldInfo>();