diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 1d47c0b4e9bf..78155a74ea09 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -604,7 +604,7 @@ public CodegenModel fromModel(String name, Schema model) {
}
for (final CodegenProperty property : codegenModel.readWriteVars) {
- if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.baseName.equals(parentCodegenModel.discriminator.getPropertyName())) {
+ if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) {
property.defaultValue = "\"" + name + "\"";
}
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
index 2d2f563bf210..c1fa060c8ff9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
@@ -299,7 +299,7 @@ public CodegenModel fromModel(String name, Schema model) {
}
for (final CodegenProperty property : codegenModel.readWriteVars) {
- if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.baseName.equals(parentCodegenModel.discriminator.getPropertyName())) {
+ if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) {
property.defaultValue = "\"" + name + "\"";
}
}
diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject.md
new file mode 100644
index 000000000000..40e16da1bb7d
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.InlineObject
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Updated name of the pet | [optional]
+**Status** | **string** | Updated status of the pet | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject1.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject1.md
new file mode 100644
index 000000000000..2e6d226754e4
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/InlineObject1.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.InlineObject1
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AdditionalMetadata** | **string** | Additional data to pass to server | [optional]
+**File** | **System.IO.Stream** | file to upload | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
index 84f1ca007a33..72483978c81d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
@@ -41,9 +41,9 @@ protected Cat() { }
/// Initializes a new instance of the class.
///
/// declawed.
- /// className (required).
+ /// className (required) (default to "Cat").
/// color (default to "red").
- public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color)
+ public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color)
{
this.Declawed = declawed;
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
index ca4115b1e4dc..4d711f396aa5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
@@ -41,9 +41,9 @@ protected Dog() { }
/// Initializes a new instance of the class.
///
/// breed.
- /// className (required).
+ /// className (required) (default to "Dog").
/// color (default to "red").
- public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color)
+ public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color)
{
this.Breed = breed;
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
index 84f1ca007a33..72483978c81d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
@@ -41,9 +41,9 @@ protected Cat() { }
/// Initializes a new instance of the class.
///
/// declawed.
- /// className (required).
+ /// className (required) (default to "Cat").
/// color (default to "red").
- public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color)
+ public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color)
{
this.Declawed = declawed;
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
index ca4115b1e4dc..4d711f396aa5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
@@ -41,9 +41,9 @@ protected Dog() { }
/// Initializes a new instance of the class.
///
/// breed.
- /// className (required).
+ /// className (required) (default to "Dog").
/// color (default to "red").
- public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color)
+ public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color)
{
this.Breed = breed;
}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
index 42674c5ffce8..2326d55ac486 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
@@ -39,7 +39,7 @@ protected Cat() { }
/// Initializes a new instance of the class.
///
/// declawed.
- public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color)
+ public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color)
{
this.Declawed = declawed;
}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
index 96e568628fe5..b925fb99c324 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
@@ -39,7 +39,7 @@ protected Dog() { }
/// Initializes a new instance of the class.
///
/// breed.
- public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color)
+ public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color)
{
this.Breed = breed;
}
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs
index fd2f581e7dcf..ed0f0ced795a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -1568,7 +1568,7 @@ public ApiResponse