Merge pull request #4 from dotnet/master

Update fork
zeahmed · May 11, 2018 · ea161ff · ea161ff
2 parents 3fb99ae + 3780923
commit ea161ff
Show file tree

Hide file tree

Showing 6 changed files with 276 additions and 84 deletions.
diff --git a/src/Microsoft.ML.Api/SchemaDefinition.cs b/src/Microsoft.ML.Api/SchemaDefinition.cs
@@ -332,8 +332,9 @@ public static SchemaDefinition Create(Type userType)
 
                 if (fieldInfo.GetCustomAttribute<NoColumnAttribute>() != null)
                     continue;
-                var mappingAttr = fieldInfo.GetCustomAttribute<ColumnNameAttribute>();
-                var name = mappingAttr == null ? fieldInfo.Name : (mappingAttr.Name ?? fieldInfo.Name);
+                var mappingAttr = fieldInfo.GetCustomAttribute<ColumnAttribute>();
+                var mappingNameAttr = fieldInfo.GetCustomAttribute<ColumnNameAttribute>();
+                string name = mappingAttr?.Name ?? mappingNameAttr?.Name ?? fieldInfo.Name;
                 // Disallow duplicate names, because the field enumeration order is not actually
                 // well defined, so we are not gauranteed to have consistent "hiding" from run to
                 // run, across different .NET versions.