From 6b7439b9d9827762b001328010438ddeff8154ef Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jan 2016 00:17:55 +0800 Subject: [PATCH] add compile-mono, fix csharp comment --- .../io/swagger/codegen/languages/CSharpClientCodegen.java | 2 ++ .../src/main/resources/csharp/ApiResponse.mustache | 4 ++-- .../src/main/resources/csharp/Configuration.mustache | 1 + .../src/main/resources/csharp/model.mustache | 2 +- .../SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh | 4 ++-- .../src/main/csharp/IO/Swagger/Client/ApiClient.cs | 6 ++++++ .../src/main/csharp/IO/Swagger/Client/ApiResponse.cs | 4 ++-- .../src/main/csharp/IO/Swagger/Client/Configuration.cs | 1 + .../src/main/csharp/IO/Swagger/Model/Category.cs | 2 +- .../SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs | 2 +- .../SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs | 2 +- .../SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs | 2 +- .../SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs | 2 +- 13 files changed, 22 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index 322729ac8c04..8966e19b9cef 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -185,6 +185,8 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll")); supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll")); supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat")); + supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh")); + supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor" + java.io.File.separator, "packages.config")); supportingFiles.add(new SupportingFile("README.md", "", "README.md")); if (optionalAssemblyInfoFlag) { diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache index 32816110a1bb..c4317c35b652 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache @@ -27,10 +27,10 @@ namespace {{packageName}}.Client public T Data { get; private set; } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// HTTP status code. - /// Error message. + /// HTTP headers. /// Data (parsed HTTP body) public ApiResponse(int statusCode, IDictionary headers, T data) { diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache index 7062a73c1e1c..d3ef0c6f7316 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache @@ -24,6 +24,7 @@ namespace {{packageName}}.Client /// Dictionary of API key prefix /// Temp folder path /// DateTime format string + /// HTTP connection timeout (in milliseconds) public Configuration(ApiClient apiClient = null, Dictionary defaultHeader = null, string username = null, diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache index ad942039677a..6db39b046a26 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache @@ -74,7 +74,7 @@ namespace {{packageName}}.Model /// /// Returns true if {{classname}} instances are equal /// - /// Instance of {{classname}} to be compared + /// Instance of {{classname}} to be compared /// Boolean public bool Equals({{classname}} other) { diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh index bc4e09899455..352274186d2a 100644 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh +++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh @@ -7,6 +7,6 @@ vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\ System.Runtime.Serialization.dll \ -target:library \ -out:bin/IO.Swagger.dll \ --recurse:src/*.cs \ +-recurse:'src/*.cs' \ -doc:bin/IO.Swagger.xml \ --platform:anycpu \ No newline at end of file +-platform:anycpu diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs index 7e6807f16a45..ee2e1b8b8f01 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs @@ -194,6 +194,12 @@ namespace IO.Swagger.Client // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 // For example: 2009-06-15T13:45:30.0000000 return ((DateTime)obj).ToString (Configuration.DateTimeFormat); + else if (obj is DateTimeOffset) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat); else if (obj is IList) { var flattenedString = new StringBuilder(); diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs index 157357116563..651d3609c22b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs @@ -27,10 +27,10 @@ namespace IO.Swagger.Client public T Data { get; private set; } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// HTTP status code. - /// Error message. + /// HTTP headers. /// Data (parsed HTTP body) public ApiResponse(int statusCode, IDictionary headers, T data) { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs index 000b8893cdf4..7ea30009c9ca 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs @@ -24,6 +24,7 @@ namespace IO.Swagger.Client /// Dictionary of API key prefix /// Temp folder path /// DateTime format string + /// HTTP connection timeout (in milliseconds) public Configuration(ApiClient apiClient = null, Dictionary defaultHeader = null, string username = null, diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs index 6ad53e05257d..85694bc93c88 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs @@ -78,7 +78,7 @@ namespace IO.Swagger.Model /// /// Returns true if Category instances are equal /// - /// Instance of Category to be compared + /// Instance of Category to be compared /// Boolean public bool Equals(Category other) { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs index eb649ccf587e..5a110929b20e 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs @@ -111,7 +111,7 @@ namespace IO.Swagger.Model /// /// Returns true if Order instances are equal /// - /// Instance of Order to be compared + /// Instance of Order to be compared /// Boolean public bool Equals(Order other) { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs index 202a171c2190..ec3b3d5ca13e 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs @@ -111,7 +111,7 @@ namespace IO.Swagger.Model /// /// Returns true if Pet instances are equal /// - /// Instance of Pet to be compared + /// Instance of Pet to be compared /// Boolean public bool Equals(Pet other) { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs index 4aa4a9c97f08..078a53ad1ea2 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs @@ -78,7 +78,7 @@ namespace IO.Swagger.Model /// /// Returns true if Tag instances are equal /// - /// Instance of Tag to be compared + /// Instance of Tag to be compared /// Boolean public bool Equals(Tag other) { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs index 5785a3d3509d..7f0b3b858aa1 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs @@ -127,7 +127,7 @@ namespace IO.Swagger.Model /// /// Returns true if User instances are equal /// - /// Instance of User to be compared + /// Instance of User to be compared /// Boolean public bool Equals(User other) {