From bc271e706048c7bcac69f6a989fb7fafec2fc639 Mon Sep 17 00:00:00 2001
From: Ramanth <addalaramanth@gmail.com>
Date: Tue, 14 Apr 2020 18:28:43 +0530
Subject: [PATCH 01/12] feat(csharp): adding retry configuration

---
 .../csharp-netcore/ApiClient.mustache         | 46 +++++++++++++++++--
 .../csharp-netcore/Configuration.mustache     | 20 +++++++-
 .../IReadableConfiguration.mustache           | 17 ++++++-
 .../resources/csharp-netcore/Project.mustache |  5 +-
 .../csharp-netcore/netcore_project.mustache   |  1 +
 .../src/Org.OpenAPITools/Client/ApiClient.cs  | 46 +++++++++++++++++--
 .../Org.OpenAPITools/Client/Configuration.cs  | 20 +++++++-
 .../Client/IReadableConfiguration.cs          | 17 ++++++-
 .../Org.OpenAPITools/Org.OpenAPITools.csproj  |  5 +-
 .../src/Org.OpenAPITools/Client/ApiClient.cs  | 46 +++++++++++++++++--
 .../Org.OpenAPITools/Client/Configuration.cs  | 20 +++++++-
 .../Client/IReadableConfiguration.cs          | 17 ++++++-
 .../Org.OpenAPITools/Org.OpenAPITools.csproj  |  1 +
 13 files changed, 237 insertions(+), 24 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
index 49b81c72e07..c790b70d4ce 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
@@ -17,12 +17,14 @@ using System.Net;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using RestSharp;
 using RestSharp.Deserializers;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
 using RestSharpMethod = RestSharp.Method;
+using Polly;
 
 namespace {{packageName}}.Client
 {
@@ -408,7 +410,26 @@ namespace {{packageName}}.Client
 
             InterceptRequest(req);
 
-            var response = client.Execute<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)	
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                response = client.Execute<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -479,7 +500,26 @@ namespace {{packageName}}.Client
 
             InterceptRequest(req);
 
-            var response = await client.ExecuteAsync<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                 response = await client.ExecuteAsync<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -719,4 +759,4 @@ namespace {{packageName}}.Client
         }
         #endregion ISynchronousClient
     }
-}
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
index ad5cfdef997..4393710e33f 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
@@ -10,6 +10,8 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Net;
+using Polly;
 
 namespace {{packageName}}.Client
 {
@@ -336,6 +338,18 @@ namespace {{packageName}}.Client
             }
         }
 
+        /// <summary>
+        /// Gets or sets the status codes for retry policy.
+        /// </summary>
+        /// <value>List of http status codes</value>
+        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        public int MaxRetries {get; set;}
+
         #endregion Properties
 
         #region Methods
@@ -415,10 +429,12 @@ namespace {{packageName}}.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
+                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
+                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
             };
             return config;
         }
         #endregion Static Members
     }
-}
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
index ba12e9b8158..1ea55df4aa6 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
@@ -2,7 +2,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Security.Cryptography.X509Certificates;
+using Polly;
 
 namespace {{packageName}}.Client
 {
@@ -96,5 +98,18 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
+
+        /// <summary>
+        /// Status codes to apply the retry policy
+        /// </summary>
+        /// <value>List of http status codes.</value>
+        IList<HttpStatusCode> RetryStatusCodes { get;}
+
+        /// <summary>
+        /// Maximum number of retry attempts to make on given retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        int MaxRetries { get;}
+
     }
-}
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
index e4c9ed9e095..5873783fbf8 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
@@ -2,11 +2,9 @@
 <!--
 {{#appName}}
 {{{appName}}}
-
 {{/appName}}
 {{#appDescription}}
 {{{appDescription}}}
-
 {{/appDescription}}
 {{#version}}The version of the OpenAPI document: {{version}}{{/version}}
 {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
@@ -42,8 +40,9 @@
     <PackageReference Include="JsonSubTypes" Version="1.5.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RestSharp" Version="106.10.1" />
+    <PackageReference Include="Polly" Version="7.2.0" />
     {{#validatable}}
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     {{/validatable}}
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache
index 61427915ad9..ce6e04166ac 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache
@@ -28,6 +28,7 @@
     <PackageReference Include="JsonSubTypes" Version="1.5.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RestSharp" Version="106.10.1" />
+    <PackageReference Include="Polly" Version="7.2.0" />
     {{#validatable}}
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     {{/validatable}}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
index 6160e7a740e..5b677abe284 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -21,12 +21,14 @@ using System.Net;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using RestSharp;
 using RestSharp.Deserializers;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
 using RestSharpMethod = RestSharp.Method;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -411,7 +413,26 @@ namespace Org.OpenAPITools.Client
 
             InterceptRequest(req);
 
-            var response = client.Execute<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)	
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                response = client.Execute<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -481,7 +502,26 @@ namespace Org.OpenAPITools.Client
 
             InterceptRequest(req);
 
-            var response = await client.ExecuteAsync<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                 response = await client.ExecuteAsync<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -720,4 +760,4 @@ namespace Org.OpenAPITools.Client
         }
         #endregion ISynchronousClient
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
index d81444d03e5..355d71a00da 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
@@ -17,6 +17,8 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Net;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -339,6 +341,18 @@ namespace Org.OpenAPITools.Client
             }
         }
 
+        /// <summary>
+        /// Gets or sets the status codes for retry policy.
+        /// </summary>
+        /// <value>List of http status codes</value>
+        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        public int MaxRetries {get; set;}
+
         #endregion Properties
 
         #region Methods
@@ -410,10 +424,12 @@ namespace Org.OpenAPITools.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
+                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
+                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
             };
             return config;
         }
         #endregion Static Members
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index e32be310af5..627c8ce406b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -11,7 +11,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Security.Cryptography.X509Certificates;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -105,5 +107,18 @@ namespace Org.OpenAPITools.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
+
+        /// <summary>
+        /// Status codes to apply the retry policy
+        /// </summary>
+        /// <value>List of http status codes.</value>
+        IList<HttpStatusCode> RetryStatusCodes { get;}
+
+        /// <summary>
+        /// Maximum number of retry attempts to make on given retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        int MaxRetries { get;}
+
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 5402a1dc233..0a8940e611c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 OpenAPI Petstore
-
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
 The version of the OpenAPI document: 1.0.0
 
 -->
@@ -34,6 +32,7 @@ The version of the OpenAPI document: 1.0.0
     <PackageReference Include="JsonSubTypes" Version="1.5.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RestSharp" Version="106.10.1" />
+    <PackageReference Include="Polly" Version="7.2.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
index 8c44232d59b..963140b9cb6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -22,12 +22,14 @@ using System.Net;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using RestSharp;
 using RestSharp.Deserializers;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
 using RestSharpMethod = RestSharp.Method;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -412,7 +414,26 @@ namespace Org.OpenAPITools.Client
 
             InterceptRequest(req);
 
-            var response = client.Execute<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)	
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                response = client.Execute<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -482,7 +503,26 @@ namespace Org.OpenAPITools.Client
 
             InterceptRequest(req);
 
-            var response = await client.ExecuteAsync<T>(req);
+            IRestResponse<T> response;
+            if (configuration.RetryStatusCodes != null)
+            {
+                Random jitterer = new Random();
+                var policy = Policy
+                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
+                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
+                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
+                     );
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+                {
+                    Request = req,
+                    ErrorException = policyResult.FinalException
+                };
+            }
+            else
+            {
+                 response = await client.ExecuteAsync<T>(req);
+            }
 
             InterceptResponse(req, response);
 
@@ -721,4 +761,4 @@ namespace Org.OpenAPITools.Client
         }
         #endregion ISynchronousClient
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
index df843dad2c8..9c54c5c3804 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
@@ -17,6 +17,8 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Net;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -343,6 +345,18 @@ namespace Org.OpenAPITools.Client
             }
         }
 
+        /// <summary>
+        /// Gets or sets the status codes for retry policy.
+        /// </summary>
+        /// <value>List of http status codes</value>
+        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        public int MaxRetries {get; set;}
+
         #endregion Properties
 
         #region Methods
@@ -415,10 +429,12 @@ namespace Org.OpenAPITools.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
+                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
+                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
             };
             return config;
         }
         #endregion Static Members
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index e32be310af5..627c8ce406b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -11,7 +11,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Security.Cryptography.X509Certificates;
+using Polly;
 
 namespace Org.OpenAPITools.Client
 {
@@ -105,5 +107,18 @@ namespace Org.OpenAPITools.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
+
+        /// <summary>
+        /// Status codes to apply the retry policy
+        /// </summary>
+        /// <value>List of http status codes.</value>
+        IList<HttpStatusCode> RetryStatusCodes { get;}
+
+        /// <summary>
+        /// Maximum number of retry attempts to make on given retry status codes.
+        /// </summary>
+        /// <value>Maximum number of retries</value>
+        int MaxRetries { get;}
+
     }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 13e44d29d9f..6b42680e0f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -24,6 +24,7 @@
     <PackageReference Include="JsonSubTypes" Version="1.5.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RestSharp" Version="106.10.1" />
+    <PackageReference Include="Polly" Version="7.2.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
   </ItemGroup>
 
-- 
GitLab


From e1e5605f7a2cb461d850a9f6e99dda95f067f23e Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Wed, 13 May 2020 11:23:12 +0530
Subject: [PATCH 02/12] fix(csharp-retry) : adding retry policy through
 configuration

---
 .../csharp-netcore/ApiClient.mustache         | 30 +++++++------------
 .../csharp-netcore/Configuration.mustache     | 18 ++++++-----
 .../IReadableConfiguration.mustache           | 14 +++++----
 .../src/Org.OpenAPITools/Client/ApiClient.cs  | 30 +++++++------------
 .../Org.OpenAPITools/Client/Configuration.cs  | 18 ++++++-----
 .../Client/IReadableConfiguration.cs          | 14 +++++----
 .../src/Org.OpenAPITools/Client/ApiClient.cs  | 30 +++++++------------
 .../Org.OpenAPITools/Client/Configuration.cs  | 18 ++++++-----
 .../Client/IReadableConfiguration.cs          | 14 +++++----
 9 files changed, 84 insertions(+), 102 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
index c790b70d4ce..3f715d04e64 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
@@ -411,16 +411,11 @@ namespace {{packageName}}.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)	
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicy != null)	
+            {
+                var policy = configuration.RetryPolicy;
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
@@ -501,16 +496,11 @@ namespace {{packageName}}.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicyAsync != null)
+            {
+                var policy = configuration.RetryPolicyAsync;
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
index 4393710e33f..82d3b4c2dac 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
@@ -12,6 +12,8 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Net;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace {{packageName}}.Client
 {
@@ -339,16 +341,16 @@ namespace {{packageName}}.Client
         }
 
         /// <summary>
-        /// Gets or sets the status codes for retry policy.
+        /// Get or set the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes</value>
-        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+        /// <value>Async RetryPolicy</value>
+        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// Get or set the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        public int MaxRetries {get; set;}
+        /// <value>RetryPolicy</value>
+        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
         #endregion Properties
 
@@ -430,8 +432,8 @@ namespace {{packageName}}.Client
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
                 DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
-                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
+                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
+                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
             };
             return config;
         }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
index 1ea55df4aa6..89f62b4ddf0 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace {{packageName}}.Client
 {
@@ -100,16 +102,16 @@ namespace {{packageName}}.Client
         X509CertificateCollection ClientCertificates { get; }
 
         /// <summary>
-        /// Status codes to apply the retry policy
+        /// Gets the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes.</value>
-        IList<HttpStatusCode> RetryStatusCodes { get;}
+        /// <value>Async RetryPolicy</value>
+        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Maximum number of retry attempts to make on given retry status codes.
+        /// Gets the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        int MaxRetries { get;}
+        /// <value>RetryPolicy</value>
+        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
index 5b677abe284..95643a32840 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -414,16 +414,11 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)	
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicy != null)	
+            {
+                var policy = configuration.RetryPolicy;
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
@@ -503,16 +498,11 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicyAsync != null)
+            {
+                var policy = configuration.RetryPolicyAsync;
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
index 355d71a00da..e72d0aad7f5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
@@ -19,6 +19,8 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Net;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -342,16 +344,16 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <summary>
-        /// Gets or sets the status codes for retry policy.
+        /// Get or set the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes</value>
-        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+        /// <value>Async RetryPolicy</value>
+        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// Get or set the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        public int MaxRetries {get; set;}
+        /// <value>RetryPolicy</value>
+        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
         #endregion Properties
 
@@ -425,8 +427,8 @@ namespace Org.OpenAPITools.Client
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
                 DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
-                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
+                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
+                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
             };
             return config;
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 627c8ce406b..1797dcece2b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -14,6 +14,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -109,16 +111,16 @@ namespace Org.OpenAPITools.Client
         X509CertificateCollection ClientCertificates { get; }
 
         /// <summary>
-        /// Status codes to apply the retry policy
+        /// Gets the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes.</value>
-        IList<HttpStatusCode> RetryStatusCodes { get;}
+        /// <value>Async RetryPolicy</value>
+        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Maximum number of retry attempts to make on given retry status codes.
+        /// Gets the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        int MaxRetries { get;}
+        /// <value>RetryPolicy</value>
+        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
index 963140b9cb6..d16642bd515 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -415,16 +415,11 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)	
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetry(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = policy.ExecuteAndCapture(() => client.Execute<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicy != null)	
+            {
+                var policy = configuration.RetryPolicy;
+                var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
@@ -504,16 +499,11 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryStatusCodes != null)
-            {
-                Random jitterer = new Random();
-                var policy = Policy
-                    .HandleResult<IRestResponse<T>>(resp => (configuration.RetryStatusCodes.Contains(resp.StatusCode)))
-                    .WaitAndRetryAsync(configuration.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))
-                                                          + TimeSpan.FromMilliseconds(jitterer.Next(0, 1000))
-                     );
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req));
-                response = (policyResult.Outcome == OutcomeType.Successful) ? policyResult.Result : new RestResponse<T>
+            if (configuration.RetryPolicyAsync != null)
+            {
+                var policy = configuration.RetryPolicyAsync;
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
+                response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
                     ErrorException = policyResult.FinalException
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
index 9c54c5c3804..68df556bff4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
@@ -19,6 +19,8 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Net;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -346,16 +348,16 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <summary>
-        /// Gets or sets the status codes for retry policy.
+        /// Get or set the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes</value>
-        public IList<HttpStatusCode> RetryStatusCodes { get; set; }
+        /// <value>Async RetryPolicy</value>
+        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Gets or sets the maximum number of retry attempts on the retry status codes.
+        /// Get or set the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        public int MaxRetries {get; set;}
+        /// <value>RetryPolicy</value>
+        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
         #endregion Properties
 
@@ -430,8 +432,8 @@ namespace Org.OpenAPITools.Client
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
                 DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryStatusCodes = second.RetryStatusCodes ?? first.RetryStatusCodes,
-                MaxRetries = second.MaxRetries == 0 ? first.MaxRetries : second.MaxRetries
+                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
+                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
             };
             return config;
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 627c8ce406b..1797dcece2b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -14,6 +14,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using Polly;
+using Polly.Retry;
+using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -109,16 +111,16 @@ namespace Org.OpenAPITools.Client
         X509CertificateCollection ClientCertificates { get; }
 
         /// <summary>
-        /// Status codes to apply the retry policy
+        /// Gets the async version of Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>List of http status codes.</value>
-        IList<HttpStatusCode> RetryStatusCodes { get;}
+        /// <value>Async RetryPolicy</value>
+        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
 
         /// <summary>
-        /// Maximum number of retry attempts to make on given retry status codes.
+        /// Gets the Polly retry policy to be applied for retrying requests
         /// </summary>
-        /// <value>Maximum number of retries</value>
-        int MaxRetries { get;}
+        /// <value>RetryPolicy</value>
+        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
 
     }
 }
\ No newline at end of file
-- 
GitLab


From 5d743ed58e2ef650cc5bb299addcc3c209d79fbc Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Mon, 22 Jun 2020 12:32:48 +0530
Subject: [PATCH 03/12] fix(csharp): moving RetryConfiguration out of
 Configuration class

---
 .../languages/CSharpNetCoreClientCodegen.java |   1 +
 .../csharp-netcore/ApiClient.mustache         |   8 +-
 .../csharp-netcore/Configuration.mustache     |  20 +-
 .../IReadableConfiguration.mustache           |  17 --
 .../RetryConfiguration.mustache               |  11 +
 .../OpenAPIClient/.openapi-generator/FILES    | 249 +++++++++---------
 .../src/Org.OpenAPITools/Client/ApiClient.cs  |   8 +-
 .../Org.OpenAPITools/Client/Configuration.cs  |  20 +-
 .../Client/IReadableConfiguration.cs          |  17 --
 .../Client/RetryConfiguration.cs              |  11 +
 .../.openapi-generator/FILES                  | 249 +++++++++---------
 .../src/Org.OpenAPITools/Client/ApiClient.cs  |   8 +-
 .../Org.OpenAPITools/Client/Configuration.cs  |  20 +-
 .../Client/IReadableConfiguration.cs          |  17 --
 .../Client/RetryConfiguration.cs              |  11 +
 15 files changed, 299 insertions(+), 368 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs

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 2d2f563bf21..a2ce41be809 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
@@ -616,6 +616,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("ISynchronousClient.mustache", clientPackageDir, "ISynchronousClient.cs"));
         supportingFiles.add(new SupportingFile("RequestOptions.mustache", clientPackageDir, "RequestOptions.cs"));
         supportingFiles.add(new SupportingFile("Multimap.mustache", clientPackageDir, "Multimap.cs"));
+		supportingFiles.add(new SupportingFile("RetryConfiguration.mustache", clientPackageDir, "RetryConfiguration.cs"));
 
         supportingFiles.add(new SupportingFile("IReadableConfiguration.mustache",
                 clientPackageDir, "IReadableConfiguration.cs"));
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
index 3f715d04e64..450f91856a8 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
@@ -411,9 +411,9 @@ namespace {{packageName}}.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicy != null)	
+            if (RetryConfiguration.RetryPolicy != null)	
             {
-                var policy = configuration.RetryPolicy;
+                var policy = RetryConfiguration.RetryPolicy;
                 var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
@@ -496,9 +496,9 @@ namespace {{packageName}}.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicyAsync != null)
+            if (RetryConfiguration.AsyncRetryPolicy != null)
             {
-                var policy = configuration.RetryPolicyAsync;
+                var policy = RetryConfiguration.AsyncRetryPolicy;
                 var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
index 82d3b4c2dac..b15af47f40d 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
@@ -10,10 +10,6 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Net;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace {{packageName}}.Client
 {
@@ -340,18 +336,6 @@ namespace {{packageName}}.Client
             }
         }
 
-        /// <summary>
-        /// Get or set the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Get or set the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
         #endregion Properties
 
         #region Methods
@@ -431,9 +415,7 @@ namespace {{packageName}}.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
-                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
             };
             return config;
         }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
index 89f62b4ddf0..9a139514cc2 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
@@ -2,11 +2,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace {{packageName}}.Client
 {
@@ -100,18 +96,5 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
-
-        /// <summary>
-        /// Gets the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Gets the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
     }
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
new file mode 100644
index 00000000000..57508cca6c5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
@@ -0,0 +1,11 @@
+using Polly.Retry;
+using RestSharp;
+
+namespace {{packageName}}.Client
+{
+    public class RetryConfiguration
+    {
+        public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+        public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index 204de9da92a..b9c4ab99305 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -1,128 +1,129 @@
 .gitignore
 Org.OpenAPITools.sln
 README.md
-docs/AdditionalPropertiesAnyType.md
-docs/AdditionalPropertiesArray.md
-docs/AdditionalPropertiesBoolean.md
-docs/AdditionalPropertiesClass.md
-docs/AdditionalPropertiesInteger.md
-docs/AdditionalPropertiesNumber.md
-docs/AdditionalPropertiesObject.md
-docs/AdditionalPropertiesString.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ApiResponse.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/BigCat.md
-docs/BigCatAllOf.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/File.md
-docs/FileSchemaTestClass.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/List.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelClient.md
-docs/Name.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/Return.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/TypeHolderDefault.md
-docs/TypeHolderExample.md
-docs/User.md
-docs/UserApi.md
-docs/XmlItem.md
+docs\AdditionalPropertiesAnyType.md
+docs\AdditionalPropertiesArray.md
+docs\AdditionalPropertiesBoolean.md
+docs\AdditionalPropertiesClass.md
+docs\AdditionalPropertiesInteger.md
+docs\AdditionalPropertiesNumber.md
+docs\AdditionalPropertiesObject.md
+docs\AdditionalPropertiesString.md
+docs\Animal.md
+docs\AnotherFakeApi.md
+docs\ApiResponse.md
+docs\ArrayOfArrayOfNumberOnly.md
+docs\ArrayOfNumberOnly.md
+docs\ArrayTest.md
+docs\BigCat.md
+docs\BigCatAllOf.md
+docs\Capitalization.md
+docs\Cat.md
+docs\CatAllOf.md
+docs\Category.md
+docs\ClassModel.md
+docs\Dog.md
+docs\DogAllOf.md
+docs\EnumArrays.md
+docs\EnumClass.md
+docs\EnumTest.md
+docs\FakeApi.md
+docs\FakeClassnameTags123Api.md
+docs\File.md
+docs\FileSchemaTestClass.md
+docs\FormatTest.md
+docs\HasOnlyReadOnly.md
+docs\List.md
+docs\MapTest.md
+docs\MixedPropertiesAndAdditionalPropertiesClass.md
+docs\Model200Response.md
+docs\ModelClient.md
+docs\Name.md
+docs\NumberOnly.md
+docs\Order.md
+docs\OuterComposite.md
+docs\OuterEnum.md
+docs\Pet.md
+docs\PetApi.md
+docs\ReadOnlyFirst.md
+docs\Return.md
+docs\SpecialModelName.md
+docs\StoreApi.md
+docs\Tag.md
+docs\TypeHolderDefault.md
+docs\TypeHolderExample.md
+docs\User.md
+docs\UserApi.md
+docs\XmlItem.md
 git_push.sh
-src/Org.OpenAPITools/Api/AnotherFakeApi.cs
-src/Org.OpenAPITools/Api/FakeApi.cs
-src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/PetApi.cs
-src/Org.OpenAPITools/Api/StoreApi.cs
-src/Org.OpenAPITools/Api/UserApi.cs
-src/Org.OpenAPITools/Client/ApiClient.cs
-src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiResponse.cs
-src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/Configuration.cs
-src/Org.OpenAPITools/Client/ExceptionFactory.cs
-src/Org.OpenAPITools/Client/GlobalConfiguration.cs
-src/Org.OpenAPITools/Client/HttpMethod.cs
-src/Org.OpenAPITools/Client/IApiAccessor.cs
-src/Org.OpenAPITools/Client/IAsynchronousClient.cs
-src/Org.OpenAPITools/Client/IReadableConfiguration.cs
-src/Org.OpenAPITools/Client/ISynchronousClient.cs
-src/Org.OpenAPITools/Client/Multimap.cs
-src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
-src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs
-src/Org.OpenAPITools/Model/Animal.cs
-src/Org.OpenAPITools/Model/ApiResponse.cs
-src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayTest.cs
-src/Org.OpenAPITools/Model/BigCat.cs
-src/Org.OpenAPITools/Model/BigCatAllOf.cs
-src/Org.OpenAPITools/Model/Capitalization.cs
-src/Org.OpenAPITools/Model/Cat.cs
-src/Org.OpenAPITools/Model/CatAllOf.cs
-src/Org.OpenAPITools/Model/Category.cs
-src/Org.OpenAPITools/Model/ClassModel.cs
-src/Org.OpenAPITools/Model/Dog.cs
-src/Org.OpenAPITools/Model/DogAllOf.cs
-src/Org.OpenAPITools/Model/EnumArrays.cs
-src/Org.OpenAPITools/Model/EnumClass.cs
-src/Org.OpenAPITools/Model/EnumTest.cs
-src/Org.OpenAPITools/Model/File.cs
-src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
-src/Org.OpenAPITools/Model/FormatTest.cs
-src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
-src/Org.OpenAPITools/Model/List.cs
-src/Org.OpenAPITools/Model/MapTest.cs
-src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Model200Response.cs
-src/Org.OpenAPITools/Model/ModelClient.cs
-src/Org.OpenAPITools/Model/Name.cs
-src/Org.OpenAPITools/Model/NumberOnly.cs
-src/Org.OpenAPITools/Model/Order.cs
-src/Org.OpenAPITools/Model/OuterComposite.cs
-src/Org.OpenAPITools/Model/OuterEnum.cs
-src/Org.OpenAPITools/Model/Pet.cs
-src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
-src/Org.OpenAPITools/Model/Return.cs
-src/Org.OpenAPITools/Model/SpecialModelName.cs
-src/Org.OpenAPITools/Model/Tag.cs
-src/Org.OpenAPITools/Model/TypeHolderDefault.cs
-src/Org.OpenAPITools/Model/TypeHolderExample.cs
-src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src\Org.OpenAPITools\Api\AnotherFakeApi.cs
+src\Org.OpenAPITools\Api\FakeApi.cs
+src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
+src\Org.OpenAPITools\Api\PetApi.cs
+src\Org.OpenAPITools\Api\StoreApi.cs
+src\Org.OpenAPITools\Api\UserApi.cs
+src\Org.OpenAPITools\Client\ApiClient.cs
+src\Org.OpenAPITools\Client\ApiException.cs
+src\Org.OpenAPITools\Client\ApiResponse.cs
+src\Org.OpenAPITools\Client\ClientUtils.cs
+src\Org.OpenAPITools\Client\Configuration.cs
+src\Org.OpenAPITools\Client\ExceptionFactory.cs
+src\Org.OpenAPITools\Client\GlobalConfiguration.cs
+src\Org.OpenAPITools\Client\HttpMethod.cs
+src\Org.OpenAPITools\Client\IApiAccessor.cs
+src\Org.OpenAPITools\Client\IAsynchronousClient.cs
+src\Org.OpenAPITools\Client\IReadableConfiguration.cs
+src\Org.OpenAPITools\Client\ISynchronousClient.cs
+src\Org.OpenAPITools\Client\Multimap.cs
+src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
+src\Org.OpenAPITools\Client\RequestOptions.cs
+src\Org.OpenAPITools\Client\RetryConfiguration.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesAnyType.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesArray.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesBoolean.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesInteger.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesNumber.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesObject.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesString.cs
+src\Org.OpenAPITools\Model\Animal.cs
+src\Org.OpenAPITools\Model\ApiResponse.cs
+src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayTest.cs
+src\Org.OpenAPITools\Model\BigCat.cs
+src\Org.OpenAPITools\Model\BigCatAllOf.cs
+src\Org.OpenAPITools\Model\Capitalization.cs
+src\Org.OpenAPITools\Model\Cat.cs
+src\Org.OpenAPITools\Model\CatAllOf.cs
+src\Org.OpenAPITools\Model\Category.cs
+src\Org.OpenAPITools\Model\ClassModel.cs
+src\Org.OpenAPITools\Model\Dog.cs
+src\Org.OpenAPITools\Model\DogAllOf.cs
+src\Org.OpenAPITools\Model\EnumArrays.cs
+src\Org.OpenAPITools\Model\EnumClass.cs
+src\Org.OpenAPITools\Model\EnumTest.cs
+src\Org.OpenAPITools\Model\File.cs
+src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
+src\Org.OpenAPITools\Model\FormatTest.cs
+src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
+src\Org.OpenAPITools\Model\List.cs
+src\Org.OpenAPITools\Model\MapTest.cs
+src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Model200Response.cs
+src\Org.OpenAPITools\Model\ModelClient.cs
+src\Org.OpenAPITools\Model\Name.cs
+src\Org.OpenAPITools\Model\NumberOnly.cs
+src\Org.OpenAPITools\Model\Order.cs
+src\Org.OpenAPITools\Model\OuterComposite.cs
+src\Org.OpenAPITools\Model\OuterEnum.cs
+src\Org.OpenAPITools\Model\Pet.cs
+src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
+src\Org.OpenAPITools\Model\Return.cs
+src\Org.OpenAPITools\Model\SpecialModelName.cs
+src\Org.OpenAPITools\Model\Tag.cs
+src\Org.OpenAPITools\Model\TypeHolderDefault.cs
+src\Org.OpenAPITools\Model\TypeHolderExample.cs
+src\Org.OpenAPITools\Model\User.cs
+src\Org.OpenAPITools\Model\XmlItem.cs
+src\Org.OpenAPITools\Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
index 95643a32840..5a8ac00dafb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -414,9 +414,9 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicy != null)	
+            if (RetryConfiguration.RetryPolicy != null)	
             {
-                var policy = configuration.RetryPolicy;
+                var policy = RetryConfiguration.RetryPolicy;
                 var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
@@ -498,9 +498,9 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicyAsync != null)
+            if (RetryConfiguration.AsyncRetryPolicy != null)
             {
-                var policy = configuration.RetryPolicyAsync;
+                var policy = RetryConfiguration.AsyncRetryPolicy;
                 var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
index e72d0aad7f5..ac359e28419 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
@@ -17,10 +17,6 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Net;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -343,18 +339,6 @@ namespace Org.OpenAPITools.Client
             }
         }
 
-        /// <summary>
-        /// Get or set the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Get or set the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
         #endregion Properties
 
         #region Methods
@@ -426,9 +410,7 @@ namespace Org.OpenAPITools.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
-                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
             };
             return config;
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 1797dcece2b..b8084fae85b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -11,11 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -109,18 +105,5 @@ namespace Org.OpenAPITools.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
-
-        /// <summary>
-        /// Gets the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Gets the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
new file mode 100644
index 00000000000..20d0e23f382
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -0,0 +1,11 @@
+using Polly.Retry;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    public class RetryConfiguration
+    {
+        public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+        public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index 204de9da92a..b9c4ab99305 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -1,128 +1,129 @@
 .gitignore
 Org.OpenAPITools.sln
 README.md
-docs/AdditionalPropertiesAnyType.md
-docs/AdditionalPropertiesArray.md
-docs/AdditionalPropertiesBoolean.md
-docs/AdditionalPropertiesClass.md
-docs/AdditionalPropertiesInteger.md
-docs/AdditionalPropertiesNumber.md
-docs/AdditionalPropertiesObject.md
-docs/AdditionalPropertiesString.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ApiResponse.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/BigCat.md
-docs/BigCatAllOf.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/File.md
-docs/FileSchemaTestClass.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/List.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelClient.md
-docs/Name.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/Return.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/TypeHolderDefault.md
-docs/TypeHolderExample.md
-docs/User.md
-docs/UserApi.md
-docs/XmlItem.md
+docs\AdditionalPropertiesAnyType.md
+docs\AdditionalPropertiesArray.md
+docs\AdditionalPropertiesBoolean.md
+docs\AdditionalPropertiesClass.md
+docs\AdditionalPropertiesInteger.md
+docs\AdditionalPropertiesNumber.md
+docs\AdditionalPropertiesObject.md
+docs\AdditionalPropertiesString.md
+docs\Animal.md
+docs\AnotherFakeApi.md
+docs\ApiResponse.md
+docs\ArrayOfArrayOfNumberOnly.md
+docs\ArrayOfNumberOnly.md
+docs\ArrayTest.md
+docs\BigCat.md
+docs\BigCatAllOf.md
+docs\Capitalization.md
+docs\Cat.md
+docs\CatAllOf.md
+docs\Category.md
+docs\ClassModel.md
+docs\Dog.md
+docs\DogAllOf.md
+docs\EnumArrays.md
+docs\EnumClass.md
+docs\EnumTest.md
+docs\FakeApi.md
+docs\FakeClassnameTags123Api.md
+docs\File.md
+docs\FileSchemaTestClass.md
+docs\FormatTest.md
+docs\HasOnlyReadOnly.md
+docs\List.md
+docs\MapTest.md
+docs\MixedPropertiesAndAdditionalPropertiesClass.md
+docs\Model200Response.md
+docs\ModelClient.md
+docs\Name.md
+docs\NumberOnly.md
+docs\Order.md
+docs\OuterComposite.md
+docs\OuterEnum.md
+docs\Pet.md
+docs\PetApi.md
+docs\ReadOnlyFirst.md
+docs\Return.md
+docs\SpecialModelName.md
+docs\StoreApi.md
+docs\Tag.md
+docs\TypeHolderDefault.md
+docs\TypeHolderExample.md
+docs\User.md
+docs\UserApi.md
+docs\XmlItem.md
 git_push.sh
-src/Org.OpenAPITools/Api/AnotherFakeApi.cs
-src/Org.OpenAPITools/Api/FakeApi.cs
-src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/PetApi.cs
-src/Org.OpenAPITools/Api/StoreApi.cs
-src/Org.OpenAPITools/Api/UserApi.cs
-src/Org.OpenAPITools/Client/ApiClient.cs
-src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiResponse.cs
-src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/Configuration.cs
-src/Org.OpenAPITools/Client/ExceptionFactory.cs
-src/Org.OpenAPITools/Client/GlobalConfiguration.cs
-src/Org.OpenAPITools/Client/HttpMethod.cs
-src/Org.OpenAPITools/Client/IApiAccessor.cs
-src/Org.OpenAPITools/Client/IAsynchronousClient.cs
-src/Org.OpenAPITools/Client/IReadableConfiguration.cs
-src/Org.OpenAPITools/Client/ISynchronousClient.cs
-src/Org.OpenAPITools/Client/Multimap.cs
-src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
-src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs
-src/Org.OpenAPITools/Model/Animal.cs
-src/Org.OpenAPITools/Model/ApiResponse.cs
-src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayTest.cs
-src/Org.OpenAPITools/Model/BigCat.cs
-src/Org.OpenAPITools/Model/BigCatAllOf.cs
-src/Org.OpenAPITools/Model/Capitalization.cs
-src/Org.OpenAPITools/Model/Cat.cs
-src/Org.OpenAPITools/Model/CatAllOf.cs
-src/Org.OpenAPITools/Model/Category.cs
-src/Org.OpenAPITools/Model/ClassModel.cs
-src/Org.OpenAPITools/Model/Dog.cs
-src/Org.OpenAPITools/Model/DogAllOf.cs
-src/Org.OpenAPITools/Model/EnumArrays.cs
-src/Org.OpenAPITools/Model/EnumClass.cs
-src/Org.OpenAPITools/Model/EnumTest.cs
-src/Org.OpenAPITools/Model/File.cs
-src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
-src/Org.OpenAPITools/Model/FormatTest.cs
-src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
-src/Org.OpenAPITools/Model/List.cs
-src/Org.OpenAPITools/Model/MapTest.cs
-src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Model200Response.cs
-src/Org.OpenAPITools/Model/ModelClient.cs
-src/Org.OpenAPITools/Model/Name.cs
-src/Org.OpenAPITools/Model/NumberOnly.cs
-src/Org.OpenAPITools/Model/Order.cs
-src/Org.OpenAPITools/Model/OuterComposite.cs
-src/Org.OpenAPITools/Model/OuterEnum.cs
-src/Org.OpenAPITools/Model/Pet.cs
-src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
-src/Org.OpenAPITools/Model/Return.cs
-src/Org.OpenAPITools/Model/SpecialModelName.cs
-src/Org.OpenAPITools/Model/Tag.cs
-src/Org.OpenAPITools/Model/TypeHolderDefault.cs
-src/Org.OpenAPITools/Model/TypeHolderExample.cs
-src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src\Org.OpenAPITools\Api\AnotherFakeApi.cs
+src\Org.OpenAPITools\Api\FakeApi.cs
+src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
+src\Org.OpenAPITools\Api\PetApi.cs
+src\Org.OpenAPITools\Api\StoreApi.cs
+src\Org.OpenAPITools\Api\UserApi.cs
+src\Org.OpenAPITools\Client\ApiClient.cs
+src\Org.OpenAPITools\Client\ApiException.cs
+src\Org.OpenAPITools\Client\ApiResponse.cs
+src\Org.OpenAPITools\Client\ClientUtils.cs
+src\Org.OpenAPITools\Client\Configuration.cs
+src\Org.OpenAPITools\Client\ExceptionFactory.cs
+src\Org.OpenAPITools\Client\GlobalConfiguration.cs
+src\Org.OpenAPITools\Client\HttpMethod.cs
+src\Org.OpenAPITools\Client\IApiAccessor.cs
+src\Org.OpenAPITools\Client\IAsynchronousClient.cs
+src\Org.OpenAPITools\Client\IReadableConfiguration.cs
+src\Org.OpenAPITools\Client\ISynchronousClient.cs
+src\Org.OpenAPITools\Client\Multimap.cs
+src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
+src\Org.OpenAPITools\Client\RequestOptions.cs
+src\Org.OpenAPITools\Client\RetryConfiguration.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesAnyType.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesArray.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesBoolean.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesInteger.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesNumber.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesObject.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesString.cs
+src\Org.OpenAPITools\Model\Animal.cs
+src\Org.OpenAPITools\Model\ApiResponse.cs
+src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayTest.cs
+src\Org.OpenAPITools\Model\BigCat.cs
+src\Org.OpenAPITools\Model\BigCatAllOf.cs
+src\Org.OpenAPITools\Model\Capitalization.cs
+src\Org.OpenAPITools\Model\Cat.cs
+src\Org.OpenAPITools\Model\CatAllOf.cs
+src\Org.OpenAPITools\Model\Category.cs
+src\Org.OpenAPITools\Model\ClassModel.cs
+src\Org.OpenAPITools\Model\Dog.cs
+src\Org.OpenAPITools\Model\DogAllOf.cs
+src\Org.OpenAPITools\Model\EnumArrays.cs
+src\Org.OpenAPITools\Model\EnumClass.cs
+src\Org.OpenAPITools\Model\EnumTest.cs
+src\Org.OpenAPITools\Model\File.cs
+src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
+src\Org.OpenAPITools\Model\FormatTest.cs
+src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
+src\Org.OpenAPITools\Model\List.cs
+src\Org.OpenAPITools\Model\MapTest.cs
+src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Model200Response.cs
+src\Org.OpenAPITools\Model\ModelClient.cs
+src\Org.OpenAPITools\Model\Name.cs
+src\Org.OpenAPITools\Model\NumberOnly.cs
+src\Org.OpenAPITools\Model\Order.cs
+src\Org.OpenAPITools\Model\OuterComposite.cs
+src\Org.OpenAPITools\Model\OuterEnum.cs
+src\Org.OpenAPITools\Model\Pet.cs
+src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
+src\Org.OpenAPITools\Model\Return.cs
+src\Org.OpenAPITools\Model\SpecialModelName.cs
+src\Org.OpenAPITools\Model\Tag.cs
+src\Org.OpenAPITools\Model\TypeHolderDefault.cs
+src\Org.OpenAPITools\Model\TypeHolderExample.cs
+src\Org.OpenAPITools\Model\User.cs
+src\Org.OpenAPITools\Model\XmlItem.cs
+src\Org.OpenAPITools\Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
index d16642bd515..2fd7fafaf74 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -415,9 +415,9 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicy != null)	
+            if (RetryConfiguration.RetryPolicy != null)	
             {
-                var policy = configuration.RetryPolicy;
+                var policy = RetryConfiguration.RetryPolicy;
                 var policyResult = policy.ExecuteAndCapture(() => client.Execute(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
@@ -499,9 +499,9 @@ namespace Org.OpenAPITools.Client
             InterceptRequest(req);
 
             IRestResponse<T> response;
-            if (configuration.RetryPolicyAsync != null)
+            if (RetryConfiguration.AsyncRetryPolicy != null)
             {
-                var policy = configuration.RetryPolicyAsync;
+                var policy = RetryConfiguration.AsyncRetryPolicy;
                 var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req));
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
index 68df556bff4..a87a9584671 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
@@ -17,10 +17,6 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Net;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -347,18 +343,6 @@ namespace Org.OpenAPITools.Client
             }
         }
 
-        /// <summary>
-        /// Get or set the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        public AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Get or set the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        public RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
         #endregion Properties
 
         #region Methods
@@ -431,9 +415,7 @@ namespace Org.OpenAPITools.Client
                 Password = second.Password ?? first.Password,
                 AccessToken = second.AccessToken ?? first.AccessToken,
                 TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
-                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
-                RetryPolicyAsync = second.RetryPolicyAsync ?? first.RetryPolicyAsync,
-                RetryPolicy = second.RetryPolicy ?? first.RetryPolicy
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat
             };
             return config;
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 1797dcece2b..b8084fae85b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -11,11 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using Polly;
-using Polly.Retry;
-using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
@@ -109,18 +105,5 @@ namespace Org.OpenAPITools.Client
         /// </summary>
         /// <value>X509 Certificate collection.</value>
         X509CertificateCollection ClientCertificates { get; }
-
-        /// <summary>
-        /// Gets the async version of Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>Async RetryPolicy</value>
-        AsyncRetryPolicy<IRestResponse> RetryPolicyAsync { get; set; }
-
-        /// <summary>
-        /// Gets the Polly retry policy to be applied for retrying requests
-        /// </summary>
-        /// <value>RetryPolicy</value>
-        RetryPolicy<IRestResponse> RetryPolicy { get; set; }
-
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
new file mode 100644
index 00000000000..20d0e23f382
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -0,0 +1,11 @@
+using Polly.Retry;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    public class RetryConfiguration
+    {
+        public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+        public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
+    }
+}
\ No newline at end of file
-- 
GitLab


From 7956383011c6a116a6e62a7bdc621600186c3795 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Mon, 22 Jun 2020 15:51:03 +0530
Subject: [PATCH 04/12] fix(csharp): minor changes

---
 .../RetryConfiguration.mustache               |  10 +
 .../OpenAPIClient/.openapi-generator/FILES    | 250 +++++++++---------
 .../Client/RetryConfiguration.cs              |  10 +
 .../.openapi-generator/FILES                  | 250 +++++++++---------
 .../Client/RetryConfiguration.cs              |  10 +
 5 files changed, 280 insertions(+), 250 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
index 57508cca6c5..8926f922c4b 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache
@@ -3,9 +3,19 @@ using RestSharp;
 
 namespace {{packageName}}.Client
 {
+    /// <summary>
+    /// Configuration class to set the polly retry policies to be applied to the requests.
+    /// </summary>
     public class RetryConfiguration
     {
+        /// <summary>
+        /// Retry policy
+        /// </summary>
         public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+
+        /// <summary>
+        /// Async retry policy
+        /// </summary>
         public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index b9c4ab99305..b7f8ca998e8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -1,129 +1,129 @@
 .gitignore
 Org.OpenAPITools.sln
 README.md
-docs\AdditionalPropertiesAnyType.md
-docs\AdditionalPropertiesArray.md
-docs\AdditionalPropertiesBoolean.md
-docs\AdditionalPropertiesClass.md
-docs\AdditionalPropertiesInteger.md
-docs\AdditionalPropertiesNumber.md
-docs\AdditionalPropertiesObject.md
-docs\AdditionalPropertiesString.md
-docs\Animal.md
-docs\AnotherFakeApi.md
-docs\ApiResponse.md
-docs\ArrayOfArrayOfNumberOnly.md
-docs\ArrayOfNumberOnly.md
-docs\ArrayTest.md
-docs\BigCat.md
-docs\BigCatAllOf.md
-docs\Capitalization.md
-docs\Cat.md
-docs\CatAllOf.md
-docs\Category.md
-docs\ClassModel.md
-docs\Dog.md
-docs\DogAllOf.md
-docs\EnumArrays.md
-docs\EnumClass.md
-docs\EnumTest.md
-docs\FakeApi.md
-docs\FakeClassnameTags123Api.md
-docs\File.md
-docs\FileSchemaTestClass.md
-docs\FormatTest.md
-docs\HasOnlyReadOnly.md
-docs\List.md
-docs\MapTest.md
-docs\MixedPropertiesAndAdditionalPropertiesClass.md
-docs\Model200Response.md
-docs\ModelClient.md
-docs\Name.md
-docs\NumberOnly.md
-docs\Order.md
-docs\OuterComposite.md
-docs\OuterEnum.md
-docs\Pet.md
-docs\PetApi.md
-docs\ReadOnlyFirst.md
-docs\Return.md
-docs\SpecialModelName.md
-docs\StoreApi.md
-docs\Tag.md
-docs\TypeHolderDefault.md
-docs\TypeHolderExample.md
-docs\User.md
-docs\UserApi.md
-docs\XmlItem.md
+docs/AdditionalPropertiesAnyType.md
+docs/AdditionalPropertiesArray.md
+docs/AdditionalPropertiesBoolean.md
+docs/AdditionalPropertiesClass.md
+docs/AdditionalPropertiesInteger.md
+docs/AdditionalPropertiesNumber.md
+docs/AdditionalPropertiesObject.md
+docs/AdditionalPropertiesString.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/BigCat.md
+docs/BigCatAllOf.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/File.md
+docs/FileSchemaTestClass.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Model200Response.md
+docs/ModelClient.md
+docs/Name.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/TypeHolderDefault.md
+docs/TypeHolderExample.md
+docs/User.md
+docs/UserApi.md
+docs/XmlItem.md
 git_push.sh
-src\Org.OpenAPITools\Api\AnotherFakeApi.cs
-src\Org.OpenAPITools\Api\FakeApi.cs
-src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
-src\Org.OpenAPITools\Api\PetApi.cs
-src\Org.OpenAPITools\Api\StoreApi.cs
-src\Org.OpenAPITools\Api\UserApi.cs
-src\Org.OpenAPITools\Client\ApiClient.cs
-src\Org.OpenAPITools\Client\ApiException.cs
-src\Org.OpenAPITools\Client\ApiResponse.cs
-src\Org.OpenAPITools\Client\ClientUtils.cs
-src\Org.OpenAPITools\Client\Configuration.cs
-src\Org.OpenAPITools\Client\ExceptionFactory.cs
-src\Org.OpenAPITools\Client\GlobalConfiguration.cs
-src\Org.OpenAPITools\Client\HttpMethod.cs
-src\Org.OpenAPITools\Client\IApiAccessor.cs
-src\Org.OpenAPITools\Client\IAsynchronousClient.cs
-src\Org.OpenAPITools\Client\IReadableConfiguration.cs
-src\Org.OpenAPITools\Client\ISynchronousClient.cs
-src\Org.OpenAPITools\Client\Multimap.cs
-src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
-src\Org.OpenAPITools\Client\RequestOptions.cs
-src\Org.OpenAPITools\Client\RetryConfiguration.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesAnyType.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesArray.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesBoolean.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesInteger.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesNumber.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesObject.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesString.cs
-src\Org.OpenAPITools\Model\Animal.cs
-src\Org.OpenAPITools\Model\ApiResponse.cs
-src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayTest.cs
-src\Org.OpenAPITools\Model\BigCat.cs
-src\Org.OpenAPITools\Model\BigCatAllOf.cs
-src\Org.OpenAPITools\Model\Capitalization.cs
-src\Org.OpenAPITools\Model\Cat.cs
-src\Org.OpenAPITools\Model\CatAllOf.cs
-src\Org.OpenAPITools\Model\Category.cs
-src\Org.OpenAPITools\Model\ClassModel.cs
-src\Org.OpenAPITools\Model\Dog.cs
-src\Org.OpenAPITools\Model\DogAllOf.cs
-src\Org.OpenAPITools\Model\EnumArrays.cs
-src\Org.OpenAPITools\Model\EnumClass.cs
-src\Org.OpenAPITools\Model\EnumTest.cs
-src\Org.OpenAPITools\Model\File.cs
-src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
-src\Org.OpenAPITools\Model\FormatTest.cs
-src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
-src\Org.OpenAPITools\Model\List.cs
-src\Org.OpenAPITools\Model\MapTest.cs
-src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Model200Response.cs
-src\Org.OpenAPITools\Model\ModelClient.cs
-src\Org.OpenAPITools\Model\Name.cs
-src\Org.OpenAPITools\Model\NumberOnly.cs
-src\Org.OpenAPITools\Model\Order.cs
-src\Org.OpenAPITools\Model\OuterComposite.cs
-src\Org.OpenAPITools\Model\OuterEnum.cs
-src\Org.OpenAPITools\Model\Pet.cs
-src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
-src\Org.OpenAPITools\Model\Return.cs
-src\Org.OpenAPITools\Model\SpecialModelName.cs
-src\Org.OpenAPITools\Model\Tag.cs
-src\Org.OpenAPITools\Model\TypeHolderDefault.cs
-src\Org.OpenAPITools\Model\TypeHolderExample.cs
-src\Org.OpenAPITools\Model\User.cs
-src\Org.OpenAPITools\Model\XmlItem.cs
-src\Org.OpenAPITools\Org.OpenAPITools.csproj
+src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+src/Org.OpenAPITools/Api/FakeApi.cs
+src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/PetApi.cs
+src/Org.OpenAPITools/Api/StoreApi.cs
+src/Org.OpenAPITools/Api/UserApi.cs
+src/Org.OpenAPITools/Client/ApiClient.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiResponse.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/Configuration.cs
+src/Org.OpenAPITools/Client/ExceptionFactory.cs
+src/Org.OpenAPITools/Client/GlobalConfiguration.cs
+src/Org.OpenAPITools/Client/HttpMethod.cs
+src/Org.OpenAPITools/Client/IApiAccessor.cs
+src/Org.OpenAPITools/Client/IAsynchronousClient.cs
+src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+src/Org.OpenAPITools/Client/ISynchronousClient.cs
+src/Org.OpenAPITools/Client/Multimap.cs
+src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
+src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs
+src/Org.OpenAPITools/Model/Animal.cs
+src/Org.OpenAPITools/Model/ApiResponse.cs
+src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayTest.cs
+src/Org.OpenAPITools/Model/BigCat.cs
+src/Org.OpenAPITools/Model/BigCatAllOf.cs
+src/Org.OpenAPITools/Model/Capitalization.cs
+src/Org.OpenAPITools/Model/Cat.cs
+src/Org.OpenAPITools/Model/CatAllOf.cs
+src/Org.OpenAPITools/Model/Category.cs
+src/Org.OpenAPITools/Model/ClassModel.cs
+src/Org.OpenAPITools/Model/Dog.cs
+src/Org.OpenAPITools/Model/DogAllOf.cs
+src/Org.OpenAPITools/Model/EnumArrays.cs
+src/Org.OpenAPITools/Model/EnumClass.cs
+src/Org.OpenAPITools/Model/EnumTest.cs
+src/Org.OpenAPITools/Model/File.cs
+src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
+src/Org.OpenAPITools/Model/FormatTest.cs
+src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
+src/Org.OpenAPITools/Model/List.cs
+src/Org.OpenAPITools/Model/MapTest.cs
+src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Model200Response.cs
+src/Org.OpenAPITools/Model/ModelClient.cs
+src/Org.OpenAPITools/Model/Name.cs
+src/Org.OpenAPITools/Model/NumberOnly.cs
+src/Org.OpenAPITools/Model/Order.cs
+src/Org.OpenAPITools/Model/OuterComposite.cs
+src/Org.OpenAPITools/Model/OuterEnum.cs
+src/Org.OpenAPITools/Model/Pet.cs
+src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
+src/Org.OpenAPITools/Model/Return.cs
+src/Org.OpenAPITools/Model/SpecialModelName.cs
+src/Org.OpenAPITools/Model/Tag.cs
+src/Org.OpenAPITools/Model/TypeHolderDefault.cs
+src/Org.OpenAPITools/Model/TypeHolderExample.cs
+src/Org.OpenAPITools/Model/User.cs
+src/Org.OpenAPITools/Model/XmlItem.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
index 20d0e23f382..0a8f3f9d07b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -3,9 +3,19 @@ using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
+    /// <summary>
+    /// Configuration class to set the polly retry policies to be applied to the requests.
+    /// </summary>
     public class RetryConfiguration
     {
+        /// <summary>
+        /// Retry policy
+        /// </summary>
         public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+
+        /// <summary>
+        /// Async retry policy
+        /// </summary>
         public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index b9c4ab99305..b7f8ca998e8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -1,129 +1,129 @@
 .gitignore
 Org.OpenAPITools.sln
 README.md
-docs\AdditionalPropertiesAnyType.md
-docs\AdditionalPropertiesArray.md
-docs\AdditionalPropertiesBoolean.md
-docs\AdditionalPropertiesClass.md
-docs\AdditionalPropertiesInteger.md
-docs\AdditionalPropertiesNumber.md
-docs\AdditionalPropertiesObject.md
-docs\AdditionalPropertiesString.md
-docs\Animal.md
-docs\AnotherFakeApi.md
-docs\ApiResponse.md
-docs\ArrayOfArrayOfNumberOnly.md
-docs\ArrayOfNumberOnly.md
-docs\ArrayTest.md
-docs\BigCat.md
-docs\BigCatAllOf.md
-docs\Capitalization.md
-docs\Cat.md
-docs\CatAllOf.md
-docs\Category.md
-docs\ClassModel.md
-docs\Dog.md
-docs\DogAllOf.md
-docs\EnumArrays.md
-docs\EnumClass.md
-docs\EnumTest.md
-docs\FakeApi.md
-docs\FakeClassnameTags123Api.md
-docs\File.md
-docs\FileSchemaTestClass.md
-docs\FormatTest.md
-docs\HasOnlyReadOnly.md
-docs\List.md
-docs\MapTest.md
-docs\MixedPropertiesAndAdditionalPropertiesClass.md
-docs\Model200Response.md
-docs\ModelClient.md
-docs\Name.md
-docs\NumberOnly.md
-docs\Order.md
-docs\OuterComposite.md
-docs\OuterEnum.md
-docs\Pet.md
-docs\PetApi.md
-docs\ReadOnlyFirst.md
-docs\Return.md
-docs\SpecialModelName.md
-docs\StoreApi.md
-docs\Tag.md
-docs\TypeHolderDefault.md
-docs\TypeHolderExample.md
-docs\User.md
-docs\UserApi.md
-docs\XmlItem.md
+docs/AdditionalPropertiesAnyType.md
+docs/AdditionalPropertiesArray.md
+docs/AdditionalPropertiesBoolean.md
+docs/AdditionalPropertiesClass.md
+docs/AdditionalPropertiesInteger.md
+docs/AdditionalPropertiesNumber.md
+docs/AdditionalPropertiesObject.md
+docs/AdditionalPropertiesString.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/BigCat.md
+docs/BigCatAllOf.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/File.md
+docs/FileSchemaTestClass.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Model200Response.md
+docs/ModelClient.md
+docs/Name.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/TypeHolderDefault.md
+docs/TypeHolderExample.md
+docs/User.md
+docs/UserApi.md
+docs/XmlItem.md
 git_push.sh
-src\Org.OpenAPITools\Api\AnotherFakeApi.cs
-src\Org.OpenAPITools\Api\FakeApi.cs
-src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
-src\Org.OpenAPITools\Api\PetApi.cs
-src\Org.OpenAPITools\Api\StoreApi.cs
-src\Org.OpenAPITools\Api\UserApi.cs
-src\Org.OpenAPITools\Client\ApiClient.cs
-src\Org.OpenAPITools\Client\ApiException.cs
-src\Org.OpenAPITools\Client\ApiResponse.cs
-src\Org.OpenAPITools\Client\ClientUtils.cs
-src\Org.OpenAPITools\Client\Configuration.cs
-src\Org.OpenAPITools\Client\ExceptionFactory.cs
-src\Org.OpenAPITools\Client\GlobalConfiguration.cs
-src\Org.OpenAPITools\Client\HttpMethod.cs
-src\Org.OpenAPITools\Client\IApiAccessor.cs
-src\Org.OpenAPITools\Client\IAsynchronousClient.cs
-src\Org.OpenAPITools\Client\IReadableConfiguration.cs
-src\Org.OpenAPITools\Client\ISynchronousClient.cs
-src\Org.OpenAPITools\Client\Multimap.cs
-src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
-src\Org.OpenAPITools\Client\RequestOptions.cs
-src\Org.OpenAPITools\Client\RetryConfiguration.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesAnyType.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesArray.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesBoolean.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesInteger.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesNumber.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesObject.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesString.cs
-src\Org.OpenAPITools\Model\Animal.cs
-src\Org.OpenAPITools\Model\ApiResponse.cs
-src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayTest.cs
-src\Org.OpenAPITools\Model\BigCat.cs
-src\Org.OpenAPITools\Model\BigCatAllOf.cs
-src\Org.OpenAPITools\Model\Capitalization.cs
-src\Org.OpenAPITools\Model\Cat.cs
-src\Org.OpenAPITools\Model\CatAllOf.cs
-src\Org.OpenAPITools\Model\Category.cs
-src\Org.OpenAPITools\Model\ClassModel.cs
-src\Org.OpenAPITools\Model\Dog.cs
-src\Org.OpenAPITools\Model\DogAllOf.cs
-src\Org.OpenAPITools\Model\EnumArrays.cs
-src\Org.OpenAPITools\Model\EnumClass.cs
-src\Org.OpenAPITools\Model\EnumTest.cs
-src\Org.OpenAPITools\Model\File.cs
-src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
-src\Org.OpenAPITools\Model\FormatTest.cs
-src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
-src\Org.OpenAPITools\Model\List.cs
-src\Org.OpenAPITools\Model\MapTest.cs
-src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Model200Response.cs
-src\Org.OpenAPITools\Model\ModelClient.cs
-src\Org.OpenAPITools\Model\Name.cs
-src\Org.OpenAPITools\Model\NumberOnly.cs
-src\Org.OpenAPITools\Model\Order.cs
-src\Org.OpenAPITools\Model\OuterComposite.cs
-src\Org.OpenAPITools\Model\OuterEnum.cs
-src\Org.OpenAPITools\Model\Pet.cs
-src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
-src\Org.OpenAPITools\Model\Return.cs
-src\Org.OpenAPITools\Model\SpecialModelName.cs
-src\Org.OpenAPITools\Model\Tag.cs
-src\Org.OpenAPITools\Model\TypeHolderDefault.cs
-src\Org.OpenAPITools\Model\TypeHolderExample.cs
-src\Org.OpenAPITools\Model\User.cs
-src\Org.OpenAPITools\Model\XmlItem.cs
-src\Org.OpenAPITools\Org.OpenAPITools.csproj
+src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+src/Org.OpenAPITools/Api/FakeApi.cs
+src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/PetApi.cs
+src/Org.OpenAPITools/Api/StoreApi.cs
+src/Org.OpenAPITools/Api/UserApi.cs
+src/Org.OpenAPITools/Client/ApiClient.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiResponse.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/Configuration.cs
+src/Org.OpenAPITools/Client/ExceptionFactory.cs
+src/Org.OpenAPITools/Client/GlobalConfiguration.cs
+src/Org.OpenAPITools/Client/HttpMethod.cs
+src/Org.OpenAPITools/Client/IApiAccessor.cs
+src/Org.OpenAPITools/Client/IAsynchronousClient.cs
+src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+src/Org.OpenAPITools/Client/ISynchronousClient.cs
+src/Org.OpenAPITools/Client/Multimap.cs
+src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
+src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs
+src/Org.OpenAPITools/Model/Animal.cs
+src/Org.OpenAPITools/Model/ApiResponse.cs
+src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayTest.cs
+src/Org.OpenAPITools/Model/BigCat.cs
+src/Org.OpenAPITools/Model/BigCatAllOf.cs
+src/Org.OpenAPITools/Model/Capitalization.cs
+src/Org.OpenAPITools/Model/Cat.cs
+src/Org.OpenAPITools/Model/CatAllOf.cs
+src/Org.OpenAPITools/Model/Category.cs
+src/Org.OpenAPITools/Model/ClassModel.cs
+src/Org.OpenAPITools/Model/Dog.cs
+src/Org.OpenAPITools/Model/DogAllOf.cs
+src/Org.OpenAPITools/Model/EnumArrays.cs
+src/Org.OpenAPITools/Model/EnumClass.cs
+src/Org.OpenAPITools/Model/EnumTest.cs
+src/Org.OpenAPITools/Model/File.cs
+src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
+src/Org.OpenAPITools/Model/FormatTest.cs
+src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
+src/Org.OpenAPITools/Model/List.cs
+src/Org.OpenAPITools/Model/MapTest.cs
+src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Model200Response.cs
+src/Org.OpenAPITools/Model/ModelClient.cs
+src/Org.OpenAPITools/Model/Name.cs
+src/Org.OpenAPITools/Model/NumberOnly.cs
+src/Org.OpenAPITools/Model/Order.cs
+src/Org.OpenAPITools/Model/OuterComposite.cs
+src/Org.OpenAPITools/Model/OuterEnum.cs
+src/Org.OpenAPITools/Model/Pet.cs
+src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
+src/Org.OpenAPITools/Model/Return.cs
+src/Org.OpenAPITools/Model/SpecialModelName.cs
+src/Org.OpenAPITools/Model/Tag.cs
+src/Org.OpenAPITools/Model/TypeHolderDefault.cs
+src/Org.OpenAPITools/Model/TypeHolderExample.cs
+src/Org.OpenAPITools/Model/User.cs
+src/Org.OpenAPITools/Model/XmlItem.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
index 20d0e23f382..0a8f3f9d07b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -3,9 +3,19 @@ using RestSharp;
 
 namespace Org.OpenAPITools.Client
 {
+    /// <summary>
+    /// Configuration class to set the polly retry policies to be applied to the requests.
+    /// </summary>
     public class RetryConfiguration
     {
+        /// <summary>
+        /// Retry policy
+        /// </summary>
         public static RetryPolicy<IRestResponse> RetryPolicy { get; set; }
+
+        /// <summary>
+        /// Async retry policy
+        /// </summary>
         public static AsyncRetryPolicy<IRestResponse> AsyncRetryPolicy { get; set; }
     }
 }
\ No newline at end of file
-- 
GitLab


From f167dd4426daa0c9ca97be8afcc1d752b90628fc Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Tue, 23 Jun 2020 16:15:29 +0530
Subject: [PATCH 05/12] fix(csharp): fixing tabs

---
 .../codegen/languages/CSharpNetCoreClientCodegen.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a2ce41be809..2f59070552a 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
@@ -616,7 +616,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("ISynchronousClient.mustache", clientPackageDir, "ISynchronousClient.cs"));
         supportingFiles.add(new SupportingFile("RequestOptions.mustache", clientPackageDir, "RequestOptions.cs"));
         supportingFiles.add(new SupportingFile("Multimap.mustache", clientPackageDir, "Multimap.cs"));
-		supportingFiles.add(new SupportingFile("RetryConfiguration.mustache", clientPackageDir, "RetryConfiguration.cs"));
+        supportingFiles.add(new SupportingFile("RetryConfiguration.mustache", clientPackageDir, "RetryConfiguration.cs"));
 
         supportingFiles.add(new SupportingFile("IReadableConfiguration.mustache",
                 clientPackageDir, "IReadableConfiguration.cs"));
-- 
GitLab


From 2f92656f08620a06236326dab791f777615ffb59 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Tue, 23 Jun 2020 18:28:31 +0530
Subject: [PATCH 06/12] fix(csharp): reverting FILES

---
 .../csharp-netcore/OpenAPIClient/.openapi-generator/FILES        | 1 -
 .../csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index b7f8ca998e8..935ecd71499 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -77,7 +77,6 @@ src/Org.OpenAPITools/Client/ISynchronousClient.cs
 src/Org.OpenAPITools/Client/Multimap.cs
 src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Client/RetryConfiguration.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index b7f8ca998e8..935ecd71499 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -77,7 +77,6 @@ src/Org.OpenAPITools/Client/ISynchronousClient.cs
 src/Org.OpenAPITools/Client/Multimap.cs
 src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Client/RetryConfiguration.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-- 
GitLab


From ff2898417740478a3e92b6af364e324db4226b05 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Wed, 24 Jun 2020 10:51:16 +0530
Subject: [PATCH 07/12] fix(csharp) :reverting some file changes

---
 .../csharp-netcore/OpenAPIClient/.openapi-generator/FILES      | 3 +--
 .../csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index 935ecd71499..e4beea2806a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -124,5 +124,4 @@ src/Org.OpenAPITools/Model/Tag.cs
 src/Org.OpenAPITools/Model/TypeHolderDefault.cs
 src/Org.OpenAPITools/Model/TypeHolderExample.cs
 src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
\ No newline at end of file
+src/Org.OpenAPITools/Model/XmlItem.cs
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index 935ecd71499..e4beea2806a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -124,5 +124,4 @@ src/Org.OpenAPITools/Model/Tag.cs
 src/Org.OpenAPITools/Model/TypeHolderDefault.cs
 src/Org.OpenAPITools/Model/TypeHolderExample.cs
 src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
\ No newline at end of file
+src/Org.OpenAPITools/Model/XmlItem.cs
\ No newline at end of file
-- 
GitLab


From c5b7ab9f9dc8034156d8e5fda0e26cb2254cc8d3 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Wed, 24 Jun 2020 10:59:12 +0530
Subject: [PATCH 08/12] fix(csharp): reverting changes

---
 .../csharp-netcore/OpenAPIClient/.openapi-generator/FILES      | 3 ++-
 .../csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index e4beea2806a..204de9da92a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -124,4 +124,5 @@ src/Org.OpenAPITools/Model/Tag.cs
 src/Org.OpenAPITools/Model/TypeHolderDefault.cs
 src/Org.OpenAPITools/Model/TypeHolderExample.cs
 src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
\ No newline at end of file
+src/Org.OpenAPITools/Model/XmlItem.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index e4beea2806a..204de9da92a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -124,4 +124,5 @@ src/Org.OpenAPITools/Model/Tag.cs
 src/Org.OpenAPITools/Model/TypeHolderDefault.cs
 src/Org.OpenAPITools/Model/TypeHolderExample.cs
 src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Model/XmlItem.cs
\ No newline at end of file
+src/Org.OpenAPITools/Model/XmlItem.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
-- 
GitLab


From e0b188c1213785a525b44a7e7744037dab6d5381 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 30 Jun 2020 17:26:40 +0800
Subject: [PATCH 09/12] update samples

---
 .../csharp-netcore/OpenAPIClient/.openapi-generator/FILES        | 1 +
 .../csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index 204de9da92a..cd1afe55307 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -77,6 +77,7 @@ src/Org.OpenAPITools/Client/ISynchronousClient.cs
 src/Org.OpenAPITools/Client/Multimap.cs
 src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index 204de9da92a..cd1afe55307 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -77,6 +77,7 @@ src/Org.OpenAPITools/Client/ISynchronousClient.cs
 src/Org.OpenAPITools/Client/Multimap.cs
 src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-- 
GitLab


From ad602514875bdb13c91eb6219e4ba62988863499 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Tue, 18 Aug 2020 15:19:29 +0530
Subject: [PATCH 10/12] fix(csharp-retry) : fixing merge conflicts and build
 failure

---
 .../src/main/resources/csharp-netcore/ApiClient.mustache      | 2 +-
 .../OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs    | 4 ++--
 .../src/Org.OpenAPITools/Org.OpenAPITools.csproj              | 2 +-
 .../src/Org.OpenAPITools/Client/ApiClient.cs                  | 2 +-
 .../src/Org.OpenAPITools/Org.OpenAPITools.csproj              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
index d16ff58761f..d0c10be558c 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
@@ -523,7 +523,7 @@ namespace {{packageName}}.Client
             if (RetryConfiguration.AsyncRetryPolicy != null)
             {
                 var policy = RetryConfiguration.AsyncRetryPolicy;
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req, cancellationToken).ConfigureAwait(false));
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req, cancellationToken)).ConfigureAwait(false);
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
index 187d47ce7b1..165cb43a233 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -526,7 +526,7 @@ namespace Org.OpenAPITools.Client
             if (RetryConfiguration.AsyncRetryPolicy != null)
             {
                 var policy = RetryConfiguration.AsyncRetryPolicy;
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync<T>(req, cancellationToken).ConfigureAwait(false));
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req, cancellationToken)).ConfigureAwait(false);
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
@@ -535,7 +535,7 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                 response = client.ExecuteAsync<T>(req, cancellationToken).ConfigureAwait(false);
+                 response = await client.ExecuteAsync<T>(req, cancellationToken).ConfigureAwait(false);
             }
 
             InterceptResponse(req, response);
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 3614bd10949..565cada04ef 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="JsonSubTypes" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RestSharp" Version="106.11.4" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="Polly" Version="7.2.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
index e2de99e4b87..0a8c9a3ed24 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -527,7 +527,7 @@ namespace Org.OpenAPITools.Client
             if (RetryConfiguration.AsyncRetryPolicy != null)
             {
                 var policy = RetryConfiguration.AsyncRetryPolicy;
-                var policyResult = await policy.ExecuteAndCaptureAsync(() => await client.ExecuteAsync<T>(req, cancellationToken).ConfigureAwait(false));
+                var policyResult = await policy.ExecuteAndCaptureAsync(() => client.ExecuteAsync(req, cancellationToken)).ConfigureAwait(false);
                 response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>
                 {
                     Request = req,
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 3ef32468eca..1c6de6f87e9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="JsonSubTypes" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RestSharp" Version="106.11.4" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="Polly" Version="7.2.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
 </Project>
-- 
GitLab


From 65d703be155d3f093e17b7beb8a13159020826c7 Mon Sep 17 00:00:00 2001
From: Veda Bhaskara Ramanth Addala <vedabhaskararamanth.addala@factset.com>
Date: Wed, 19 Aug 2020 10:46:31 +0530
Subject: [PATCH 11/12] fix(chsarp-retry) : FILES changes

---
 .../OpenAPIClient/.openapi-generator/FILES    | 261 +++++++++---------
 .../.openapi-generator/FILES                  | 261 +++++++++---------
 2 files changed, 258 insertions(+), 264 deletions(-)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index 805a718f364..fe5184215d7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -2,136 +2,133 @@
 Org.OpenAPITools.sln
 README.md
 appveyor.yml
-docs/AdditionalPropertiesClass.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ApiResponse.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/DefaultApi.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/File.md
-docs/FileSchemaTestClass.md
-docs/Foo.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
-docs/InlineResponseDefault.md
-docs/List.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelClient.md
-docs/Name.md
-docs/NullableClass.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/OuterEnumDefaultValue.md
-docs/OuterEnumInteger.md
-docs/OuterEnumIntegerDefaultValue.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/Return.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/User.md
-docs/UserApi.md
+docs\AdditionalPropertiesClass.md
+docs\Animal.md
+docs\AnotherFakeApi.md
+docs\ApiResponse.md
+docs\ArrayOfArrayOfNumberOnly.md
+docs\ArrayOfNumberOnly.md
+docs\ArrayTest.md
+docs\Capitalization.md
+docs\Cat.md
+docs\CatAllOf.md
+docs\Category.md
+docs\ClassModel.md
+docs\DefaultApi.md
+docs\Dog.md
+docs\DogAllOf.md
+docs\EnumArrays.md
+docs\EnumClass.md
+docs\EnumTest.md
+docs\FakeApi.md
+docs\FakeClassnameTags123Api.md
+docs\File.md
+docs\FileSchemaTestClass.md
+docs\Foo.md
+docs\FormatTest.md
+docs\HasOnlyReadOnly.md
+docs\HealthCheckResult.md
+docs\InlineObject.md
+docs\InlineObject1.md
+docs\InlineObject2.md
+docs\InlineObject3.md
+docs\InlineObject4.md
+docs\InlineObject5.md
+docs\InlineResponseDefault.md
+docs\List.md
+docs\MapTest.md
+docs\MixedPropertiesAndAdditionalPropertiesClass.md
+docs\Model200Response.md
+docs\ModelClient.md
+docs\Name.md
+docs\NullableClass.md
+docs\NumberOnly.md
+docs\Order.md
+docs\OuterComposite.md
+docs\OuterEnum.md
+docs\OuterEnumDefaultValue.md
+docs\OuterEnumInteger.md
+docs\OuterEnumIntegerDefaultValue.md
+docs\Pet.md
+docs\PetApi.md
+docs\ReadOnlyFirst.md
+docs\Return.md
+docs\SpecialModelName.md
+docs\StoreApi.md
+docs\Tag.md
+docs\User.md
+docs\UserApi.md
 git_push.sh
-src/Org.OpenAPITools/Api/AnotherFakeApi.cs
-src/Org.OpenAPITools/Api/DefaultApi.cs
-src/Org.OpenAPITools/Api/FakeApi.cs
-src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/PetApi.cs
-src/Org.OpenAPITools/Api/StoreApi.cs
-src/Org.OpenAPITools/Api/UserApi.cs
-src/Org.OpenAPITools/Client/ApiClient.cs
-src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiResponse.cs
-src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/Configuration.cs
-src/Org.OpenAPITools/Client/ExceptionFactory.cs
-src/Org.OpenAPITools/Client/GlobalConfiguration.cs
-src/Org.OpenAPITools/Client/HttpMethod.cs
-src/Org.OpenAPITools/Client/IApiAccessor.cs
-src/Org.OpenAPITools/Client/IAsynchronousClient.cs
-src/Org.OpenAPITools/Client/IReadableConfiguration.cs
-src/Org.OpenAPITools/Client/ISynchronousClient.cs
-src/Org.OpenAPITools/Client/Multimap.cs
-src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
-src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Client/RetryConfiguration.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Animal.cs
-src/Org.OpenAPITools/Model/ApiResponse.cs
-src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayTest.cs
-src/Org.OpenAPITools/Model/Capitalization.cs
-src/Org.OpenAPITools/Model/Cat.cs
-src/Org.OpenAPITools/Model/CatAllOf.cs
-src/Org.OpenAPITools/Model/Category.cs
-src/Org.OpenAPITools/Model/ClassModel.cs
-src/Org.OpenAPITools/Model/Dog.cs
-src/Org.OpenAPITools/Model/DogAllOf.cs
-src/Org.OpenAPITools/Model/EnumArrays.cs
-src/Org.OpenAPITools/Model/EnumClass.cs
-src/Org.OpenAPITools/Model/EnumTest.cs
-src/Org.OpenAPITools/Model/File.cs
-src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
-src/Org.OpenAPITools/Model/Foo.cs
-src/Org.OpenAPITools/Model/FormatTest.cs
-src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
-src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
-src/Org.OpenAPITools/Model/InlineResponseDefault.cs
-src/Org.OpenAPITools/Model/List.cs
-src/Org.OpenAPITools/Model/MapTest.cs
-src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Model200Response.cs
-src/Org.OpenAPITools/Model/ModelClient.cs
-src/Org.OpenAPITools/Model/Name.cs
-src/Org.OpenAPITools/Model/NullableClass.cs
-src/Org.OpenAPITools/Model/NumberOnly.cs
-src/Org.OpenAPITools/Model/Order.cs
-src/Org.OpenAPITools/Model/OuterComposite.cs
-src/Org.OpenAPITools/Model/OuterEnum.cs
-src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
-src/Org.OpenAPITools/Model/OuterEnumInteger.cs
-src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
-src/Org.OpenAPITools/Model/Pet.cs
-src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
-src/Org.OpenAPITools/Model/Return.cs
-src/Org.OpenAPITools/Model/SpecialModelName.cs
-src/Org.OpenAPITools/Model/Tag.cs
-src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src\Org.OpenAPITools\Api\AnotherFakeApi.cs
+src\Org.OpenAPITools\Api\DefaultApi.cs
+src\Org.OpenAPITools\Api\FakeApi.cs
+src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
+src\Org.OpenAPITools\Api\PetApi.cs
+src\Org.OpenAPITools\Api\StoreApi.cs
+src\Org.OpenAPITools\Api\UserApi.cs
+src\Org.OpenAPITools\Client\ApiClient.cs
+src\Org.OpenAPITools\Client\ApiException.cs
+src\Org.OpenAPITools\Client\ApiResponse.cs
+src\Org.OpenAPITools\Client\ClientUtils.cs
+src\Org.OpenAPITools\Client\Configuration.cs
+src\Org.OpenAPITools\Client\ExceptionFactory.cs
+src\Org.OpenAPITools\Client\GlobalConfiguration.cs
+src\Org.OpenAPITools\Client\HttpMethod.cs
+src\Org.OpenAPITools\Client\IApiAccessor.cs
+src\Org.OpenAPITools\Client\IAsynchronousClient.cs
+src\Org.OpenAPITools\Client\IReadableConfiguration.cs
+src\Org.OpenAPITools\Client\ISynchronousClient.cs
+src\Org.OpenAPITools\Client\Multimap.cs
+src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
+src\Org.OpenAPITools\Client\RequestOptions.cs
+src\Org.OpenAPITools\Client\RetryConfiguration.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Animal.cs
+src\Org.OpenAPITools\Model\ApiResponse.cs
+src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayTest.cs
+src\Org.OpenAPITools\Model\Capitalization.cs
+src\Org.OpenAPITools\Model\Cat.cs
+src\Org.OpenAPITools\Model\CatAllOf.cs
+src\Org.OpenAPITools\Model\Category.cs
+src\Org.OpenAPITools\Model\ClassModel.cs
+src\Org.OpenAPITools\Model\Dog.cs
+src\Org.OpenAPITools\Model\DogAllOf.cs
+src\Org.OpenAPITools\Model\EnumArrays.cs
+src\Org.OpenAPITools\Model\EnumClass.cs
+src\Org.OpenAPITools\Model\EnumTest.cs
+src\Org.OpenAPITools\Model\File.cs
+src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
+src\Org.OpenAPITools\Model\Foo.cs
+src\Org.OpenAPITools\Model\FormatTest.cs
+src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
+src\Org.OpenAPITools\Model\HealthCheckResult.cs
+src\Org.OpenAPITools\Model\InlineObject.cs
+src\Org.OpenAPITools\Model\InlineObject1.cs
+src\Org.OpenAPITools\Model\InlineObject2.cs
+src\Org.OpenAPITools\Model\InlineObject3.cs
+src\Org.OpenAPITools\Model\InlineObject4.cs
+src\Org.OpenAPITools\Model\InlineObject5.cs
+src\Org.OpenAPITools\Model\InlineResponseDefault.cs
+src\Org.OpenAPITools\Model\List.cs
+src\Org.OpenAPITools\Model\MapTest.cs
+src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Model200Response.cs
+src\Org.OpenAPITools\Model\ModelClient.cs
+src\Org.OpenAPITools\Model\Name.cs
+src\Org.OpenAPITools\Model\NullableClass.cs
+src\Org.OpenAPITools\Model\NumberOnly.cs
+src\Org.OpenAPITools\Model\Order.cs
+src\Org.OpenAPITools\Model\OuterComposite.cs
+src\Org.OpenAPITools\Model\OuterEnum.cs
+src\Org.OpenAPITools\Model\OuterEnumDefaultValue.cs
+src\Org.OpenAPITools\Model\OuterEnumInteger.cs
+src\Org.OpenAPITools\Model\OuterEnumIntegerDefaultValue.cs
+src\Org.OpenAPITools\Model\Pet.cs
+src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
+src\Org.OpenAPITools\Model\Return.cs
+src\Org.OpenAPITools\Model\SpecialModelName.cs
+src\Org.OpenAPITools\Model\Tag.cs
+src\Org.OpenAPITools\Model\User.cs
+src\Org.OpenAPITools\Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index 805a718f364..fe5184215d7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -2,136 +2,133 @@
 Org.OpenAPITools.sln
 README.md
 appveyor.yml
-docs/AdditionalPropertiesClass.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ApiResponse.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/DefaultApi.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/File.md
-docs/FileSchemaTestClass.md
-docs/Foo.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
-docs/InlineResponseDefault.md
-docs/List.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelClient.md
-docs/Name.md
-docs/NullableClass.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/OuterEnumDefaultValue.md
-docs/OuterEnumInteger.md
-docs/OuterEnumIntegerDefaultValue.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/Return.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/User.md
-docs/UserApi.md
+docs\AdditionalPropertiesClass.md
+docs\Animal.md
+docs\AnotherFakeApi.md
+docs\ApiResponse.md
+docs\ArrayOfArrayOfNumberOnly.md
+docs\ArrayOfNumberOnly.md
+docs\ArrayTest.md
+docs\Capitalization.md
+docs\Cat.md
+docs\CatAllOf.md
+docs\Category.md
+docs\ClassModel.md
+docs\DefaultApi.md
+docs\Dog.md
+docs\DogAllOf.md
+docs\EnumArrays.md
+docs\EnumClass.md
+docs\EnumTest.md
+docs\FakeApi.md
+docs\FakeClassnameTags123Api.md
+docs\File.md
+docs\FileSchemaTestClass.md
+docs\Foo.md
+docs\FormatTest.md
+docs\HasOnlyReadOnly.md
+docs\HealthCheckResult.md
+docs\InlineObject.md
+docs\InlineObject1.md
+docs\InlineObject2.md
+docs\InlineObject3.md
+docs\InlineObject4.md
+docs\InlineObject5.md
+docs\InlineResponseDefault.md
+docs\List.md
+docs\MapTest.md
+docs\MixedPropertiesAndAdditionalPropertiesClass.md
+docs\Model200Response.md
+docs\ModelClient.md
+docs\Name.md
+docs\NullableClass.md
+docs\NumberOnly.md
+docs\Order.md
+docs\OuterComposite.md
+docs\OuterEnum.md
+docs\OuterEnumDefaultValue.md
+docs\OuterEnumInteger.md
+docs\OuterEnumIntegerDefaultValue.md
+docs\Pet.md
+docs\PetApi.md
+docs\ReadOnlyFirst.md
+docs\Return.md
+docs\SpecialModelName.md
+docs\StoreApi.md
+docs\Tag.md
+docs\User.md
+docs\UserApi.md
 git_push.sh
-src/Org.OpenAPITools/Api/AnotherFakeApi.cs
-src/Org.OpenAPITools/Api/DefaultApi.cs
-src/Org.OpenAPITools/Api/FakeApi.cs
-src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/PetApi.cs
-src/Org.OpenAPITools/Api/StoreApi.cs
-src/Org.OpenAPITools/Api/UserApi.cs
-src/Org.OpenAPITools/Client/ApiClient.cs
-src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiResponse.cs
-src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/Configuration.cs
-src/Org.OpenAPITools/Client/ExceptionFactory.cs
-src/Org.OpenAPITools/Client/GlobalConfiguration.cs
-src/Org.OpenAPITools/Client/HttpMethod.cs
-src/Org.OpenAPITools/Client/IApiAccessor.cs
-src/Org.OpenAPITools/Client/IAsynchronousClient.cs
-src/Org.OpenAPITools/Client/IReadableConfiguration.cs
-src/Org.OpenAPITools/Client/ISynchronousClient.cs
-src/Org.OpenAPITools/Client/Multimap.cs
-src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
-src/Org.OpenAPITools/Client/RequestOptions.cs
-src/Org.OpenAPITools/Client/RetryConfiguration.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs
-src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Animal.cs
-src/Org.OpenAPITools/Model/ApiResponse.cs
-src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
-src/Org.OpenAPITools/Model/ArrayTest.cs
-src/Org.OpenAPITools/Model/Capitalization.cs
-src/Org.OpenAPITools/Model/Cat.cs
-src/Org.OpenAPITools/Model/CatAllOf.cs
-src/Org.OpenAPITools/Model/Category.cs
-src/Org.OpenAPITools/Model/ClassModel.cs
-src/Org.OpenAPITools/Model/Dog.cs
-src/Org.OpenAPITools/Model/DogAllOf.cs
-src/Org.OpenAPITools/Model/EnumArrays.cs
-src/Org.OpenAPITools/Model/EnumClass.cs
-src/Org.OpenAPITools/Model/EnumTest.cs
-src/Org.OpenAPITools/Model/File.cs
-src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
-src/Org.OpenAPITools/Model/Foo.cs
-src/Org.OpenAPITools/Model/FormatTest.cs
-src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
-src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
-src/Org.OpenAPITools/Model/InlineResponseDefault.cs
-src/Org.OpenAPITools/Model/List.cs
-src/Org.OpenAPITools/Model/MapTest.cs
-src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
-src/Org.OpenAPITools/Model/Model200Response.cs
-src/Org.OpenAPITools/Model/ModelClient.cs
-src/Org.OpenAPITools/Model/Name.cs
-src/Org.OpenAPITools/Model/NullableClass.cs
-src/Org.OpenAPITools/Model/NumberOnly.cs
-src/Org.OpenAPITools/Model/Order.cs
-src/Org.OpenAPITools/Model/OuterComposite.cs
-src/Org.OpenAPITools/Model/OuterEnum.cs
-src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
-src/Org.OpenAPITools/Model/OuterEnumInteger.cs
-src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
-src/Org.OpenAPITools/Model/Pet.cs
-src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
-src/Org.OpenAPITools/Model/Return.cs
-src/Org.OpenAPITools/Model/SpecialModelName.cs
-src/Org.OpenAPITools/Model/Tag.cs
-src/Org.OpenAPITools/Model/User.cs
-src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src\Org.OpenAPITools\Api\AnotherFakeApi.cs
+src\Org.OpenAPITools\Api\DefaultApi.cs
+src\Org.OpenAPITools\Api\FakeApi.cs
+src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
+src\Org.OpenAPITools\Api\PetApi.cs
+src\Org.OpenAPITools\Api\StoreApi.cs
+src\Org.OpenAPITools\Api\UserApi.cs
+src\Org.OpenAPITools\Client\ApiClient.cs
+src\Org.OpenAPITools\Client\ApiException.cs
+src\Org.OpenAPITools\Client\ApiResponse.cs
+src\Org.OpenAPITools\Client\ClientUtils.cs
+src\Org.OpenAPITools\Client\Configuration.cs
+src\Org.OpenAPITools\Client\ExceptionFactory.cs
+src\Org.OpenAPITools\Client\GlobalConfiguration.cs
+src\Org.OpenAPITools\Client\HttpMethod.cs
+src\Org.OpenAPITools\Client\IApiAccessor.cs
+src\Org.OpenAPITools\Client\IAsynchronousClient.cs
+src\Org.OpenAPITools\Client\IReadableConfiguration.cs
+src\Org.OpenAPITools\Client\ISynchronousClient.cs
+src\Org.OpenAPITools\Client\Multimap.cs
+src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
+src\Org.OpenAPITools\Client\RequestOptions.cs
+src\Org.OpenAPITools\Client\RetryConfiguration.cs
+src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Animal.cs
+src\Org.OpenAPITools\Model\ApiResponse.cs
+src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
+src\Org.OpenAPITools\Model\ArrayTest.cs
+src\Org.OpenAPITools\Model\Capitalization.cs
+src\Org.OpenAPITools\Model\Cat.cs
+src\Org.OpenAPITools\Model\CatAllOf.cs
+src\Org.OpenAPITools\Model\Category.cs
+src\Org.OpenAPITools\Model\ClassModel.cs
+src\Org.OpenAPITools\Model\Dog.cs
+src\Org.OpenAPITools\Model\DogAllOf.cs
+src\Org.OpenAPITools\Model\EnumArrays.cs
+src\Org.OpenAPITools\Model\EnumClass.cs
+src\Org.OpenAPITools\Model\EnumTest.cs
+src\Org.OpenAPITools\Model\File.cs
+src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
+src\Org.OpenAPITools\Model\Foo.cs
+src\Org.OpenAPITools\Model\FormatTest.cs
+src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
+src\Org.OpenAPITools\Model\HealthCheckResult.cs
+src\Org.OpenAPITools\Model\InlineObject.cs
+src\Org.OpenAPITools\Model\InlineObject1.cs
+src\Org.OpenAPITools\Model\InlineObject2.cs
+src\Org.OpenAPITools\Model\InlineObject3.cs
+src\Org.OpenAPITools\Model\InlineObject4.cs
+src\Org.OpenAPITools\Model\InlineObject5.cs
+src\Org.OpenAPITools\Model\InlineResponseDefault.cs
+src\Org.OpenAPITools\Model\List.cs
+src\Org.OpenAPITools\Model\MapTest.cs
+src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
+src\Org.OpenAPITools\Model\Model200Response.cs
+src\Org.OpenAPITools\Model\ModelClient.cs
+src\Org.OpenAPITools\Model\Name.cs
+src\Org.OpenAPITools\Model\NullableClass.cs
+src\Org.OpenAPITools\Model\NumberOnly.cs
+src\Org.OpenAPITools\Model\Order.cs
+src\Org.OpenAPITools\Model\OuterComposite.cs
+src\Org.OpenAPITools\Model\OuterEnum.cs
+src\Org.OpenAPITools\Model\OuterEnumDefaultValue.cs
+src\Org.OpenAPITools\Model\OuterEnumInteger.cs
+src\Org.OpenAPITools\Model\OuterEnumIntegerDefaultValue.cs
+src\Org.OpenAPITools\Model\Pet.cs
+src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
+src\Org.OpenAPITools\Model\Return.cs
+src\Org.OpenAPITools\Model\SpecialModelName.cs
+src\Org.OpenAPITools\Model\Tag.cs
+src\Org.OpenAPITools\Model\User.cs
+src\Org.OpenAPITools\Org.OpenAPITools.csproj
-- 
GitLab


From 1d2c474e0fe1420b9298154f61160f527e8c5f9f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 19 Aug 2020 15:00:27 +0800
Subject: [PATCH 12/12] update samples

---
 .../OpenAPIClient/.openapi-generator/FILES    | 258 +++++++++---------
 .../.openapi-generator/FILES                  | 258 +++++++++---------
 2 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index fe5184215d7..028532c2b59 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -2,133 +2,133 @@
 Org.OpenAPITools.sln
 README.md
 appveyor.yml
-docs\AdditionalPropertiesClass.md
-docs\Animal.md
-docs\AnotherFakeApi.md
-docs\ApiResponse.md
-docs\ArrayOfArrayOfNumberOnly.md
-docs\ArrayOfNumberOnly.md
-docs\ArrayTest.md
-docs\Capitalization.md
-docs\Cat.md
-docs\CatAllOf.md
-docs\Category.md
-docs\ClassModel.md
-docs\DefaultApi.md
-docs\Dog.md
-docs\DogAllOf.md
-docs\EnumArrays.md
-docs\EnumClass.md
-docs\EnumTest.md
-docs\FakeApi.md
-docs\FakeClassnameTags123Api.md
-docs\File.md
-docs\FileSchemaTestClass.md
-docs\Foo.md
-docs\FormatTest.md
-docs\HasOnlyReadOnly.md
-docs\HealthCheckResult.md
-docs\InlineObject.md
-docs\InlineObject1.md
-docs\InlineObject2.md
-docs\InlineObject3.md
-docs\InlineObject4.md
-docs\InlineObject5.md
-docs\InlineResponseDefault.md
-docs\List.md
-docs\MapTest.md
-docs\MixedPropertiesAndAdditionalPropertiesClass.md
-docs\Model200Response.md
-docs\ModelClient.md
-docs\Name.md
-docs\NullableClass.md
-docs\NumberOnly.md
-docs\Order.md
-docs\OuterComposite.md
-docs\OuterEnum.md
-docs\OuterEnumDefaultValue.md
-docs\OuterEnumInteger.md
-docs\OuterEnumIntegerDefaultValue.md
-docs\Pet.md
-docs\PetApi.md
-docs\ReadOnlyFirst.md
-docs\Return.md
-docs\SpecialModelName.md
-docs\StoreApi.md
-docs\Tag.md
-docs\User.md
-docs\UserApi.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/File.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Model200Response.md
+docs/ModelClient.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
 git_push.sh
-src\Org.OpenAPITools\Api\AnotherFakeApi.cs
-src\Org.OpenAPITools\Api\DefaultApi.cs
-src\Org.OpenAPITools\Api\FakeApi.cs
-src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
-src\Org.OpenAPITools\Api\PetApi.cs
-src\Org.OpenAPITools\Api\StoreApi.cs
-src\Org.OpenAPITools\Api\UserApi.cs
-src\Org.OpenAPITools\Client\ApiClient.cs
-src\Org.OpenAPITools\Client\ApiException.cs
-src\Org.OpenAPITools\Client\ApiResponse.cs
-src\Org.OpenAPITools\Client\ClientUtils.cs
-src\Org.OpenAPITools\Client\Configuration.cs
-src\Org.OpenAPITools\Client\ExceptionFactory.cs
-src\Org.OpenAPITools\Client\GlobalConfiguration.cs
-src\Org.OpenAPITools\Client\HttpMethod.cs
-src\Org.OpenAPITools\Client\IApiAccessor.cs
-src\Org.OpenAPITools\Client\IAsynchronousClient.cs
-src\Org.OpenAPITools\Client\IReadableConfiguration.cs
-src\Org.OpenAPITools\Client\ISynchronousClient.cs
-src\Org.OpenAPITools\Client\Multimap.cs
-src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
-src\Org.OpenAPITools\Client\RequestOptions.cs
-src\Org.OpenAPITools\Client\RetryConfiguration.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Animal.cs
-src\Org.OpenAPITools\Model\ApiResponse.cs
-src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayTest.cs
-src\Org.OpenAPITools\Model\Capitalization.cs
-src\Org.OpenAPITools\Model\Cat.cs
-src\Org.OpenAPITools\Model\CatAllOf.cs
-src\Org.OpenAPITools\Model\Category.cs
-src\Org.OpenAPITools\Model\ClassModel.cs
-src\Org.OpenAPITools\Model\Dog.cs
-src\Org.OpenAPITools\Model\DogAllOf.cs
-src\Org.OpenAPITools\Model\EnumArrays.cs
-src\Org.OpenAPITools\Model\EnumClass.cs
-src\Org.OpenAPITools\Model\EnumTest.cs
-src\Org.OpenAPITools\Model\File.cs
-src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
-src\Org.OpenAPITools\Model\Foo.cs
-src\Org.OpenAPITools\Model\FormatTest.cs
-src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
-src\Org.OpenAPITools\Model\HealthCheckResult.cs
-src\Org.OpenAPITools\Model\InlineObject.cs
-src\Org.OpenAPITools\Model\InlineObject1.cs
-src\Org.OpenAPITools\Model\InlineObject2.cs
-src\Org.OpenAPITools\Model\InlineObject3.cs
-src\Org.OpenAPITools\Model\InlineObject4.cs
-src\Org.OpenAPITools\Model\InlineObject5.cs
-src\Org.OpenAPITools\Model\InlineResponseDefault.cs
-src\Org.OpenAPITools\Model\List.cs
-src\Org.OpenAPITools\Model\MapTest.cs
-src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Model200Response.cs
-src\Org.OpenAPITools\Model\ModelClient.cs
-src\Org.OpenAPITools\Model\Name.cs
-src\Org.OpenAPITools\Model\NullableClass.cs
-src\Org.OpenAPITools\Model\NumberOnly.cs
-src\Org.OpenAPITools\Model\Order.cs
-src\Org.OpenAPITools\Model\OuterComposite.cs
-src\Org.OpenAPITools\Model\OuterEnum.cs
-src\Org.OpenAPITools\Model\OuterEnumDefaultValue.cs
-src\Org.OpenAPITools\Model\OuterEnumInteger.cs
-src\Org.OpenAPITools\Model\OuterEnumIntegerDefaultValue.cs
-src\Org.OpenAPITools\Model\Pet.cs
-src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
-src\Org.OpenAPITools\Model\Return.cs
-src\Org.OpenAPITools\Model\SpecialModelName.cs
-src\Org.OpenAPITools\Model\Tag.cs
-src\Org.OpenAPITools\Model\User.cs
-src\Org.OpenAPITools\Org.OpenAPITools.csproj
+src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+src/Org.OpenAPITools/Api/DefaultApi.cs
+src/Org.OpenAPITools/Api/FakeApi.cs
+src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/PetApi.cs
+src/Org.OpenAPITools/Api/StoreApi.cs
+src/Org.OpenAPITools/Api/UserApi.cs
+src/Org.OpenAPITools/Client/ApiClient.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiResponse.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/Configuration.cs
+src/Org.OpenAPITools/Client/ExceptionFactory.cs
+src/Org.OpenAPITools/Client/GlobalConfiguration.cs
+src/Org.OpenAPITools/Client/HttpMethod.cs
+src/Org.OpenAPITools/Client/IApiAccessor.cs
+src/Org.OpenAPITools/Client/IAsynchronousClient.cs
+src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+src/Org.OpenAPITools/Client/ISynchronousClient.cs
+src/Org.OpenAPITools/Client/Multimap.cs
+src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
+src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Animal.cs
+src/Org.OpenAPITools/Model/ApiResponse.cs
+src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayTest.cs
+src/Org.OpenAPITools/Model/Capitalization.cs
+src/Org.OpenAPITools/Model/Cat.cs
+src/Org.OpenAPITools/Model/CatAllOf.cs
+src/Org.OpenAPITools/Model/Category.cs
+src/Org.OpenAPITools/Model/ClassModel.cs
+src/Org.OpenAPITools/Model/Dog.cs
+src/Org.OpenAPITools/Model/DogAllOf.cs
+src/Org.OpenAPITools/Model/EnumArrays.cs
+src/Org.OpenAPITools/Model/EnumClass.cs
+src/Org.OpenAPITools/Model/EnumTest.cs
+src/Org.OpenAPITools/Model/File.cs
+src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
+src/Org.OpenAPITools/Model/Foo.cs
+src/Org.OpenAPITools/Model/FormatTest.cs
+src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
+src/Org.OpenAPITools/Model/HealthCheckResult.cs
+src/Org.OpenAPITools/Model/InlineObject.cs
+src/Org.OpenAPITools/Model/InlineObject1.cs
+src/Org.OpenAPITools/Model/InlineObject2.cs
+src/Org.OpenAPITools/Model/InlineObject3.cs
+src/Org.OpenAPITools/Model/InlineObject4.cs
+src/Org.OpenAPITools/Model/InlineObject5.cs
+src/Org.OpenAPITools/Model/InlineResponseDefault.cs
+src/Org.OpenAPITools/Model/List.cs
+src/Org.OpenAPITools/Model/MapTest.cs
+src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Model200Response.cs
+src/Org.OpenAPITools/Model/ModelClient.cs
+src/Org.OpenAPITools/Model/Name.cs
+src/Org.OpenAPITools/Model/NullableClass.cs
+src/Org.OpenAPITools/Model/NumberOnly.cs
+src/Org.OpenAPITools/Model/Order.cs
+src/Org.OpenAPITools/Model/OuterComposite.cs
+src/Org.OpenAPITools/Model/OuterEnum.cs
+src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+src/Org.OpenAPITools/Model/Pet.cs
+src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
+src/Org.OpenAPITools/Model/Return.cs
+src/Org.OpenAPITools/Model/SpecialModelName.cs
+src/Org.OpenAPITools/Model/Tag.cs
+src/Org.OpenAPITools/Model/User.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index fe5184215d7..028532c2b59 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -2,133 +2,133 @@
 Org.OpenAPITools.sln
 README.md
 appveyor.yml
-docs\AdditionalPropertiesClass.md
-docs\Animal.md
-docs\AnotherFakeApi.md
-docs\ApiResponse.md
-docs\ArrayOfArrayOfNumberOnly.md
-docs\ArrayOfNumberOnly.md
-docs\ArrayTest.md
-docs\Capitalization.md
-docs\Cat.md
-docs\CatAllOf.md
-docs\Category.md
-docs\ClassModel.md
-docs\DefaultApi.md
-docs\Dog.md
-docs\DogAllOf.md
-docs\EnumArrays.md
-docs\EnumClass.md
-docs\EnumTest.md
-docs\FakeApi.md
-docs\FakeClassnameTags123Api.md
-docs\File.md
-docs\FileSchemaTestClass.md
-docs\Foo.md
-docs\FormatTest.md
-docs\HasOnlyReadOnly.md
-docs\HealthCheckResult.md
-docs\InlineObject.md
-docs\InlineObject1.md
-docs\InlineObject2.md
-docs\InlineObject3.md
-docs\InlineObject4.md
-docs\InlineObject5.md
-docs\InlineResponseDefault.md
-docs\List.md
-docs\MapTest.md
-docs\MixedPropertiesAndAdditionalPropertiesClass.md
-docs\Model200Response.md
-docs\ModelClient.md
-docs\Name.md
-docs\NullableClass.md
-docs\NumberOnly.md
-docs\Order.md
-docs\OuterComposite.md
-docs\OuterEnum.md
-docs\OuterEnumDefaultValue.md
-docs\OuterEnumInteger.md
-docs\OuterEnumIntegerDefaultValue.md
-docs\Pet.md
-docs\PetApi.md
-docs\ReadOnlyFirst.md
-docs\Return.md
-docs\SpecialModelName.md
-docs\StoreApi.md
-docs\Tag.md
-docs\User.md
-docs\UserApi.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/File.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Model200Response.md
+docs/ModelClient.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
 git_push.sh
-src\Org.OpenAPITools\Api\AnotherFakeApi.cs
-src\Org.OpenAPITools\Api\DefaultApi.cs
-src\Org.OpenAPITools\Api\FakeApi.cs
-src\Org.OpenAPITools\Api\FakeClassnameTags123Api.cs
-src\Org.OpenAPITools\Api\PetApi.cs
-src\Org.OpenAPITools\Api\StoreApi.cs
-src\Org.OpenAPITools\Api\UserApi.cs
-src\Org.OpenAPITools\Client\ApiClient.cs
-src\Org.OpenAPITools\Client\ApiException.cs
-src\Org.OpenAPITools\Client\ApiResponse.cs
-src\Org.OpenAPITools\Client\ClientUtils.cs
-src\Org.OpenAPITools\Client\Configuration.cs
-src\Org.OpenAPITools\Client\ExceptionFactory.cs
-src\Org.OpenAPITools\Client\GlobalConfiguration.cs
-src\Org.OpenAPITools\Client\HttpMethod.cs
-src\Org.OpenAPITools\Client\IApiAccessor.cs
-src\Org.OpenAPITools\Client\IAsynchronousClient.cs
-src\Org.OpenAPITools\Client\IReadableConfiguration.cs
-src\Org.OpenAPITools\Client\ISynchronousClient.cs
-src\Org.OpenAPITools\Client\Multimap.cs
-src\Org.OpenAPITools\Client\OpenAPIDateConverter.cs
-src\Org.OpenAPITools\Client\RequestOptions.cs
-src\Org.OpenAPITools\Client\RetryConfiguration.cs
-src\Org.OpenAPITools\Model\AdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Animal.cs
-src\Org.OpenAPITools\Model\ApiResponse.cs
-src\Org.OpenAPITools\Model\ArrayOfArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayOfNumberOnly.cs
-src\Org.OpenAPITools\Model\ArrayTest.cs
-src\Org.OpenAPITools\Model\Capitalization.cs
-src\Org.OpenAPITools\Model\Cat.cs
-src\Org.OpenAPITools\Model\CatAllOf.cs
-src\Org.OpenAPITools\Model\Category.cs
-src\Org.OpenAPITools\Model\ClassModel.cs
-src\Org.OpenAPITools\Model\Dog.cs
-src\Org.OpenAPITools\Model\DogAllOf.cs
-src\Org.OpenAPITools\Model\EnumArrays.cs
-src\Org.OpenAPITools\Model\EnumClass.cs
-src\Org.OpenAPITools\Model\EnumTest.cs
-src\Org.OpenAPITools\Model\File.cs
-src\Org.OpenAPITools\Model\FileSchemaTestClass.cs
-src\Org.OpenAPITools\Model\Foo.cs
-src\Org.OpenAPITools\Model\FormatTest.cs
-src\Org.OpenAPITools\Model\HasOnlyReadOnly.cs
-src\Org.OpenAPITools\Model\HealthCheckResult.cs
-src\Org.OpenAPITools\Model\InlineObject.cs
-src\Org.OpenAPITools\Model\InlineObject1.cs
-src\Org.OpenAPITools\Model\InlineObject2.cs
-src\Org.OpenAPITools\Model\InlineObject3.cs
-src\Org.OpenAPITools\Model\InlineObject4.cs
-src\Org.OpenAPITools\Model\InlineObject5.cs
-src\Org.OpenAPITools\Model\InlineResponseDefault.cs
-src\Org.OpenAPITools\Model\List.cs
-src\Org.OpenAPITools\Model\MapTest.cs
-src\Org.OpenAPITools\Model\MixedPropertiesAndAdditionalPropertiesClass.cs
-src\Org.OpenAPITools\Model\Model200Response.cs
-src\Org.OpenAPITools\Model\ModelClient.cs
-src\Org.OpenAPITools\Model\Name.cs
-src\Org.OpenAPITools\Model\NullableClass.cs
-src\Org.OpenAPITools\Model\NumberOnly.cs
-src\Org.OpenAPITools\Model\Order.cs
-src\Org.OpenAPITools\Model\OuterComposite.cs
-src\Org.OpenAPITools\Model\OuterEnum.cs
-src\Org.OpenAPITools\Model\OuterEnumDefaultValue.cs
-src\Org.OpenAPITools\Model\OuterEnumInteger.cs
-src\Org.OpenAPITools\Model\OuterEnumIntegerDefaultValue.cs
-src\Org.OpenAPITools\Model\Pet.cs
-src\Org.OpenAPITools\Model\ReadOnlyFirst.cs
-src\Org.OpenAPITools\Model\Return.cs
-src\Org.OpenAPITools\Model\SpecialModelName.cs
-src\Org.OpenAPITools\Model\Tag.cs
-src\Org.OpenAPITools\Model\User.cs
-src\Org.OpenAPITools\Org.OpenAPITools.csproj
+src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+src/Org.OpenAPITools/Api/DefaultApi.cs
+src/Org.OpenAPITools/Api/FakeApi.cs
+src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/PetApi.cs
+src/Org.OpenAPITools/Api/StoreApi.cs
+src/Org.OpenAPITools/Api/UserApi.cs
+src/Org.OpenAPITools/Client/ApiClient.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiResponse.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/Configuration.cs
+src/Org.OpenAPITools/Client/ExceptionFactory.cs
+src/Org.OpenAPITools/Client/GlobalConfiguration.cs
+src/Org.OpenAPITools/Client/HttpMethod.cs
+src/Org.OpenAPITools/Client/IApiAccessor.cs
+src/Org.OpenAPITools/Client/IAsynchronousClient.cs
+src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+src/Org.OpenAPITools/Client/ISynchronousClient.cs
+src/Org.OpenAPITools/Client/Multimap.cs
+src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
+src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
+src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Animal.cs
+src/Org.OpenAPITools/Model/ApiResponse.cs
+src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
+src/Org.OpenAPITools/Model/ArrayTest.cs
+src/Org.OpenAPITools/Model/Capitalization.cs
+src/Org.OpenAPITools/Model/Cat.cs
+src/Org.OpenAPITools/Model/CatAllOf.cs
+src/Org.OpenAPITools/Model/Category.cs
+src/Org.OpenAPITools/Model/ClassModel.cs
+src/Org.OpenAPITools/Model/Dog.cs
+src/Org.OpenAPITools/Model/DogAllOf.cs
+src/Org.OpenAPITools/Model/EnumArrays.cs
+src/Org.OpenAPITools/Model/EnumClass.cs
+src/Org.OpenAPITools/Model/EnumTest.cs
+src/Org.OpenAPITools/Model/File.cs
+src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
+src/Org.OpenAPITools/Model/Foo.cs
+src/Org.OpenAPITools/Model/FormatTest.cs
+src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
+src/Org.OpenAPITools/Model/HealthCheckResult.cs
+src/Org.OpenAPITools/Model/InlineObject.cs
+src/Org.OpenAPITools/Model/InlineObject1.cs
+src/Org.OpenAPITools/Model/InlineObject2.cs
+src/Org.OpenAPITools/Model/InlineObject3.cs
+src/Org.OpenAPITools/Model/InlineObject4.cs
+src/Org.OpenAPITools/Model/InlineObject5.cs
+src/Org.OpenAPITools/Model/InlineResponseDefault.cs
+src/Org.OpenAPITools/Model/List.cs
+src/Org.OpenAPITools/Model/MapTest.cs
+src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+src/Org.OpenAPITools/Model/Model200Response.cs
+src/Org.OpenAPITools/Model/ModelClient.cs
+src/Org.OpenAPITools/Model/Name.cs
+src/Org.OpenAPITools/Model/NullableClass.cs
+src/Org.OpenAPITools/Model/NumberOnly.cs
+src/Org.OpenAPITools/Model/Order.cs
+src/Org.OpenAPITools/Model/OuterComposite.cs
+src/Org.OpenAPITools/Model/OuterEnum.cs
+src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+src/Org.OpenAPITools/Model/Pet.cs
+src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
+src/Org.OpenAPITools/Model/Return.cs
+src/Org.OpenAPITools/Model/SpecialModelName.cs
+src/Org.OpenAPITools/Model/Tag.cs
+src/Org.OpenAPITools/Model/User.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
-- 
GitLab