Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

modules/swagger-codegen/src/main/resources/aspnet5/model.mustache

@@ -16,6 +16,7 @@ namespace {{packageName}}.Models
     /// <summary>
     /// {{description}}
     /// </summary>
+    [DataContract]
     public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
     {
         /// <summary>
@@ -52,6 +53,7 @@ namespace {{packageName}}.Models
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{{description}}}</value>{{/description}}
+        [DataMember(Name="{{baseName}}")]
         public {{{datatype}}} {{name}} { get; set; }
 
         {{/vars}}
@@ -64,7 +66,8 @@ namespace {{packageName}}.Models
         {
             var sb = new StringBuilder();
             sb.Append("class {{classname}} {\n");
-            {{#vars}}sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
+            {{#vars}}
+            sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
             {{/vars}}
             sb.Append("}\n");
             return sb.ToString();

modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache

@@ -1,5 +1,5 @@
     /// <summary>
-    /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+    /// {{^description}}Defines {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
     /// </summary>{{#description}}
     /// <value>{{{description}}}</value>{{/description}}
     [JsonConverter(typeof(StringEnumConverter))]