diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
index 101e95cbfc4..44218b0a889 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
@@ -16,7 +16,20 @@ namespace {{packageName}}.Models
     /// </summary>
     [DataContract]
     public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
-    { {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{>enumClass}}{{/items}}{{/items.isEnum}}
+    {
+        {{#vars}}
+        {{#items.isEnum}}
+        {{#items}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/items}}
+        {{/items.isEnum}}
+        {{#isEnum}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/isEnum}}
         /// <summary>
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
         /// </summary>
@@ -34,6 +47,7 @@ namespace {{packageName}}.Models
         public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{#hasMore}}
+
         {{/hasMore}}
         {{/vars}}
 
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
index fcb2200d5b7..899ccf61d9d 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
@@ -18,7 +18,20 @@ namespace {{modelPackage}}
     /// </summary>
     [DataContract]
     public {{#modelClassModifier}}{{modelClassModifier}} {{/modelClassModifier}}class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
-    { {{#vars}}{{#isEnum}}{{^isModel}}{{>enumClass}}{{/isModel}}{{/isEnum}}{{#items.isEnum}}{{^isModel}}{{#items}}{{>enumClass}}{{/items}}{{/isModel}}{{/items.isEnum}}
+    {
+        {{#vars}}
+        {{#items.isEnum}}
+        {{#items}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/items}}
+        {{/items.isEnum}}
+        {{#isEnum}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/isEnum}}
         /// <summary>
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
         /// </summary>{{#description}}
@@ -37,6 +50,7 @@ namespace {{modelPackage}}
         public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{#hasMore}}
+
         {{/hasMore}}
         {{/vars}}
 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs
index 5aa1a66468d..ef3413980ea 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class ApiResponse : IEquatable<ApiResponse>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Code
         /// </summary>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs
index 79229996094..6ac6a181baf 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class Category : IEquatable<Category>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
index a1715221ba2..77a4c75a1b1 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class Order : IEquatable<Order>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
@@ -50,6 +50,7 @@ namespace Org.OpenAPITools.Models
         [DataMember(Name="shipDate", EmitDefaultValue=false)]
         public DateTime ShipDate { get; set; }
 
+
         /// <summary>
         /// Order Status
         /// </summary>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
index cb8a2001f17..a814c6e1edf 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class Pet : IEquatable<Pet>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Models
         [DataMember(Name="tags", EmitDefaultValue=false)]
         public List<Tag> Tags { get; set; }
 
+
         /// <summary>
         /// pet status in the store
         /// </summary>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs
index 223b3ac3af5..f0a131f617c 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class Tag : IEquatable<Tag>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs
index dc5595815cd..3c8a18d63cf 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs
@@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
     /// </summary>
     [DataContract]
     public partial class User : IEquatable<User>
-    { 
+    {
         /// <summary>
         /// Gets or Sets Id
         /// </summary>