Merge pull request #2938 from AutoMapper/single-automap-attribute

jbogard · web-flow · commit bdb8eec9b00e · 2019-01-08T07:56:06.000-06:00
Assume single automap attribute
diff --git a/src/AutoMapper/Configuration/MapperConfigurationExpression.cs b/src/AutoMapper/Configuration/MapperConfigurationExpression.cs
@@ -94,7 +94,9 @@ private void AddMapsCore(IEnumerable<Assembly> assembliesToScan)
                 {
                     AddProfile(type.AsType());
                 }
-                foreach (var autoMapAttribute in type.GetCustomAttributes<AutoMapAttribute>())
+
+                var autoMapAttribute = type.GetCustomAttribute<AutoMapAttribute>();
+                if (autoMapAttribute != null)
                 {
                     var mappingExpression = autoMapAttributeProfile.CreateMap(autoMapAttribute.SourceType, type);
                     autoMapAttribute.ApplyConfiguration(mappingExpression);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ private void AddMapsCore(IEnumerable<Assembly> assembliesToScan)`
`94`	`94`	`{`
`95`	`95`	`AddProfile(type.AsType());`
`96`	`96`	`}`
`97`		`- foreach (var autoMapAttribute in type.GetCustomAttributes<AutoMapAttribute>())`
	`97`	`+`
	`98`	`+ var autoMapAttribute = type.GetCustomAttribute<AutoMapAttribute>();`
	`99`	`+ if (autoMapAttribute != null)`
`98`	`100`	`{`
`99`	`101`	`var mappingExpression = autoMapAttributeProfile.CreateMap(autoMapAttribute.SourceType, type);`
`100`	`102`	`autoMapAttribute.ApplyConfiguration(mappingExpression);`