Merge pull request OpenAPITools#4 from ronanwatkins/DEVENGAGE-898

DEVENGAGE-898: .NET SDK

Author: ronanwatkins

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java

@@ -169,13 +169,17 @@ public class CodegenConstants {
     public static final String PACKAGE_PRODUCTNAME_DESC = "Specifies an AssemblyProduct for the .NET Framework global assembly attributes stored in the AssemblyInfo file.";
     public static final String PACKAGE_DESCRIPTION = "packageDescription";
     public static final String PACKAGE_DESCRIPTION_DESC = "Specifies a AssemblyDescription for the .NET Framework global assembly attributes stored in the AssemblyInfo file.";
+    public static final String PACKAGE_CONFIGURATION = "packageConfiguration";
     public static final String PACKAGE_COMPANY = "packageCompany";
     public static final String PACKAGE_COMPANY_DESC = "Specifies an AssemblyCompany for the .NET Framework global assembly attributes stored in the AssemblyInfo file.";
+    public static final String PACKAGE_PRODUCT_NAME = "packageProductName";
     public static final String PACKAGE_AUTHORS = "packageAuthors";
     public static final String PACKAGE_AUTHORS_DESC = "Specifies Authors property in the .NET Core project file.";
     public static final String PACKAGE_URL = "packageUrl";
     public static final String PACKAGE_COPYRIGHT = "packageCopyright";
     public static final String PACKAGE_COPYRIGHT_DESC = "Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.";
+    public static final String PACKAGE_TRADEMARK = "packageTrademark";
+    public static final String PACKAGE_CULTURE = "packageCulture";
 
     public static final String POD_VERSION = "podVersion";
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java

@@ -671,4 +671,3 @@ public Tuple(X item1, Y item2) {
         }
     }
 }
-

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -1348,7 +1348,7 @@ public String toVarName(final String name) {
         if (reservedWords.contains(name)) {
             return escapeReservedWord(name);
         } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) {
-            return escape(name, specialCharReplacements, null, null);
+            return name;
         }
         return name;
     }
@@ -1365,7 +1365,7 @@ public String toParamName(String name) {
         if (reservedWords.contains(name)) {
             return escapeReservedWord(name);
         } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) {
-            return escape(name, specialCharReplacements, null, null);
+            return escapeReservedWord(name);
         }
         return name;
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -498,7 +498,6 @@ void generateModels(List<File> files, List<Object> allModels, List<String> unuse
                     // generators may choose to make models for use case 2 + 3
                     Schema refSchema = new Schema();
                     refSchema.set$ref("#/components/schemas/"+name);
-                    Schema unaliasedSchema = config.unaliasSchema(refSchema, config.importMapping());
                 } else if (ModelUtils.isMapSchema(schema)) { // check to see if it's a "map" model
                     // A composed schema (allOf, oneOf, anyOf) is considered a Map schema if the additionalproperties attribute is set
                     // for that composed schema. However, in the case of a composed schema, the properties are defined or referenced

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -43,6 +43,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     protected boolean optionalEmitDefaultValuesFlag = false;
     protected boolean optionalProjectFileFlag = true;
     protected boolean optionalMethodArgumentFlag = true;
+    protected boolean optionalEmitDefaultValue = false;
     protected boolean useDateTimeOffsetFlag = false;
     protected boolean useCollection = false;
     protected boolean returnICollection = false;
@@ -1276,4 +1277,4 @@ public void postProcessFile(File file, String fileType) {
             }
         }
     }
-}
+}