Merge branch 'master' of https://github.com/Azure/autorest

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/DurationOperations.cs

@@ -262,12 +262,9 @@ internal DurationOperations(AutoRestDurationTestService client)
 
             // Serialize Request
             string _requestContent = null;
-            if(durationBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Set Credentials
             if (this.Client.Credentials != null)
             {

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Basic.cs

@@ -44,7 +44,8 @@ public Basic() { }
         public string Name { get; set; }
 
         /// <summary>
-        /// Possible values include: 'cyan', 'Magenta', 'YELLOW', 'blacK'
+        /// Gets or sets possible values include: 'cyan', 'Magenta', 'YELLOW',
+        /// 'blacK'
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArray.cs

@@ -32,7 +32,7 @@ public CatalogArray() { }
         }
 
         /// <summary>
-        /// Array of products
+        /// Gets or sets array of products
         /// </summary>
         [JsonProperty(PropertyName = "productArray")]
         public IList<Product> ProductArray { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArrayOfDictionary.cs

@@ -32,7 +32,7 @@ public CatalogArrayOfDictionary() { }
         }
 
         /// <summary>
-        /// Array of dictionary of products
+        /// Gets or sets array of dictionary of products
         /// </summary>
         [JsonProperty(PropertyName = "productArrayOfDictionary")]
         public IList<IDictionary<string, Product>> ProductArrayOfDictionary { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionary.cs

@@ -32,7 +32,7 @@ public CatalogDictionary() { }
         }
 
         /// <summary>
-        /// Dictionary of products
+        /// Gets or sets dictionary of products
         /// </summary>
         [JsonProperty(PropertyName = "productDictionary")]
         public IDictionary<string, Product> ProductDictionary { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionaryOfArray.cs

@@ -32,7 +32,7 @@ public CatalogDictionaryOfArray() { }
         }
 
         /// <summary>
-        /// Dictionary of Array of product
+        /// Gets or sets dictionary of Array of product
         /// </summary>
         [JsonProperty(PropertyName = "productDictionaryOfArray")]
         public IDictionary<string, IList<Product>> ProductDictionaryOfArray { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Product.cs

@@ -39,33 +39,34 @@ public Product() { }
         }
 
         /// <summary>
-        /// Unique identifier representing a specific product for a given
-        /// latitude &amp; longitude. For example, uberX in San Francisco
-        /// will have a different product_id than uberX in Los Angeles.
+        /// Gets or sets unique identifier representing a specific product for
+        /// a given latitude &amp; longitude. For example, uberX in San
+        /// Francisco will have a different product_id than uberX in Los
+        /// Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "product_id")]
         public string ProductId { get; set; }
 
         /// <summary>
-        /// Description of product.
+        /// Gets or sets description of product.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
 
         /// <summary>
-        /// Display name of product.
+        /// Gets or sets display name of product.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Capacity of product. For example, 4 people.
+        /// Gets or sets capacity of product. For example, 4 people.
         /// </summary>
         [JsonProperty(PropertyName = "capacity")]
         public string Capacity { get; set; }
 
         /// <summary>
-        /// Image URL representing the product.
+        /// Gets or sets image URL representing the product.
         /// </summary>
         [JsonProperty(PropertyName = "image")]
         public string Image { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/FirstParameterGroup.cs

@@ -17,7 +17,9 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postMultiParamGroups operation.
+    /// Additional parameters for a set of operations, such as:
+    /// parameterGrouping_postMultiParamGroups,
+    /// parameterGrouping_postSharedParameterGroupObject.
     /// </summary>
     public partial class FirstParameterGroup
     {
@@ -41,7 +43,7 @@ public FirstParameterGroup() { }
         public string HeaderOne { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? QueryOne { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.cs

@@ -17,7 +17,8 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postMultiParamGroups operation.
+    /// Additional parameters for the parameterGrouping_postMultiParamGroups
+    /// operation.
     /// </summary>
     public partial class ParameterGroupingPostMultiParamGroupsSecondParamGroup
     {
@@ -43,7 +44,7 @@ public ParameterGroupingPostMultiParamGroupsSecondParamGroup() { }
         public string HeaderTwo { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? QueryTwo { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostOptionalParameters.cs

@@ -17,7 +17,7 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postOptional operation.
+    /// Additional parameters for the parameterGrouping_postOptional operation.
     /// </summary>
     public partial class ParameterGroupingPostOptionalParameters
     {
@@ -43,7 +43,7 @@ public ParameterGroupingPostOptionalParameters() { }
         public string CustomHeader { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Query { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostRequiredParameters.cs

@@ -17,7 +17,7 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postRequired operation.
+    /// Additional parameters for the parameterGrouping_postRequired operation.
     /// </summary>
     public partial class ParameterGroupingPostRequiredParameters
     {
@@ -50,13 +50,13 @@ public ParameterGroupingPostRequiredParameters() { }
         public string CustomHeader { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Query { get; set; }
 
         /// <summary>
-        /// Path parameter
+        /// Gets or sets path parameter
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string Path { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/ParameterGroupingOperations.cs

@@ -161,12 +161,9 @@ internal ParameterGroupingOperations(AutoRestParameterGroupingTestService client
 
             // Serialize Request
             string _requestContent = null;
-            if(body != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(body, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(body, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Set Credentials
             if (this.Client.Credentials != null)
             {

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/Resource.cs

@@ -36,13 +36,13 @@ public Resource() { }
         }
 
         /// <summary>
-        /// Resource Id
+        /// Gets resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
 
         /// <summary>
-        /// Resource Type
+        /// Gets resource Type
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; private set; }
@@ -53,13 +53,13 @@ public Resource() { }
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Resource Location
+        /// Gets or sets resource Location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource Name
+        /// Gets resource Name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/HeaderCustomNamedRequestIdHeaders.cs

@@ -37,7 +37,7 @@ public HeaderCustomNamedRequestIdHeaders() { }
         }
 
         /// <summary>
-        /// Gets the foo-request-id.
+        /// Gets or sets gets the foo-request-id.
         /// </summary>
         [JsonProperty(PropertyName = "foo-request-id")]
         public string FooRequestId { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDelete202Retry200Headers.cs

@@ -38,15 +38,15 @@ public LRORetrysDelete202Retry200Headers() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteAsyncRelativeRetrySucceededHeaders.cs

@@ -39,22 +39,22 @@ public LRORetrysDeleteAsyncRelativeRetrySucceededHeaders() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteProvisioning202Accepted200SucceededHeaders.cs

@@ -39,15 +39,15 @@ public LRORetrysDeleteProvisioning202Accepted200SucceededHeaders() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/provisioning/202/accepted/200/succeeded
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPost202Retry200Headers.cs

@@ -38,15 +38,15 @@ public LRORetrysPost202Retry200Headers() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPostAsyncRelativeRetrySucceededHeaders.cs

@@ -39,22 +39,22 @@ public LRORetrysPostAsyncRelativeRetrySucceededHeaders() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPutAsyncRelativeRetrySucceededHeaders.cs

@@ -39,22 +39,22 @@ public LRORetrysPutAsyncRelativeRetrySucceededHeaders() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }

AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202NonRetry400Headers.cs

@@ -38,15 +38,15 @@ public LROSADsDelete202NonRetry400Headers() { }
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }