From 98a1020ec2a5c55b3540710387e2d1e15b4cbd10 Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Wed, 5 Aug 2020 12:15:25 +0000
Subject: [PATCH] Generated from 230e1797a6f1cc31dab6d4fa1eeb81bdc2ce80c2

run prettier
---
 .../src/Generated/AccountsOperations.cs       | 222 +++----
 .../Generated/AccountsOperationsExtensions.cs |  80 +--
 .../ConsumerInvitationsOperations.cs          |  98 +--
 ...ConsumerInvitationsOperationsExtensions.cs |  60 +-
 .../Generated/DataSetMappingsOperations.cs    |  18 +-
 .../DataSetMappingsOperationsExtensions.cs    |  20 +-
 .../src/Generated/DataSetsOperations.cs       |  18 +-
 .../Generated/DataSetsOperationsExtensions.cs |  20 +-
 .../src/Generated/IAccountsOperations.cs      |  50 +-
 .../IConsumerInvitationsOperations.cs         |  26 +-
 .../Generated/IDataSetMappingsOperations.cs   |   8 +-
 .../src/Generated/IDataSetsOperations.cs      |   8 +-
 .../src/Generated/IInvitationsOperations.cs   |   8 +-
 .../IProviderShareSubscriptionsOperations.cs  |  32 +-
 .../IShareSubscriptionsOperations.cs          | 162 ++---
 .../src/Generated/ISharesOperations.cs        |  96 +--
 .../src/Generated/InvitationsOperations.cs    |  18 +-
 .../InvitationsOperationsExtensions.cs        |  20 +-
 .../src/Generated/Models/DataSet.cs           |   2 -
 .../src/Generated/Models/DataSetMapping.cs    |   2 -
 .../SourceShareSynchronizationSetting.cs      |   2 -
 .../Models/SynchronizationSetting.cs          |   2 -
 .../src/Generated/Models/Trigger.cs           |   2 -
 .../ProviderShareSubscriptionsOperations.cs   | 134 ++--
 ...rShareSubscriptionsOperationsExtensions.cs |  80 +--
 .../SdkInfo_DataShareManagementClient.cs      |  11 -
 .../Generated/ShareSubscriptionsOperations.cs | 604 ++++++++++--------
 .../ShareSubscriptionsOperationsExtensions.cs | 372 ++++++-----
 .../src/Generated/SharesOperations.cs         | 344 +++++-----
 .../Generated/SharesOperationsExtensions.cs   | 224 ++++---
 30 files changed, 1514 insertions(+), 1229 deletions(-)

diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperations.cs
index 7044ddaea35cb..fb8cbfa847f2b 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperations.cs
@@ -51,16 +51,13 @@ internal AccountsOperations(DataShareManagementClient client)
         public DataShareManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get an account under a resource group
+        /// List Accounts in a subscription
         /// </summary>
         /// <remarks>
-        /// Get an account
+        /// List Accounts in Subscription
         /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
+        /// <param name='skipToken'>
+        /// Continuation token
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,20 +80,12 @@ internal AccountsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Account>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Account>>> ListBySubscriptionWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (accountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -108,22 +97,23 @@ internal AccountsOperations(DataShareManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("accountName", accountName);
+                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListBySubscription", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DataShare/accounts").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -212,7 +202,7 @@ internal AccountsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Account>();
+            var _result = new AzureOperationResponse<IPage<Account>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -225,7 +215,7 @@ internal AccountsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Account>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Account>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -245,63 +235,10 @@ internal AccountsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Create an account in the given resource group
-        /// </summary>
-        /// <remarks>
-        /// Create an account
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='account'>
-        /// The account payload.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<Account>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, Account account, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<Account> _response = await BeginCreateWithHttpMessagesAsync(resourceGroupName, accountName, account, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Delete an account
-        /// </summary>
-        /// <remarks>
-        /// DeleteAccount
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Patch a given account
+        /// Get an account under a resource group
         /// </summary>
         /// <remarks>
-        /// Patch an account
+        /// Get an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -309,9 +246,6 @@ internal AccountsOperations(DataShareManagementClient client)
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
-        /// <param name='accountUpdateParameters'>
-        /// The account update parameters.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -333,7 +267,7 @@ internal AccountsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Account>> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, AccountUpdateParameters accountUpdateParameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Account>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -347,10 +281,6 @@ internal AccountsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
             }
-            if (accountUpdateParameters == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "accountUpdateParameters");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -364,9 +294,8 @@ internal AccountsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
-                tracingParameters.Add("accountUpdateParameters", accountUpdateParameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -386,7 +315,7 @@ internal AccountsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -417,12 +346,6 @@ internal AccountsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(accountUpdateParameters != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(accountUpdateParameters, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -506,13 +429,72 @@ internal AccountsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List Accounts in a subscription
+        /// Create an account in the given resource group
         /// </summary>
         /// <remarks>
-        /// List Accounts in Subscription
+        /// Create an account
         /// </remarks>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='account'>
+        /// The account payload.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<Account>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, Account account, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<Account> _response = await BeginCreateWithHttpMessagesAsync(resourceGroupName, accountName, account, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Delete an account
+        /// </summary>
+        /// <remarks>
+        /// DeleteAccount
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Patch a given account
+        /// </summary>
+        /// <remarks>
+        /// Patch an account
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='accountUpdateParameters'>
+        /// The account update parameters.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -535,12 +517,24 @@ internal AccountsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Account>>> ListBySubscriptionWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Account>> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, AccountUpdateParameters accountUpdateParameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (accountName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
+            }
+            if (accountUpdateParameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "accountUpdateParameters");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -552,23 +546,23 @@ internal AccountsOperations(DataShareManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("accountName", accountName);
+                tracingParameters.Add("accountUpdateParameters", accountUpdateParameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListBySubscription", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DataShare/accounts").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -576,7 +570,7 @@ internal AccountsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -607,6 +601,12 @@ internal AccountsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(accountUpdateParameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(accountUpdateParameters, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -657,7 +657,7 @@ internal AccountsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Account>>();
+            var _result = new AzureOperationResponse<Account>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -670,7 +670,7 @@ internal AccountsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Account>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Account>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperationsExtensions.cs
index 7971abde20e3f..4701f9430738c 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/AccountsOperationsExtensions.cs
@@ -21,6 +21,46 @@ namespace Microsoft.Azure.Management.DataShare
     /// </summary>
     public static partial class AccountsOperationsExtensions
     {
+            /// <summary>
+            /// List Accounts in a subscription
+            /// </summary>
+            /// <remarks>
+            /// List Accounts in Subscription
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            public static IPage<Account> ListBySubscription(this IAccountsOperations operations, string skipToken = default(string))
+            {
+                return operations.ListBySubscriptionAsync(skipToken).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// List Accounts in a subscription
+            /// </summary>
+            /// <remarks>
+            /// List Accounts in Subscription
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<IPage<Account>> ListBySubscriptionAsync(this IAccountsOperations operations, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListBySubscriptionWithHttpMessagesAsync(skipToken, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
             /// <summary>
             /// Get an account under a resource group
             /// </summary>
@@ -217,46 +257,6 @@ public static Account Update(this IAccountsOperations operations, string resourc
                 }
             }
 
-            /// <summary>
-            /// List Accounts in a subscription
-            /// </summary>
-            /// <remarks>
-            /// List Accounts in Subscription
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
-            /// </param>
-            public static IPage<Account> ListBySubscription(this IAccountsOperations operations, string skipToken = default(string))
-            {
-                return operations.ListBySubscriptionAsync(skipToken).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// List Accounts in a subscription
-            /// </summary>
-            /// <remarks>
-            /// List Accounts in Subscription
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<Account>> ListBySubscriptionAsync(this IAccountsOperations operations, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListBySubscriptionWithHttpMessagesAsync(skipToken, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// List Accounts in a resource group
             /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperations.cs
index b8fcc63a5fd74..e89a807a7bdc5 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperations.cs
@@ -51,16 +51,13 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
         public DataShareManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Rejects the invitation identified by invitationId
+        /// List the invitations
         /// </summary>
         /// <remarks>
-        /// Reject an invitation
+        /// Lists invitations
         /// </remarks>
-        /// <param name='location'>
-        /// Location of the invitation
-        /// </param>
-        /// <param name='invitation'>
-        /// An invitation payload
+        /// <param name='skipToken'>
+        /// The continuation token
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,20 +80,8 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ConsumerInvitation>> RejectInvitationWithHttpMessagesAsync(string location, ConsumerInvitation invitation, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ConsumerInvitation>>> ListInvitationsWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (invitation == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invitation");
-            }
-            if (invitation != null)
-            {
-                invitation.Validate();
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -108,20 +93,22 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("invitation", invitation);
+                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "RejectInvitation", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInvitations", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.DataShare/locations/{location}/RejectInvitation").ToString();
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.DataShare/ListInvitations").ToString();
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -129,7 +116,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -160,12 +147,6 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(invitation != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(invitation, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -216,7 +197,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ConsumerInvitation>();
+            var _result = new AzureOperationResponse<IPage<ConsumerInvitation>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -229,7 +210,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConsumerInvitation>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ConsumerInvitation>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -438,13 +419,16 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List the invitations
+        /// Rejects the invitation identified by invitationId
         /// </summary>
         /// <remarks>
-        /// Lists invitations
+        /// Reject an invitation
         /// </remarks>
-        /// <param name='skipToken'>
-        /// The continuation token
+        /// <param name='location'>
+        /// Location of the invitation
+        /// </param>
+        /// <param name='invitation'>
+        /// An invitation payload
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -467,8 +451,20 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ConsumerInvitation>>> ListInvitationsWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ConsumerInvitation>> RejectInvitationWithHttpMessagesAsync(string location, ConsumerInvitation invitation, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            if (location == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "location");
+            }
+            if (invitation == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "invitation");
+            }
+            if (invitation != null)
+            {
+                invitation.Validate();
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -480,22 +476,20 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("location", location);
+                tracingParameters.Add("invitation", invitation);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInvitations", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "RejectInvitation", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.DataShare/ListInvitations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.DataShare/locations/{location}/RejectInvitation").ToString();
+            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -503,7 +497,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -534,6 +528,12 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(invitation != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(invitation, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -584,7 +584,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ConsumerInvitation>>();
+            var _result = new AzureOperationResponse<ConsumerInvitation>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -597,7 +597,7 @@ internal ConsumerInvitationsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ConsumerInvitation>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConsumerInvitation>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperationsExtensions.cs
index 55efdc3c31071..fcb7b3d99d409 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ConsumerInvitationsOperationsExtensions.cs
@@ -22,46 +22,40 @@ namespace Microsoft.Azure.Management.DataShare
     public static partial class ConsumerInvitationsOperationsExtensions
     {
             /// <summary>
-            /// Rejects the invitation identified by invitationId
+            /// List the invitations
             /// </summary>
             /// <remarks>
-            /// Reject an invitation
+            /// Lists invitations
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='location'>
-            /// Location of the invitation
-            /// </param>
-            /// <param name='invitation'>
-            /// An invitation payload
+            /// <param name='skipToken'>
+            /// The continuation token
             /// </param>
-            public static ConsumerInvitation RejectInvitation(this IConsumerInvitationsOperations operations, string location, ConsumerInvitation invitation)
+            public static IPage<ConsumerInvitation> ListInvitations(this IConsumerInvitationsOperations operations, string skipToken = default(string))
             {
-                return operations.RejectInvitationAsync(location, invitation).GetAwaiter().GetResult();
+                return operations.ListInvitationsAsync(skipToken).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Rejects the invitation identified by invitationId
+            /// List the invitations
             /// </summary>
             /// <remarks>
-            /// Reject an invitation
+            /// Lists invitations
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='location'>
-            /// Location of the invitation
-            /// </param>
-            /// <param name='invitation'>
-            /// An invitation payload
+            /// <param name='skipToken'>
+            /// The continuation token
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ConsumerInvitation> RejectInvitationAsync(this IConsumerInvitationsOperations operations, string location, ConsumerInvitation invitation, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ConsumerInvitation>> ListInvitationsAsync(this IConsumerInvitationsOperations operations, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.RejectInvitationWithHttpMessagesAsync(location, invitation, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListInvitationsWithHttpMessagesAsync(skipToken, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -114,40 +108,46 @@ public static ConsumerInvitation Get(this IConsumerInvitationsOperations operati
             }
 
             /// <summary>
-            /// List the invitations
+            /// Rejects the invitation identified by invitationId
             /// </summary>
             /// <remarks>
-            /// Lists invitations
+            /// Reject an invitation
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='skipToken'>
-            /// The continuation token
+            /// <param name='location'>
+            /// Location of the invitation
             /// </param>
-            public static IPage<ConsumerInvitation> ListInvitations(this IConsumerInvitationsOperations operations, string skipToken = default(string))
+            /// <param name='invitation'>
+            /// An invitation payload
+            /// </param>
+            public static ConsumerInvitation RejectInvitation(this IConsumerInvitationsOperations operations, string location, ConsumerInvitation invitation)
             {
-                return operations.ListInvitationsAsync(skipToken).GetAwaiter().GetResult();
+                return operations.RejectInvitationAsync(location, invitation).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List the invitations
+            /// Rejects the invitation identified by invitationId
             /// </summary>
             /// <remarks>
-            /// Lists invitations
+            /// Reject an invitation
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='skipToken'>
-            /// The continuation token
+            /// <param name='location'>
+            /// Location of the invitation
+            /// </param>
+            /// <param name='invitation'>
+            /// An invitation payload
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ConsumerInvitation>> ListInvitationsAsync(this IConsumerInvitationsOperations operations, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ConsumerInvitation> RejectInvitationAsync(this IConsumerInvitationsOperations operations, string location, ConsumerInvitation invitation, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListInvitationsWithHttpMessagesAsync(skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.RejectInvitationWithHttpMessagesAsync(location, invitation, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperations.cs
index 497326a964ec5..f33f699777e77 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperations.cs
@@ -717,6 +717,12 @@ internal DataSetMappingsOperations(DataShareManagementClient client)
         /// <param name='skipToken'>
         /// Continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -738,7 +744,7 @@ internal DataSetMappingsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<DataSetMapping>>> ListByShareSubscriptionWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<DataSetMapping>>> ListByShareSubscriptionWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -771,6 +777,8 @@ internal DataSetMappingsOperations(DataShareManagementClient client)
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByShareSubscription", tracingParameters);
             }
@@ -790,6 +798,14 @@ internal DataSetMappingsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperationsExtensions.cs
index 536a42bddc6c5..168c682af07a9 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetMappingsOperationsExtensions.cs
@@ -223,9 +223,15 @@ public static void Delete(this IDataSetMappingsOperations operations, string res
             /// <param name='skipToken'>
             /// Continuation token
             /// </param>
-            public static IPage<DataSetMapping> ListByShareSubscription(this IDataSetMappingsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string))
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<DataSetMapping> ListByShareSubscription(this IDataSetMappingsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.ListByShareSubscriptionAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken).GetAwaiter().GetResult();
+                return operations.ListByShareSubscriptionAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -249,12 +255,18 @@ public static void Delete(this IDataSetMappingsOperations operations, string res
             /// <param name='skipToken'>
             /// Continuation token
             /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<DataSetMapping>> ListByShareSubscriptionAsync(this IDataSetMappingsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<DataSetMapping>> ListByShareSubscriptionAsync(this IDataSetMappingsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByShareSubscriptionWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByShareSubscriptionWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperations.cs
index 9f89024743dbd..5c3c2c9f09580 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperations.cs
@@ -555,6 +555,12 @@ internal DataSetsOperations(DataShareManagementClient client)
         /// <param name='skipToken'>
         /// continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -576,7 +582,7 @@ internal DataSetsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<DataSet>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<DataSet>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -609,6 +615,8 @@ internal DataSetsOperations(DataShareManagementClient client)
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByShare", tracingParameters);
             }
@@ -628,6 +636,14 @@ internal DataSetsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperationsExtensions.cs
index f9fb1d1090ea7..8d7abcf02507b 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/DataSetsOperationsExtensions.cs
@@ -219,9 +219,15 @@ public static void Delete(this IDataSetsOperations operations, string resourceGr
             /// <param name='skipToken'>
             /// continuation token
             /// </param>
-            public static IPage<DataSet> ListByShare(this IDataSetsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string))
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<DataSet> ListByShare(this IDataSetsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken).GetAwaiter().GetResult();
+                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -245,12 +251,18 @@ public static void Delete(this IDataSetsOperations operations, string resourceGr
             /// <param name='skipToken'>
             /// continuation token
             /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<DataSet>> ListByShareAsync(this IDataSetsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<DataSet>> ListByShareAsync(this IDataSetsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IAccountsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IAccountsOperations.cs
index 93e63ba01ac9f..d6dd20a2025ce 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IAccountsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IAccountsOperations.cs
@@ -23,6 +23,31 @@ namespace Microsoft.Azure.Management.DataShare
     /// </summary>
     public partial interface IAccountsOperations
     {
+        /// <summary>
+        /// List Accounts in a subscription
+        /// </summary>
+        /// <remarks>
+        /// List Accounts in Subscription
+        /// </remarks>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DataShareErrorException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<IPage<Account>>> ListBySubscriptionWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get an account under a resource group
         /// </summary>
@@ -142,31 +167,6 @@ public partial interface IAccountsOperations
         /// </exception>
         Task<AzureOperationResponse<Account>> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, AccountUpdateParameters accountUpdateParameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List Accounts in a subscription
-        /// </summary>
-        /// <remarks>
-        /// List Accounts in Subscription
-        /// </remarks>
-        /// <param name='skipToken'>
-        /// Continuation token
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DataShareErrorException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<Account>>> ListBySubscriptionWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// List Accounts in a resource group
         /// </summary>
         /// <remarks>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IConsumerInvitationsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IConsumerInvitationsOperations.cs
index 7f1ca3ed424d0..6325b92f815e1 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IConsumerInvitationsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IConsumerInvitationsOperations.cs
@@ -24,16 +24,13 @@ namespace Microsoft.Azure.Management.DataShare
     public partial interface IConsumerInvitationsOperations
     {
         /// <summary>
-        /// Rejects the invitation identified by invitationId
+        /// List the invitations
         /// </summary>
         /// <remarks>
-        /// Reject an invitation
+        /// Lists invitations
         /// </remarks>
-        /// <param name='location'>
-        /// Location of the invitation
-        /// </param>
-        /// <param name='invitation'>
-        /// An invitation payload
+        /// <param name='skipToken'>
+        /// The continuation token
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -50,7 +47,7 @@ public partial interface IConsumerInvitationsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ConsumerInvitation>> RejectInvitationWithHttpMessagesAsync(string location, ConsumerInvitation invitation, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ConsumerInvitation>>> ListInvitationsWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the invitation identified by invitationId
         /// </summary>
@@ -80,13 +77,16 @@ public partial interface IConsumerInvitationsOperations
         /// </exception>
         Task<AzureOperationResponse<ConsumerInvitation>> GetWithHttpMessagesAsync(string location, string invitationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List the invitations
+        /// Rejects the invitation identified by invitationId
         /// </summary>
         /// <remarks>
-        /// Lists invitations
+        /// Reject an invitation
         /// </remarks>
-        /// <param name='skipToken'>
-        /// The continuation token
+        /// <param name='location'>
+        /// Location of the invitation
+        /// </param>
+        /// <param name='invitation'>
+        /// An invitation payload
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -103,7 +103,7 @@ public partial interface IConsumerInvitationsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ConsumerInvitation>>> ListInvitationsWithHttpMessagesAsync(string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ConsumerInvitation>> RejectInvitationWithHttpMessagesAsync(string location, ConsumerInvitation invitation, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// List the invitations
         /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetMappingsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetMappingsOperations.cs
index ef1bfed000fb2..9c35900c030e2 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetMappingsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetMappingsOperations.cs
@@ -146,6 +146,12 @@ public partial interface IDataSetMappingsOperations
         /// <param name='skipToken'>
         /// Continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -161,7 +167,7 @@ public partial interface IDataSetMappingsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<DataSetMapping>>> ListByShareSubscriptionWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<DataSetMapping>>> ListByShareSubscriptionWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// List DataSetMappings in a share subscription.
         /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetsOperations.cs
index d3b86037087a9..91890aaaeaf19 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IDataSetsOperations.cs
@@ -143,6 +143,12 @@ public partial interface IDataSetsOperations
         /// <param name='skipToken'>
         /// continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -158,7 +164,7 @@ public partial interface IDataSetsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<DataSet>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<DataSet>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Delete DataSet in a share.
         /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IInvitationsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IInvitationsOperations.cs
index 03d7eed02517e..c3e74ed03c194 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IInvitationsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IInvitationsOperations.cs
@@ -143,6 +143,12 @@ public partial interface IInvitationsOperations
         /// <param name='skipToken'>
         /// The continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -158,7 +164,7 @@ public partial interface IInvitationsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Invitation>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Invitation>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// List all Invitations in a share.
         /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IProviderShareSubscriptionsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IProviderShareSubscriptionsOperations.cs
index eb453727e565a..9d646a07e525a 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IProviderShareSubscriptionsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IProviderShareSubscriptionsOperations.cs
@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Management.DataShare
     public partial interface IProviderShareSubscriptionsOperations
     {
         /// <summary>
-        /// Get share subscription in a provider share.
+        /// Reinstate share subscription in a provider share.
         /// </summary>
         /// <remarks>
-        /// Get share subscription in a provider share
+        /// Reinstate share subscription in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -56,12 +56,12 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProviderShareSubscription>> GetByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ProviderShareSubscription>> ReinstateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of available share subscriptions to a provider share.
+        /// Revoke share subscription in a provider share.
         /// </summary>
         /// <remarks>
-        /// List share subscriptions in a provider share
+        /// Revoke share subscription in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -72,8 +72,8 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation Token
+        /// <param name='providerShareSubscriptionId'>
+        /// To locate shareSubscription
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -90,12 +90,12 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ProviderShareSubscription>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ProviderShareSubscription>> RevokeWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Revoke share subscription in a provider share.
+        /// Get share subscription in a provider share.
         /// </summary>
         /// <remarks>
-        /// Revoke share subscription in a provider share
+        /// Get share subscription in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -124,12 +124,12 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProviderShareSubscription>> RevokeWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ProviderShareSubscription>> GetByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Reinstate share subscription in a provider share.
+        /// List of available share subscriptions to a provider share.
         /// </summary>
         /// <remarks>
-        /// Reinstate share subscription in a provider share
+        /// List share subscriptions in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -140,8 +140,8 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='providerShareSubscriptionId'>
-        /// To locate shareSubscription
+        /// <param name='skipToken'>
+        /// Continuation Token
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -158,7 +158,7 @@ public partial interface IProviderShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProviderShareSubscription>> ReinstateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProviderShareSubscription>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Revoke share subscription in a provider share.
         /// </summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IShareSubscriptionsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IShareSubscriptionsOperations.cs
index ec220422b1bb5..0786309f949fa 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IShareSubscriptionsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/IShareSubscriptionsOperations.cs
@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Management.DataShare
     public partial interface IShareSubscriptionsOperations
     {
         /// <summary>
-        /// Get shareSubscription in an account.
+        /// Request cancellation of a data share snapshot
         /// </summary>
         /// <remarks>
-        /// Get a shareSubscription in an account
+        /// Request to cancel a synchronization.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -38,6 +38,9 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
+        /// <param name='shareSubscriptionSynchronization'>
+        /// Share Subscription Synchronization payload.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -53,12 +56,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ShareSubscription>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> CancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Create shareSubscription in an account.
+        /// Get source share synchronization settings for a shareSubscription.
         /// </summary>
         /// <remarks>
-        /// Create a shareSubscription in an account
+        /// Get synchronization settings set on a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -69,8 +72,8 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
-        /// <param name='shareSubscription'>
-        /// create parameters for shareSubscription
+        /// <param name='skipToken'>
+        /// Continuation token
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -87,12 +90,13 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ShareSubscription>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Delete shareSubscription in an account.
+        /// List data set level details for a share subscription
+        /// synchronization
         /// </summary>
         /// <remarks>
-        /// Delete a shareSubscription in an account
+        /// List synchronization details
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -101,7 +105,19 @@ public partial interface IShareSubscriptionsOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
+        /// The name of the share subscription.
+        /// </param>
+        /// <param name='shareSubscriptionSynchronization'>
+        /// Share Subscription Synchronization payload.
+        /// </param>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -118,12 +134,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of available share subscriptions under an account.
+        /// List Synchronizations in a share subscription.
         /// </summary>
         /// <remarks>
-        /// List share subscriptions in an account
+        /// List synchronizations of a share subscription
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -131,8 +147,17 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
+        /// <param name='shareSubscriptionName'>
+        /// The name of the share subscription.
+        /// </param>
         /// <param name='skipToken'>
-        /// Continuation Token
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -149,12 +174,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get source share synchronization settings for a shareSubscription.
+        /// Initiate an asynchronous data share job
         /// </summary>
         /// <remarks>
-        /// Get synchronization settings set on a share
+        /// Initiate a copy
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -163,10 +188,10 @@ public partial interface IShareSubscriptionsOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
+        /// The name of share subscription
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='synchronize'>
+        /// Synchronize payload
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -183,12 +208,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> SynchronizeMethodWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List Synchronizations in a share subscription.
+        /// Get shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// List synchronizations of a share subscription
+        /// Get a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -197,10 +222,7 @@ public partial interface IShareSubscriptionsOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the share subscription.
-        /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// The name of the shareSubscription.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -217,13 +239,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ShareSubscription>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List data set level details for a share subscription
-        /// synchronization
+        /// Create shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// Create a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -232,13 +253,10 @@ public partial interface IShareSubscriptionsOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the share subscription.
-        /// </param>
-        /// <param name='shareSubscriptionSynchronization'>
-        /// Share Subscription Synchronization payload.
+        /// The name of the shareSubscription.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='shareSubscription'>
+        /// create parameters for shareSubscription
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -255,12 +273,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ShareSubscription>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Initiate an asynchronous data share job
+        /// Delete shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// Initiate a copy
+        /// Delete a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -269,10 +287,7 @@ public partial interface IShareSubscriptionsOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of share subscription
-        /// </param>
-        /// <param name='synchronize'>
-        /// Synchronize payload
+        /// The name of the shareSubscription.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -289,12 +304,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> SynchronizeMethodWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Request cancellation of a data share snapshot
+        /// List of available share subscriptions under an account.
         /// </summary>
         /// <remarks>
-        /// Request to cancel a synchronization.
+        /// List share subscriptions in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -302,11 +317,14 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
-        /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
+        /// <param name='skipToken'>
+        /// Continuation Token
         /// </param>
-        /// <param name='shareSubscriptionSynchronization'>
-        /// Share Subscription Synchronization payload.
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -323,12 +341,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> CancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Delete shareSubscription in an account.
+        /// Request cancellation of a data share snapshot
         /// </summary>
         /// <remarks>
-        /// Delete a shareSubscription in an account
+        /// Request to cancel a synchronization.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -339,6 +357,9 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
+        /// <param name='shareSubscriptionSynchronization'>
+        /// Share Subscription Synchronization payload.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -354,7 +375,7 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<OperationResponse>> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> BeginCancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Initiate an asynchronous data share job
         /// </summary>
@@ -390,10 +411,10 @@ public partial interface IShareSubscriptionsOperations
         /// </exception>
         Task<AzureOperationResponse<ShareSubscriptionSynchronization>> BeginSynchronizeMethodWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Request cancellation of a data share snapshot
+        /// Delete shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// Request to cancel a synchronization.
+        /// Delete a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -404,9 +425,6 @@ public partial interface IShareSubscriptionsOperations
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
-        /// <param name='shareSubscriptionSynchronization'>
-        /// Share Subscription Synchronization payload.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -422,12 +440,12 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ShareSubscriptionSynchronization>> BeginCancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<OperationResponse>> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of available share subscriptions under an account.
+        /// Get source share synchronization settings for a shareSubscription.
         /// </summary>
         /// <remarks>
-        /// List share subscriptions in an account
+        /// Get synchronization settings set on a share
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -447,12 +465,13 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get source share synchronization settings for a shareSubscription.
+        /// List data set level details for a share subscription
+        /// synchronization
         /// </summary>
         /// <remarks>
-        /// Get synchronization settings set on a share
+        /// List synchronization details
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -472,7 +491,7 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// List Synchronizations in a share subscription.
         /// </summary>
@@ -499,11 +518,10 @@ public partial interface IShareSubscriptionsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>> ListSynchronizationsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List data set level details for a share subscription
-        /// synchronization
+        /// List of available share subscriptions under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List share subscriptions in an account
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -523,6 +541,6 @@ public partial interface IShareSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ISharesOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ISharesOperations.cs
index cf0eb4d8ee74b..fdc763400f508 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ISharesOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ISharesOperations.cs
@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Management.DataShare
     public partial interface ISharesOperations
     {
         /// <summary>
-        /// Get a specified share
+        /// List data set level details for a share synchronization
         /// </summary>
         /// <remarks>
-        /// Get a share
+        /// List synchronization details
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -36,7 +36,19 @@ public partial interface ISharesOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareName'>
-        /// The name of the share to retrieve.
+        /// The name of the share.
+        /// </param>
+        /// <param name='shareSynchronization'>
+        /// Share Synchronization payload.
+        /// </param>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -53,12 +65,12 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Share>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Create a share in the given account.
+        /// List Synchronizations in a share
         /// </summary>
         /// <remarks>
-        /// Create a share
+        /// List synchronizations of a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -69,8 +81,14 @@ public partial interface ISharesOperations
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='share'>
-        /// The share payload
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -87,12 +105,12 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Share>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Share share, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ShareSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Deletes a share
+        /// Get a specified share
         /// </summary>
         /// <remarks>
-        /// Delete a share
+        /// Get a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -101,7 +119,7 @@ public partial interface ISharesOperations
         /// The name of the share account.
         /// </param>
         /// <param name='shareName'>
-        /// The name of the share.
+        /// The name of the share to retrieve.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -118,12 +136,12 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Share>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of available shares under an account.
+        /// Create a share in the given account.
         /// </summary>
         /// <remarks>
-        /// List shares in an account
+        /// Create a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -131,8 +149,11 @@ public partial interface ISharesOperations
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation Token
+        /// <param name='shareName'>
+        /// The name of the share.
+        /// </param>
+        /// <param name='share'>
+        /// The share payload
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -149,12 +170,12 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Share>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Share>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Share share, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List Synchronizations in a share
+        /// Deletes a share
         /// </summary>
         /// <remarks>
-        /// List synchronizations of a share
+        /// Delete a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -165,9 +186,6 @@ public partial interface ISharesOperations
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -183,12 +201,12 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ShareSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List data set level details for a share synchronization
+        /// List of available shares under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List shares in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -196,14 +214,14 @@ public partial interface ISharesOperations
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
-        /// <param name='shareName'>
-        /// The name of the share.
+        /// <param name='skipToken'>
+        /// Continuation Token
         /// </param>
-        /// <param name='shareSynchronization'>
-        /// Share Synchronization payload.
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -220,7 +238,7 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Share>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Deletes a share
         /// </summary>
@@ -253,10 +271,10 @@ public partial interface ISharesOperations
         /// </exception>
         Task<AzureOperationResponse<OperationResponse>> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of available shares under an account.
+        /// List data set level details for a share synchronization
         /// </summary>
         /// <remarks>
-        /// List shares in an account
+        /// List synchronization details
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -276,7 +294,7 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Share>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// List Synchronizations in a share
         /// </summary>
@@ -303,10 +321,10 @@ public partial interface ISharesOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ShareSynchronization>>> ListSynchronizationsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List data set level details for a share synchronization
+        /// List of available shares under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List shares in an account
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -326,6 +344,6 @@ public partial interface ISharesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Share>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperations.cs
index 4abaebeddebd4..a08f51aff6c8c 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperations.cs
@@ -715,6 +715,12 @@ internal InvitationsOperations(DataShareManagementClient client)
         /// <param name='skipToken'>
         /// The continuation token
         /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -736,7 +742,7 @@ internal InvitationsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Invitation>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Invitation>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -769,6 +775,8 @@ internal InvitationsOperations(DataShareManagementClient client)
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByShare", tracingParameters);
             }
@@ -788,6 +796,14 @@ internal InvitationsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperationsExtensions.cs
index c8670b28a37fb..59bfe6e308472 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/InvitationsOperationsExtensions.cs
@@ -219,9 +219,15 @@ public static void Delete(this IInvitationsOperations operations, string resourc
             /// <param name='skipToken'>
             /// The continuation token
             /// </param>
-            public static IPage<Invitation> ListByShare(this IInvitationsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string))
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<Invitation> ListByShare(this IInvitationsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken).GetAwaiter().GetResult();
+                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -245,12 +251,18 @@ public static void Delete(this IInvitationsOperations operations, string resourc
             /// <param name='skipToken'>
             /// The continuation token
             /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Invitation>> ListByShareAsync(this IInvitationsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Invitation>> ListByShareAsync(this IInvitationsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSet.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSet.cs
index f453cb9d4d1f4..43d00ef299d5f 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSet.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSet.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.Azure.Management.DataShare.Models
 {
-    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// A DataSet data transfer object.
     /// </summary>
-    [Newtonsoft.Json.JsonObject("DataSet")]
     public partial class DataSet : ProxyDto
     {
         /// <summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSetMapping.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSetMapping.cs
index ee11f00c0e10f..99a33c2f8c57c 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSetMapping.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/DataSetMapping.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.Azure.Management.DataShare.Models
 {
-    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// A data set mapping data transfer object.
     /// </summary>
-    [Newtonsoft.Json.JsonObject("DataSetMapping")]
     public partial class DataSetMapping : ProxyDto
     {
         /// <summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SourceShareSynchronizationSetting.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SourceShareSynchronizationSetting.cs
index c34d9f9393f74..f15fbd2b7318a 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SourceShareSynchronizationSetting.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SourceShareSynchronizationSetting.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.Azure.Management.DataShare.Models
 {
-    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// A view of synchronization setting added by the provider
     /// </summary>
-    [Newtonsoft.Json.JsonObject("SourceShareSynchronizationSetting")]
     public partial class SourceShareSynchronizationSetting
     {
         /// <summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SynchronizationSetting.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SynchronizationSetting.cs
index 559f90889fc75..38cc15b4a9438 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SynchronizationSetting.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/SynchronizationSetting.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.Azure.Management.DataShare.Models
 {
-    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// A Synchronization Setting data transfer object.
     /// </summary>
-    [Newtonsoft.Json.JsonObject("SynchronizationSetting")]
     public partial class SynchronizationSetting : ProxyDto
     {
         /// <summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/Trigger.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/Trigger.cs
index 6ef6d0f0d61d6..d9cc431a6d371 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/Trigger.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/Models/Trigger.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.Azure.Management.DataShare.Models
 {
-    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// A Trigger data transfer object.
     /// </summary>
-    [Newtonsoft.Json.JsonObject("Trigger")]
     public partial class Trigger : ProxyDto
     {
         /// <summary>
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperations.cs
index a1884a6b8708c..2323341235d4b 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperations.cs
@@ -51,10 +51,10 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         public DataShareManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get share subscription in a provider share.
+        /// Reinstate share subscription in a provider share.
         /// </summary>
         /// <remarks>
-        /// Get share subscription in a provider share
+        /// Reinstate share subscription in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -89,7 +89,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProviderShareSubscription>> GetByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ProviderShareSubscription>> ReinstateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -127,11 +127,11 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("shareName", shareName);
                 tracingParameters.Add("providerShareSubscriptionId", providerShareSubscriptionId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetByShare", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Reinstate", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions/{providerShareSubscriptionId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions/{providerShareSubscriptionId}/reinstate").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -149,7 +149,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -263,10 +263,10 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List of available share subscriptions to a provider share.
+        /// Revoke share subscription in a provider share.
         /// </summary>
         /// <remarks>
-        /// List share subscriptions in a provider share
+        /// Revoke share subscription in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -277,8 +277,39 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation Token
+        /// <param name='providerShareSubscriptionId'>
+        /// To locate shareSubscription
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<ProviderShareSubscription>> RevokeWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<ProviderShareSubscription> _response = await BeginRevokeWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get share subscription in a provider share.
+        /// </summary>
+        /// <remarks>
+        /// Get share subscription in a provider share
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='shareName'>
+        /// The name of the share.
+        /// </param>
+        /// <param name='providerShareSubscriptionId'>
+        /// To locate shareSubscription
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -301,7 +332,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProviderShareSubscription>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ProviderShareSubscription>> GetByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -319,6 +350,10 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
             }
+            if (providerShareSubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "providerShareSubscriptionId");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -333,26 +368,23 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("providerShareSubscriptionId", providerShareSubscriptionId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByShare", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetByShare", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions/{providerShareSubscriptionId}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
             _url = _url.Replace("{shareName}", System.Uri.EscapeDataString(shareName));
+            _url = _url.Replace("{providerShareSubscriptionId}", System.Uri.EscapeDataString(providerShareSubscriptionId));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -441,7 +473,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProviderShareSubscription>>();
+            var _result = new AzureOperationResponse<ProviderShareSubscription>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -454,7 +486,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProviderShareSubscription>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProviderShareSubscription>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -474,41 +506,10 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Revoke share subscription in a provider share.
-        /// </summary>
-        /// <remarks>
-        /// Revoke share subscription in a provider share
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='shareName'>
-        /// The name of the share.
-        /// </param>
-        /// <param name='providerShareSubscriptionId'>
-        /// To locate shareSubscription
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<ProviderShareSubscription>> RevokeWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<ProviderShareSubscription> _response = await BeginRevokeWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Reinstate share subscription in a provider share.
+        /// List of available share subscriptions to a provider share.
         /// </summary>
         /// <remarks>
-        /// Reinstate share subscription in a provider share
+        /// List share subscriptions in a provider share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -519,8 +520,8 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='providerShareSubscriptionId'>
-        /// To locate shareSubscription
+        /// <param name='skipToken'>
+        /// Continuation Token
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -543,7 +544,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProviderShareSubscription>> ReinstateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProviderShareSubscription>>> ListByShareWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -561,10 +562,6 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
             }
-            if (providerShareSubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "providerShareSubscriptionId");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -579,23 +576,26 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
-                tracingParameters.Add("providerShareSubscriptionId", providerShareSubscriptionId);
+                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Reinstate", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByShare", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions/{providerShareSubscriptionId}/reinstate").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/providerShareSubscriptions").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
             _url = _url.Replace("{shareName}", System.Uri.EscapeDataString(shareName));
-            _url = _url.Replace("{providerShareSubscriptionId}", System.Uri.EscapeDataString(providerShareSubscriptionId));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -603,7 +603,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -684,7 +684,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProviderShareSubscription>();
+            var _result = new AzureOperationResponse<IPage<ProviderShareSubscription>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -697,7 +697,7 @@ internal ProviderShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProviderShareSubscription>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProviderShareSubscription>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperationsExtensions.cs
index ddf703350b119..be5dfb5201fcb 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ProviderShareSubscriptionsOperationsExtensions.cs
@@ -22,10 +22,10 @@ namespace Microsoft.Azure.Management.DataShare
     public static partial class ProviderShareSubscriptionsOperationsExtensions
     {
             /// <summary>
-            /// Get share subscription in a provider share.
+            /// Reinstate share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// Get share subscription in a provider share
+            /// Reinstate share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -42,16 +42,16 @@ public static partial class ProviderShareSubscriptionsOperationsExtensions
             /// <param name='providerShareSubscriptionId'>
             /// To locate shareSubscription
             /// </param>
-            public static ProviderShareSubscription GetByShare(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
+            public static ProviderShareSubscription Reinstate(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
             {
-                return operations.GetByShareAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
+                return operations.ReinstateAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get share subscription in a provider share.
+            /// Reinstate share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// Get share subscription in a provider share
+            /// Reinstate share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -71,19 +71,19 @@ public static ProviderShareSubscription GetByShare(this IProviderShareSubscripti
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProviderShareSubscription> GetByShareAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ProviderShareSubscription> ReinstateAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ReinstateWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List of available share subscriptions to a provider share.
+            /// Revoke share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in a provider share
+            /// Revoke share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -97,19 +97,19 @@ public static ProviderShareSubscription GetByShare(this IProviderShareSubscripti
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation Token
+            /// <param name='providerShareSubscriptionId'>
+            /// To locate shareSubscription
             /// </param>
-            public static IPage<ProviderShareSubscription> ListByShare(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string))
+            public static ProviderShareSubscription Revoke(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
             {
-                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken).GetAwaiter().GetResult();
+                return operations.RevokeAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of available share subscriptions to a provider share.
+            /// Revoke share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in a provider share
+            /// Revoke share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -123,25 +123,25 @@ public static ProviderShareSubscription GetByShare(this IProviderShareSubscripti
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation Token
+            /// <param name='providerShareSubscriptionId'>
+            /// To locate shareSubscription
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ProviderShareSubscription>> ListByShareAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ProviderShareSubscription> RevokeAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.RevokeWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Revoke share subscription in a provider share.
+            /// Get share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// Revoke share subscription in a provider share
+            /// Get share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -158,16 +158,16 @@ public static ProviderShareSubscription GetByShare(this IProviderShareSubscripti
             /// <param name='providerShareSubscriptionId'>
             /// To locate shareSubscription
             /// </param>
-            public static ProviderShareSubscription Revoke(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
+            public static ProviderShareSubscription GetByShare(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
             {
-                return operations.RevokeAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
+                return operations.GetByShareAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Revoke share subscription in a provider share.
+            /// Get share subscription in a provider share.
             /// </summary>
             /// <remarks>
-            /// Revoke share subscription in a provider share
+            /// Get share subscription in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -187,19 +187,19 @@ public static ProviderShareSubscription Revoke(this IProviderShareSubscriptionsO
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProviderShareSubscription> RevokeAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ProviderShareSubscription> GetByShareAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.RevokeWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Reinstate share subscription in a provider share.
+            /// List of available share subscriptions to a provider share.
             /// </summary>
             /// <remarks>
-            /// Reinstate share subscription in a provider share
+            /// List share subscriptions in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -213,19 +213,19 @@ public static ProviderShareSubscription Revoke(this IProviderShareSubscriptionsO
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='providerShareSubscriptionId'>
-            /// To locate shareSubscription
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
-            public static ProviderShareSubscription Reinstate(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId)
+            public static IPage<ProviderShareSubscription> ListByShare(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string))
             {
-                return operations.ReinstateAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId).GetAwaiter().GetResult();
+                return operations.ListByShareAsync(resourceGroupName, accountName, shareName, skipToken).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Reinstate share subscription in a provider share.
+            /// List of available share subscriptions to a provider share.
             /// </summary>
             /// <remarks>
-            /// Reinstate share subscription in a provider share
+            /// List share subscriptions in a provider share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -239,15 +239,15 @@ public static ProviderShareSubscription Reinstate(this IProviderShareSubscriptio
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='providerShareSubscriptionId'>
-            /// To locate shareSubscription
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProviderShareSubscription> ReinstateAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string providerShareSubscriptionId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ProviderShareSubscription>> ListByShareAsync(this IProviderShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ReinstateWithHttpMessagesAsync(resourceGroupName, accountName, shareName, providerShareSubscriptionId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByShareWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SdkInfo_DataShareManagementClient.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SdkInfo_DataShareManagementClient.cs
index f7fd47faf8d09..61a0b92feb557 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SdkInfo_DataShareManagementClient.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SdkInfo_DataShareManagementClient.cs
@@ -34,16 +34,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_DataShareManage
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "2.0.4413";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datashare/resource-manager/readme.md --csharp --version=2.0.4413 --reflect-api-versions --tag=package-2019-11-01 --csharp-sdks-folder=F:\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "9505236faa86b99b6dc58b5655d8e1c4a758d89c";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperations.cs
index 9123fff700992..b8b8aae99a514 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperations.cs
@@ -51,10 +51,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         public DataShareManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get shareSubscription in an account.
+        /// Request cancellation of a data share snapshot
         /// </summary>
         /// <remarks>
-        /// Get a shareSubscription in an account
+        /// Request to cancel a synchronization.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -65,6 +65,40 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
+        /// <param name='shareSubscriptionSynchronization'>
+        /// Share Subscription Synchronization payload.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> CancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<ShareSubscriptionSynchronization> _response = await BeginCancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get source share synchronization settings for a shareSubscription.
+        /// </summary>
+        /// <remarks>
+        /// Get synchronization settings set on a share
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='shareSubscriptionName'>
+        /// The name of the shareSubscription.
+        /// </param>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -86,7 +120,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ShareSubscription>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -118,12 +152,13 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
+                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSourceShareSynchronizationSettings", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSourceShareSynchronizationSettings").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -133,6 +168,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -140,7 +179,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -221,7 +260,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ShareSubscription>();
+            var _result = new AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -234,7 +273,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SourceShareSynchronizationSetting>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -254,10 +293,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Create shareSubscription in an account.
+        /// List data set level details for a share subscription synchronization
         /// </summary>
         /// <remarks>
-        /// Create a shareSubscription in an account
+        /// List synchronization details
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -266,10 +305,19 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
+        /// The name of the share subscription.
         /// </param>
-        /// <param name='shareSubscription'>
-        /// create parameters for shareSubscription
+        /// <param name='shareSubscriptionSynchronization'>
+        /// Share Subscription Synchronization payload.
+        /// </param>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -292,7 +340,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ShareSubscription>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -310,13 +358,13 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
             }
-            if (shareSubscription == null)
+            if (shareSubscriptionSynchronization == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscription");
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionSynchronization");
             }
-            if (shareSubscription != null)
+            if (shareSubscriptionSynchronization != null)
             {
-                shareSubscription.Validate();
+                shareSubscriptionSynchronization.Validate();
             }
             if (Client.ApiVersion == null)
             {
@@ -332,13 +380,16 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
-                tracingParameters.Add("shareSubscription", shareSubscription);
+                tracingParameters.Add("shareSubscriptionSynchronization", shareSubscriptionSynchronization);
+                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetails", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSynchronizationDetails").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -348,6 +399,18 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -355,7 +418,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -386,9 +449,9 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(shareSubscription != null)
+            if(shareSubscriptionSynchronization != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscription, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscriptionSynchronization, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -412,7 +475,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201)
+            if ((int)_statusCode != 200)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -442,7 +505,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ShareSubscription>();
+            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -455,25 +518,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 201)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -493,10 +538,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Delete shareSubscription in an account.
+        /// List Synchronizations in a share subscription.
         /// </summary>
         /// <remarks>
-        /// Delete a shareSubscription in an account
+        /// List synchronizations of a share subscription
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -505,35 +550,16 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
+        /// The name of the share subscription.
         /// </param>
-        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// List of available share subscriptions under an account.
-        /// </summary>
-        /// <remarks>
-        /// List share subscriptions in an account
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
+        /// <param name='skipToken'>
+        /// Continuation token
         /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation Token
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -556,7 +582,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -570,6 +596,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
             }
+            if (shareSubscriptionName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -583,16 +613,20 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
+                tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizations", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSynchronizations").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
+            _url = _url.Replace("{shareSubscriptionName}", System.Uri.EscapeDataString(shareSubscriptionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -602,6 +636,14 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -609,7 +651,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -690,7 +732,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ShareSubscription>>();
+            var _result = new AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -703,7 +745,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscription>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscriptionSynchronization>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -723,10 +765,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Get source share synchronization settings for a shareSubscription.
+        /// Initiate an asynchronous data share job
         /// </summary>
         /// <remarks>
-        /// Get synchronization settings set on a share
+        /// Initiate a copy
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -735,10 +777,38 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
+        /// The name of share subscription
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='synchronize'>
+        /// Synchronize payload
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> SynchronizeMethodWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<ShareSubscriptionSynchronization> _response = await BeginSynchronizeMethodWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get shareSubscription in an account.
+        /// </summary>
+        /// <remarks>
+        /// Get a shareSubscription in an account
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='shareSubscriptionName'>
+        /// The name of the shareSubscription.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -761,7 +831,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ShareSubscription>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -793,13 +863,12 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
-                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSourceShareSynchronizationSettings", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSourceShareSynchronizationSettings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -809,10 +878,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -820,7 +885,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -901,7 +966,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>();
+            var _result = new AzureOperationResponse<ShareSubscription>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -914,7 +979,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SourceShareSynchronizationSetting>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -934,10 +999,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List Synchronizations in a share subscription.
+        /// Create shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// List synchronizations of a share subscription
+        /// Create a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -946,10 +1011,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareSubscriptionName'>
-        /// The name of the share subscription.
+        /// The name of the shareSubscription.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='shareSubscription'>
+        /// create parameters for shareSubscription
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -972,7 +1037,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ShareSubscription>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -990,6 +1055,14 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
             }
+            if (shareSubscription == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscription");
+            }
+            if (shareSubscription != null)
+            {
+                shareSubscription.Validate();
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -1004,13 +1077,13 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("shareSubscription", shareSubscription);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizations", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSynchronizations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -1020,10 +1093,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1031,7 +1100,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1062,6 +1131,12 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(shareSubscription != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscription, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -1082,7 +1157,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1112,7 +1187,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ShareSubscriptionSynchronization>>();
+            var _result = new AzureOperationResponse<ShareSubscription>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1125,7 +1200,25 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscriptionSynchronization>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscription>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1145,10 +1238,38 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List data set level details for a share subscription synchronization
+        /// Delete shareSubscription in an account.
+        /// </summary>
+        /// <remarks>
+        /// Delete a shareSubscription in an account
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
+        /// </param>
+        /// <param name='shareSubscriptionName'>
+        /// The name of the shareSubscription.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// List of available share subscriptions under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List share subscriptions in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -1156,14 +1277,14 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <param name='accountName'>
         /// The name of the share account.
         /// </param>
-        /// <param name='shareSubscriptionName'>
-        /// The name of the share subscription.
+        /// <param name='skipToken'>
+        /// Continuation Token
         /// </param>
-        /// <param name='shareSubscriptionSynchronization'>
-        /// Share Subscription Synchronization payload.
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1186,7 +1307,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -1200,18 +1321,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
             }
-            if (shareSubscriptionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
-            }
-            if (shareSubscriptionSynchronization == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionSynchronization");
-            }
-            if (shareSubscriptionSynchronization != null)
-            {
-                shareSubscriptionSynchronization.Validate();
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -1225,19 +1334,18 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
-                tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
-                tracingParameters.Add("shareSubscriptionSynchronization", shareSubscriptionSynchronization);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetails", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByAccount", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/listSynchronizationDetails").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
-            _url = _url.Replace("{shareSubscriptionName}", System.Uri.EscapeDataString(shareSubscriptionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1247,6 +1355,14 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1254,7 +1370,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1285,12 +1401,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(shareSubscriptionSynchronization != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscriptionSynchronization, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -1341,7 +1451,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
+            var _result = new AzureOperationResponse<IPage<ShareSubscription>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1354,7 +1464,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscription>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1373,37 +1483,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             return _result;
         }
 
-        /// <summary>
-        /// Initiate an asynchronous data share job
-        /// </summary>
-        /// <remarks>
-        /// Initiate a copy
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='shareSubscriptionName'>
-        /// The name of share subscription
-        /// </param>
-        /// <param name='synchronize'>
-        /// Synchronize payload
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> SynchronizeMethodWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<ShareSubscriptionSynchronization> _response = await BeginSynchronizeMethodWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Request cancellation of a data share snapshot
         /// </summary>
@@ -1423,34 +1502,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// Share Subscription Synchronization payload.
         /// </param>
         /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> CancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<ShareSubscriptionSynchronization> _response = await BeginCancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Delete shareSubscription in an account.
-        /// </summary>
-        /// <remarks>
-        /// Delete a shareSubscription in an account
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='shareSubscriptionName'>
-        /// The name of the shareSubscription.
-        /// </param>
-        /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
@@ -1471,7 +1522,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<OperationResponse>> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> BeginCancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -1489,6 +1540,14 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
             }
+            if (shareSubscriptionSynchronization == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionSynchronization");
+            }
+            if (shareSubscriptionSynchronization != null)
+            {
+                shareSubscriptionSynchronization.Validate();
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -1503,12 +1562,13 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
+                tracingParameters.Add("shareSubscriptionSynchronization", shareSubscriptionSynchronization);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCancelSynchronization", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/cancelSynchronization").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -1525,7 +1585,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1556,6 +1616,12 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(shareSubscriptionSynchronization != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscriptionSynchronization, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -1576,7 +1642,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 204)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1606,7 +1672,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<OperationResponse>();
+            var _result = new AzureOperationResponse<ShareSubscriptionSynchronization>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1619,7 +1685,25 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<OperationResponse>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscriptionSynchronization>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscriptionSynchronization>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1874,10 +1958,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Request cancellation of a data share snapshot
+        /// Delete shareSubscription in an account.
         /// </summary>
         /// <remarks>
-        /// Request to cancel a synchronization.
+        /// Delete a shareSubscription in an account
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -1888,9 +1972,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <param name='shareSubscriptionName'>
         /// The name of the shareSubscription.
         /// </param>
-        /// <param name='shareSubscriptionSynchronization'>
-        /// Share Subscription Synchronization payload.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -1912,7 +1993,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ShareSubscriptionSynchronization>> BeginCancelSynchronizationWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<OperationResponse>> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -1930,14 +2011,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionName");
             }
-            if (shareSubscriptionSynchronization == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareSubscriptionSynchronization");
-            }
-            if (shareSubscriptionSynchronization != null)
-            {
-                shareSubscriptionSynchronization.Validate();
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -1952,13 +2025,12 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareSubscriptionName", shareSubscriptionName);
-                tracingParameters.Add("shareSubscriptionSynchronization", shareSubscriptionSynchronization);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCancelSynchronization", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}/cancelSynchronization").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shareSubscriptions/{shareSubscriptionName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -1975,7 +2047,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -2006,12 +2078,6 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(shareSubscriptionSynchronization != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSubscriptionSynchronization, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -2032,7 +2098,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 204)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -2062,7 +2128,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ShareSubscriptionSynchronization>();
+            var _result = new AzureOperationResponse<OperationResponse>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2075,25 +2141,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscriptionSynchronization>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ShareSubscriptionSynchronization>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<OperationResponse>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2113,10 +2161,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List of available share subscriptions under an account.
+        /// Get source share synchronization settings for a shareSubscription.
         /// </summary>
         /// <remarks>
-        /// List share subscriptions in an account
+        /// Get synchronization settings set on a share
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2142,7 +2190,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -2157,7 +2205,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByAccountNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSourceShareSynchronizationSettingsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -2170,7 +2218,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -2251,7 +2299,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ShareSubscription>>();
+            var _result = new AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2264,7 +2312,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscription>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SourceShareSynchronizationSetting>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2284,10 +2332,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Get source share synchronization settings for a shareSubscription.
+        /// List data set level details for a share subscription synchronization
         /// </summary>
         /// <remarks>
-        /// Get synchronization settings set on a share
+        /// List synchronization details
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2313,7 +2361,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>> ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -2328,7 +2376,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSourceShareSynchronizationSettingsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetailsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -2422,7 +2470,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SourceShareSynchronizationSetting>>();
+            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2435,7 +2483,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SourceShareSynchronizationSetting>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2626,10 +2674,10 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List data set level details for a share subscription synchronization
+        /// List of available share subscriptions under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List share subscriptions in an account
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2655,7 +2703,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ShareSubscription>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -2670,7 +2718,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetailsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByAccountNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -2683,7 +2731,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -2764,7 +2812,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
+            var _result = new AzureOperationResponse<IPage<ShareSubscription>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2777,7 +2825,7 @@ internal ShareSubscriptionsOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSubscription>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperationsExtensions.cs
index d8a710c32e3e2..946c94ef1f643 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/ShareSubscriptionsOperationsExtensions.cs
@@ -22,10 +22,10 @@ namespace Microsoft.Azure.Management.DataShare
     public static partial class ShareSubscriptionsOperationsExtensions
     {
             /// <summary>
-            /// Get shareSubscription in an account.
+            /// Request cancellation of a data share snapshot
             /// </summary>
             /// <remarks>
-            /// Get a shareSubscription in an account
+            /// Request to cancel a synchronization.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,16 +39,19 @@ public static partial class ShareSubscriptionsOperationsExtensions
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            public static ShareSubscription Get(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
+            public static ShareSubscriptionSynchronization CancelSynchronization(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization)
             {
-                return operations.GetAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
+                return operations.CancelSynchronizationAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get shareSubscription in an account.
+            /// Request cancellation of a data share snapshot
             /// </summary>
             /// <remarks>
-            /// Get a shareSubscription in an account
+            /// Request to cancel a synchronization.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -62,22 +65,25 @@ public static ShareSubscription Get(this IShareSubscriptionsOperations operation
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ShareSubscription> GetAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ShareSubscriptionSynchronization> CancelSynchronizationAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.CancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Create shareSubscription in an account.
+            /// Get source share synchronization settings for a shareSubscription.
             /// </summary>
             /// <remarks>
-            /// Create a shareSubscription in an account
+            /// Get synchronization settings set on a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -91,19 +97,19 @@ public static ShareSubscription Get(this IShareSubscriptionsOperations operation
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            /// <param name='shareSubscription'>
-            /// create parameters for shareSubscription
+            /// <param name='skipToken'>
+            /// Continuation token
             /// </param>
-            public static ShareSubscription Create(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription)
+            public static IPage<SourceShareSynchronizationSetting> ListSourceShareSynchronizationSettings(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string))
             {
-                return operations.CreateAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscription).GetAwaiter().GetResult();
+                return operations.ListSourceShareSynchronizationSettingsAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Create shareSubscription in an account.
+            /// Get source share synchronization settings for a shareSubscription.
             /// </summary>
             /// <remarks>
-            /// Create a shareSubscription in an account
+            /// Get synchronization settings set on a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -117,25 +123,25 @@ public static ShareSubscription Create(this IShareSubscriptionsOperations operat
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            /// <param name='shareSubscription'>
-            /// create parameters for shareSubscription
+            /// <param name='skipToken'>
+            /// Continuation token
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ShareSubscription> CreateAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SourceShareSynchronizationSetting>> ListSourceShareSynchronizationSettingsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscription, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Delete shareSubscription in an account.
+            /// List data set level details for a share subscription synchronization
             /// </summary>
             /// <remarks>
-            /// Delete a shareSubscription in an account
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -147,18 +153,30 @@ public static ShareSubscription Create(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// The name of the share subscription.
             /// </param>
-            public static OperationResponse Delete(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<SynchronizationDetails> ListSynchronizationDetails(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.DeleteAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
+                return operations.ListSynchronizationDetailsAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Delete shareSubscription in an account.
+            /// List data set level details for a share subscription synchronization
             /// </summary>
             /// <remarks>
-            /// Delete a shareSubscription in an account
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -170,24 +188,36 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// The name of the share subscription.
+            /// </param>
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<OperationResponse> DeleteAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.DeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationDetailsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List of available share subscriptions under an account.
+            /// List Synchronizations in a share subscription.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in an account
+            /// List synchronizations of a share subscription
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -198,19 +228,28 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
+            /// <param name='shareSubscriptionName'>
+            /// The name of the share subscription.
+            /// </param>
             /// <param name='skipToken'>
-            /// Continuation Token
+            /// Continuation token
             /// </param>
-            public static IPage<ShareSubscription> ListByAccount(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string skipToken = default(string))
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<ShareSubscriptionSynchronization> ListSynchronizations(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.ListByAccountAsync(resourceGroupName, accountName, skipToken).GetAwaiter().GetResult();
+                return operations.ListSynchronizationsAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of available share subscriptions under an account.
+            /// List Synchronizations in a share subscription.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in an account
+            /// List synchronizations of a share subscription
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -221,25 +260,34 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
+            /// <param name='shareSubscriptionName'>
+            /// The name of the share subscription.
+            /// </param>
             /// <param name='skipToken'>
-            /// Continuation Token
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ShareSubscription>> ListByAccountAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ShareSubscriptionSynchronization>> ListSynchronizationsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByAccountWithHttpMessagesAsync(resourceGroupName, accountName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get source share synchronization settings for a shareSubscription.
+            /// Initiate an asynchronous data share job
             /// </summary>
             /// <remarks>
-            /// Get synchronization settings set on a share
+            /// Initiate a copy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -251,21 +299,21 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// The name of share subscription
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='synchronize'>
+            /// Synchronize payload
             /// </param>
-            public static IPage<SourceShareSynchronizationSetting> ListSourceShareSynchronizationSettings(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string))
+            public static ShareSubscriptionSynchronization SynchronizeMethod(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize)
             {
-                return operations.ListSourceShareSynchronizationSettingsAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken).GetAwaiter().GetResult();
+                return operations.SynchronizeMethodAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get source share synchronization settings for a shareSubscription.
+            /// Initiate an asynchronous data share job
             /// </summary>
             /// <remarks>
-            /// Get synchronization settings set on a share
+            /// Initiate a copy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -277,27 +325,27 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// The name of share subscription
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='synchronize'>
+            /// Synchronize payload
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SourceShareSynchronizationSetting>> ListSourceShareSynchronizationSettingsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ShareSubscriptionSynchronization> SynchronizeMethodAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSourceShareSynchronizationSettingsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.SynchronizeMethodWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List Synchronizations in a share subscription.
+            /// Get shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// List synchronizations of a share subscription
+            /// Get a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -309,21 +357,18 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the share subscription.
-            /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// The name of the shareSubscription.
             /// </param>
-            public static IPage<ShareSubscriptionSynchronization> ListSynchronizations(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string))
+            public static ShareSubscription Get(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
             {
-                return operations.ListSynchronizationsAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken).GetAwaiter().GetResult();
+                return operations.GetAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List Synchronizations in a share subscription.
+            /// Get shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// List synchronizations of a share subscription
+            /// Get a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -335,27 +380,24 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the share subscription.
-            /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// The name of the shareSubscription.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ShareSubscriptionSynchronization>> ListSynchronizationsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ShareSubscription> GetAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List data set level details for a share subscription synchronization
+            /// Create shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// Create a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -367,24 +409,21 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the share subscription.
-            /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
+            /// The name of the shareSubscription.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='shareSubscription'>
+            /// create parameters for shareSubscription
             /// </param>
-            public static IPage<SynchronizationDetails> ListSynchronizationDetails(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string))
+            public static ShareSubscription Create(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription)
             {
-                return operations.ListSynchronizationDetailsAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, skipToken).GetAwaiter().GetResult();
+                return operations.CreateAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscription).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List data set level details for a share subscription synchronization
+            /// Create shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// Create a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -396,30 +435,27 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of the share subscription.
-            /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
+            /// The name of the shareSubscription.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='shareSubscription'>
+            /// create parameters for shareSubscription
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ShareSubscription> CreateAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscription shareSubscription, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationDetailsWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscription, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Initiate an asynchronous data share job
+            /// Delete shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// Initiate a copy
+            /// Delete a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -431,21 +467,18 @@ public static OperationResponse Delete(this IShareSubscriptionsOperations operat
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of share subscription
-            /// </param>
-            /// <param name='synchronize'>
-            /// Synchronize payload
+            /// The name of the shareSubscription.
             /// </param>
-            public static ShareSubscriptionSynchronization SynchronizeMethod(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize)
+            public static OperationResponse Delete(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
             {
-                return operations.SynchronizeMethodAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize).GetAwaiter().GetResult();
+                return operations.DeleteAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Initiate an asynchronous data share job
+            /// Delete shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// Initiate a copy
+            /// Delete a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -457,27 +490,24 @@ public static ShareSubscriptionSynchronization SynchronizeMethod(this IShareSubs
             /// The name of the share account.
             /// </param>
             /// <param name='shareSubscriptionName'>
-            /// The name of share subscription
-            /// </param>
-            /// <param name='synchronize'>
-            /// Synchronize payload
+            /// The name of the shareSubscription.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ShareSubscriptionSynchronization> SynchronizeMethodAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, Synchronize synchronize, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<OperationResponse> DeleteAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.SynchronizeMethodWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, synchronize, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.DeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Request cancellation of a data share snapshot
+            /// List of available share subscriptions under an account.
             /// </summary>
             /// <remarks>
-            /// Request to cancel a synchronization.
+            /// List share subscriptions in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -488,22 +518,25 @@ public static ShareSubscriptionSynchronization SynchronizeMethod(this IShareSubs
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
             /// </param>
-            public static ShareSubscriptionSynchronization CancelSynchronization(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization)
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<ShareSubscription> ListByAccount(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.CancelSynchronizationAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization).GetAwaiter().GetResult();
+                return operations.ListByAccountAsync(resourceGroupName, accountName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Request cancellation of a data share snapshot
+            /// List of available share subscriptions under an account.
             /// </summary>
             /// <remarks>
-            /// Request to cancel a synchronization.
+            /// List share subscriptions in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -514,28 +547,31 @@ public static ShareSubscriptionSynchronization CancelSynchronization(this IShare
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='shareSubscriptionName'>
-            /// The name of the shareSubscription.
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ShareSubscriptionSynchronization> CancelSynchronizationAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ShareSubscription>> ListByAccountAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.CancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByAccountWithHttpMessagesAsync(resourceGroupName, accountName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Delete shareSubscription in an account.
+            /// Request cancellation of a data share snapshot
             /// </summary>
             /// <remarks>
-            /// Delete a shareSubscription in an account
+            /// Request to cancel a synchronization.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -549,16 +585,19 @@ public static ShareSubscriptionSynchronization CancelSynchronization(this IShare
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            public static OperationResponse BeginDelete(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
+            public static ShareSubscriptionSynchronization BeginCancelSynchronization(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization)
             {
-                return operations.BeginDeleteAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
+                return operations.BeginCancelSynchronizationAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Delete shareSubscription in an account.
+            /// Request cancellation of a data share snapshot
             /// </summary>
             /// <remarks>
-            /// Delete a shareSubscription in an account
+            /// Request to cancel a synchronization.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -572,12 +611,15 @@ public static OperationResponse BeginDelete(this IShareSubscriptionsOperations o
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
+            /// <param name='shareSubscriptionSynchronization'>
+            /// Share Subscription Synchronization payload.
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<OperationResponse> BeginDeleteAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ShareSubscriptionSynchronization> BeginCancelSynchronizationAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginCancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -642,10 +684,10 @@ public static ShareSubscriptionSynchronization BeginSynchronizeMethod(this IShar
             }
 
             /// <summary>
-            /// Request cancellation of a data share snapshot
+            /// Delete shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// Request to cancel a synchronization.
+            /// Delete a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -659,19 +701,16 @@ public static ShareSubscriptionSynchronization BeginSynchronizeMethod(this IShar
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
-            /// </param>
-            public static ShareSubscriptionSynchronization BeginCancelSynchronization(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization)
+            public static OperationResponse BeginDelete(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName)
             {
-                return operations.BeginCancelSynchronizationAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization).GetAwaiter().GetResult();
+                return operations.BeginDeleteAsync(resourceGroupName, accountName, shareSubscriptionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Request cancellation of a data share snapshot
+            /// Delete shareSubscription in an account.
             /// </summary>
             /// <remarks>
-            /// Request to cancel a synchronization.
+            /// Delete a shareSubscription in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -685,25 +724,22 @@ public static ShareSubscriptionSynchronization BeginCancelSynchronization(this I
             /// <param name='shareSubscriptionName'>
             /// The name of the shareSubscription.
             /// </param>
-            /// <param name='shareSubscriptionSynchronization'>
-            /// Share Subscription Synchronization payload.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ShareSubscriptionSynchronization> BeginCancelSynchronizationAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, ShareSubscriptionSynchronization shareSubscriptionSynchronization, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<OperationResponse> BeginDeleteAsync(this IShareSubscriptionsOperations operations, string resourceGroupName, string accountName, string shareSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginCancelSynchronizationWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, shareSubscriptionSynchronization, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareSubscriptionName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List of available share subscriptions under an account.
+            /// Get source share synchronization settings for a shareSubscription.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in an account
+            /// Get synchronization settings set on a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -711,16 +747,16 @@ public static ShareSubscriptionSynchronization BeginCancelSynchronization(this I
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<ShareSubscription> ListByAccountNext(this IShareSubscriptionsOperations operations, string nextPageLink)
+            public static IPage<SourceShareSynchronizationSetting> ListSourceShareSynchronizationSettingsNext(this IShareSubscriptionsOperations operations, string nextPageLink)
             {
-                return operations.ListByAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListSourceShareSynchronizationSettingsNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of available share subscriptions under an account.
+            /// Get source share synchronization settings for a shareSubscription.
             /// </summary>
             /// <remarks>
-            /// List share subscriptions in an account
+            /// Get synchronization settings set on a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -731,19 +767,19 @@ public static IPage<ShareSubscription> ListByAccountNext(this IShareSubscription
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ShareSubscription>> ListByAccountNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SourceShareSynchronizationSetting>> ListSourceShareSynchronizationSettingsNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get source share synchronization settings for a shareSubscription.
+            /// List data set level details for a share subscription synchronization
             /// </summary>
             /// <remarks>
-            /// Get synchronization settings set on a share
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -751,16 +787,16 @@ public static IPage<ShareSubscription> ListByAccountNext(this IShareSubscription
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<SourceShareSynchronizationSetting> ListSourceShareSynchronizationSettingsNext(this IShareSubscriptionsOperations operations, string nextPageLink)
+            public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this IShareSubscriptionsOperations operations, string nextPageLink)
             {
-                return operations.ListSourceShareSynchronizationSettingsNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListSynchronizationDetailsNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get source share synchronization settings for a shareSubscription.
+            /// List data set level details for a share subscription synchronization
             /// </summary>
             /// <remarks>
-            /// Get synchronization settings set on a share
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -771,9 +807,9 @@ public static IPage<SourceShareSynchronizationSetting> ListSourceShareSynchroniz
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SourceShareSynchronizationSetting>> ListSourceShareSynchronizationSettingsNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSourceShareSynchronizationSettingsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationDetailsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -820,10 +856,10 @@ public static IPage<ShareSubscriptionSynchronization> ListSynchronizationsNext(t
             }
 
             /// <summary>
-            /// List data set level details for a share subscription synchronization
+            /// List of available share subscriptions under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List share subscriptions in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -831,16 +867,16 @@ public static IPage<ShareSubscriptionSynchronization> ListSynchronizationsNext(t
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this IShareSubscriptionsOperations operations, string nextPageLink)
+            public static IPage<ShareSubscription> ListByAccountNext(this IShareSubscriptionsOperations operations, string nextPageLink)
             {
-                return operations.ListSynchronizationDetailsNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListByAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List data set level details for a share subscription synchronization
+            /// List of available share subscriptions under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List share subscriptions in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -851,9 +887,9 @@ public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ShareSubscription>> ListByAccountNextAsync(this IShareSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationDetailsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperations.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperations.cs
index 8253d02d53969..caf5cd91797ac 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperations.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperations.cs
@@ -51,10 +51,10 @@ internal SharesOperations(DataShareManagementClient client)
         public DataShareManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get a specified share
+        /// List data set level details for a share synchronization
         /// </summary>
         /// <remarks>
-        /// Get a share
+        /// List synchronization details
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -63,7 +63,19 @@ internal SharesOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareName'>
-        /// The name of the share to retrieve.
+        /// The name of the share.
+        /// </param>
+        /// <param name='shareSynchronization'>
+        /// Share Synchronization payload.
+        /// </param>
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -86,7 +98,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Share>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -104,6 +116,10 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
             }
+            if (shareSynchronization == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareSynchronization");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -118,12 +134,16 @@ internal SharesOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
+                tracingParameters.Add("shareSynchronization", shareSynchronization);
+                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetails", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/listSynchronizationDetails").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -133,6 +153,18 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -140,7 +172,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -171,6 +203,12 @@ internal SharesOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(shareSynchronization != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSynchronization, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -221,7 +259,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Share>();
+            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -234,7 +272,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -254,10 +292,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Create a share in the given account.
+        /// List Synchronizations in a share
         /// </summary>
         /// <remarks>
-        /// Create a share
+        /// List synchronizations of a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -268,8 +306,14 @@ internal SharesOperations(DataShareManagementClient client)
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='share'>
-        /// The share payload
+        /// <param name='skipToken'>
+        /// Continuation token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -292,7 +336,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Share>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Share share, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ShareSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -310,10 +354,6 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
             }
-            if (share == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "share");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -328,13 +368,15 @@ internal SharesOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
-                tracingParameters.Add("share", share);
+                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizations", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/listSynchronizations").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -344,6 +386,18 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (skipToken != null)
+            {
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
+            }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -351,7 +405,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -382,12 +436,6 @@ internal SharesOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(share != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(share, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -408,7 +456,7 @@ internal SharesOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201)
+            if ((int)_statusCode != 200)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -438,7 +486,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Share>();
+            var _result = new AzureOperationResponse<IPage<ShareSynchronization>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -451,25 +499,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 201)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSynchronization>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -489,10 +519,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// Deletes a share
+        /// Get a specified share
         /// </summary>
         /// <remarks>
-        /// Delete a share
+        /// Get a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -501,35 +531,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// The name of the share account.
         /// </param>
         /// <param name='shareName'>
-        /// The name of the share.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// List of available shares under an account.
-        /// </summary>
-        /// <remarks>
-        /// List shares in an account
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// The resource group name.
-        /// </param>
-        /// <param name='accountName'>
-        /// The name of the share account.
-        /// </param>
-        /// <param name='skipToken'>
-        /// Continuation Token
+        /// The name of the share to retrieve.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -552,7 +554,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Share>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Share>> GetWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -566,6 +568,10 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
             }
+            if (shareName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -579,25 +585,22 @@ internal SharesOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("shareName", shareName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
+            _url = _url.Replace("{shareName}", System.Uri.EscapeDataString(shareName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -686,7 +689,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Share>>();
+            var _result = new AzureOperationResponse<Share>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -699,7 +702,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Share>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -719,10 +722,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List Synchronizations in a share
+        /// Create a share in the given account.
         /// </summary>
         /// <remarks>
-        /// List synchronizations of a share
+        /// Create a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -733,8 +736,8 @@ internal SharesOperations(DataShareManagementClient client)
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='skipToken'>
-        /// Continuation token
+        /// <param name='share'>
+        /// The share payload
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -757,7 +760,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ShareSynchronization>>> ListSynchronizationsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Share>> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Share share, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -775,6 +778,10 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
             }
+            if (share == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "share");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -789,13 +796,13 @@ internal SharesOperations(DataShareManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
                 tracingParameters.Add("shareName", shareName);
-                tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("share", share);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizations", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/listSynchronizations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
@@ -805,10 +812,6 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -816,7 +819,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -847,6 +850,12 @@ internal SharesOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(share != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(share, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -867,7 +876,7 @@ internal SharesOperations(DataShareManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201)
             {
                 var ex = new DataShareErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -897,7 +906,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ShareSynchronization>>();
+            var _result = new AzureOperationResponse<Share>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -910,7 +919,25 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ShareSynchronization>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Share>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -930,10 +957,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List data set level details for a share synchronization
+        /// Deletes a share
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// Delete a share
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// The resource group name.
@@ -944,11 +971,39 @@ internal SharesOperations(DataShareManagementClient client)
         /// <param name='shareName'>
         /// The name of the share.
         /// </param>
-        /// <param name='shareSynchronization'>
-        /// Share Synchronization payload.
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<OperationResponse>> DeleteWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<OperationResponse> _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareName, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// List of available shares under an account.
+        /// </summary>
+        /// <remarks>
+        /// List shares in an account
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// The resource group name.
+        /// </param>
+        /// <param name='accountName'>
+        /// The name of the share account.
         /// </param>
         /// <param name='skipToken'>
-        /// Continuation token
+        /// Continuation Token
+        /// </param>
+        /// <param name='filter'>
+        /// Filters the results using OData syntax.
+        /// </param>
+        /// <param name='orderby'>
+        /// Sorts the results using OData syntax.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -971,7 +1026,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsWithHttpMessagesAsync(string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Share>>> ListByAccountWithHttpMessagesAsync(string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
@@ -985,14 +1040,6 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "accountName");
             }
-            if (shareName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareName");
-            }
-            if (shareSynchronization == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "shareSynchronization");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -1006,19 +1053,18 @@ internal SharesOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("accountName", accountName);
-                tracingParameters.Add("shareName", shareName);
-                tracingParameters.Add("shareSynchronization", shareSynchronization);
                 tracingParameters.Add("skipToken", skipToken);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("orderby", orderby);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetails", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByAccount", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares/{shareName}/listSynchronizationDetails").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataShare/accounts/{accountName}/shares").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
-            _url = _url.Replace("{shareName}", System.Uri.EscapeDataString(shareName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1028,6 +1074,14 @@ internal SharesOperations(DataShareManagementClient client)
             {
                 _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
+            if (orderby != null)
+            {
+                _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1035,7 +1089,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1066,12 +1120,6 @@ internal SharesOperations(DataShareManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(shareSynchronization != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(shareSynchronization, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -1122,7 +1170,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
+            var _result = new AzureOperationResponse<IPage<Share>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1135,7 +1183,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Share>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1358,10 +1406,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List of available shares under an account.
+        /// List data set level details for a share synchronization
         /// </summary>
         /// <remarks>
-        /// List shares in an account
+        /// List synchronization details
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1387,7 +1435,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Share>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -1402,7 +1450,7 @@ internal SharesOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByAccountNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetailsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -1415,7 +1463,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1496,7 +1544,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Share>>();
+            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1509,7 +1557,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Share>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1700,10 +1748,10 @@ internal SharesOperations(DataShareManagementClient client)
         }
 
         /// <summary>
-        /// List data set level details for a share synchronization
+        /// List of available shares under an account.
         /// </summary>
         /// <remarks>
-        /// List synchronization details
+        /// List shares in an account
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1729,7 +1777,7 @@ internal SharesOperations(DataShareManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SynchronizationDetails>>> ListSynchronizationDetailsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Share>>> ListByAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -1744,7 +1792,7 @@ internal SharesOperations(DataShareManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSynchronizationDetailsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByAccountNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -1757,7 +1805,7 @@ internal SharesOperations(DataShareManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -1838,7 +1886,7 @@ internal SharesOperations(DataShareManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SynchronizationDetails>>();
+            var _result = new AzureOperationResponse<IPage<Share>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1851,7 +1899,7 @@ internal SharesOperations(DataShareManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SynchronizationDetails>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Share>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperationsExtensions.cs b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperationsExtensions.cs
index 190c573091d44..f82691ed68372 100644
--- a/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperationsExtensions.cs
+++ b/sdk/datashare/Microsoft.Azure.Management.DataShare/src/Generated/SharesOperationsExtensions.cs
@@ -22,10 +22,10 @@ namespace Microsoft.Azure.Management.DataShare
     public static partial class SharesOperationsExtensions
     {
             /// <summary>
-            /// Get a specified share
+            /// List data set level details for a share synchronization
             /// </summary>
             /// <remarks>
-            /// Get a share
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -37,18 +37,30 @@ public static partial class SharesOperationsExtensions
             /// The name of the share account.
             /// </param>
             /// <param name='shareName'>
-            /// The name of the share to retrieve.
+            /// The name of the share.
             /// </param>
-            public static Share Get(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName)
+            /// <param name='shareSynchronization'>
+            /// Share Synchronization payload.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<SynchronizationDetails> ListSynchronizationDetails(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.GetAsync(resourceGroupName, accountName, shareName).GetAwaiter().GetResult();
+                return operations.ListSynchronizationDetailsAsync(resourceGroupName, accountName, shareName, shareSynchronization, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get a specified share
+            /// List data set level details for a share synchronization
             /// </summary>
             /// <remarks>
-            /// Get a share
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -60,24 +72,36 @@ public static Share Get(this ISharesOperations operations, string resourceGroupN
             /// The name of the share account.
             /// </param>
             /// <param name='shareName'>
-            /// The name of the share to retrieve.
+            /// The name of the share.
+            /// </param>
+            /// <param name='shareSynchronization'>
+            /// Share Synchronization payload.
+            /// </param>
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Share> GetAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, accountName, shareName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationDetailsWithHttpMessagesAsync(resourceGroupName, accountName, shareName, shareSynchronization, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Create a share in the given account.
+            /// List Synchronizations in a share
             /// </summary>
             /// <remarks>
-            /// Create a share
+            /// List synchronizations of a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -91,19 +115,25 @@ public static Share Get(this ISharesOperations operations, string resourceGroupN
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='share'>
-            /// The share payload
+            /// <param name='skipToken'>
+            /// Continuation token
             /// </param>
-            public static Share Create(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, Share share)
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
+            /// </param>
+            public static IPage<ShareSynchronization> ListSynchronizations(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.CreateAsync(resourceGroupName, accountName, shareName, share).GetAwaiter().GetResult();
+                return operations.ListSynchronizationsAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Create a share in the given account.
+            /// List Synchronizations in a share
             /// </summary>
             /// <remarks>
-            /// Create a share
+            /// List synchronizations of a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -117,25 +147,31 @@ public static Share Create(this ISharesOperations operations, string resourceGro
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='share'>
-            /// The share payload
+            /// <param name='skipToken'>
+            /// Continuation token
+            /// </param>
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
+            /// </param>
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Share> CreateAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, Share share, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ShareSynchronization>> ListSynchronizationsAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, shareName, share, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationsWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Deletes a share
+            /// Get a specified share
             /// </summary>
             /// <remarks>
-            /// Delete a share
+            /// Get a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -147,18 +183,18 @@ public static Share Create(this ISharesOperations operations, string resourceGro
             /// The name of the share account.
             /// </param>
             /// <param name='shareName'>
-            /// The name of the share.
+            /// The name of the share to retrieve.
             /// </param>
-            public static OperationResponse Delete(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName)
+            public static Share Get(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName)
             {
-                return operations.DeleteAsync(resourceGroupName, accountName, shareName).GetAwaiter().GetResult();
+                return operations.GetAsync(resourceGroupName, accountName, shareName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Deletes a share
+            /// Get a specified share
             /// </summary>
             /// <remarks>
-            /// Delete a share
+            /// Get a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -170,24 +206,24 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// The name of the share account.
             /// </param>
             /// <param name='shareName'>
-            /// The name of the share.
+            /// The name of the share to retrieve.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<OperationResponse> DeleteAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Share> GetAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.DeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, accountName, shareName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List of available shares under an account.
+            /// Create a share in the given account.
             /// </summary>
             /// <remarks>
-            /// List shares in an account
+            /// Create a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -198,19 +234,22 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation Token
+            /// <param name='shareName'>
+            /// The name of the share.
             /// </param>
-            public static IPage<Share> ListByAccount(this ISharesOperations operations, string resourceGroupName, string accountName, string skipToken = default(string))
+            /// <param name='share'>
+            /// The share payload
+            /// </param>
+            public static Share Create(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, Share share)
             {
-                return operations.ListByAccountAsync(resourceGroupName, accountName, skipToken).GetAwaiter().GetResult();
+                return operations.CreateAsync(resourceGroupName, accountName, shareName, share).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of available shares under an account.
+            /// Create a share in the given account.
             /// </summary>
             /// <remarks>
-            /// List shares in an account
+            /// Create a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -221,25 +260,28 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation Token
+            /// <param name='shareName'>
+            /// The name of the share.
+            /// </param>
+            /// <param name='share'>
+            /// The share payload
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Share>> ListByAccountAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Share> CreateAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, Share share, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByAccountWithHttpMessagesAsync(resourceGroupName, accountName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, shareName, share, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List Synchronizations in a share
+            /// Deletes a share
             /// </summary>
             /// <remarks>
-            /// List synchronizations of a share
+            /// Delete a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -253,19 +295,16 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
-            /// </param>
-            public static IPage<ShareSynchronization> ListSynchronizations(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string))
+            public static OperationResponse Delete(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName)
             {
-                return operations.ListSynchronizationsAsync(resourceGroupName, accountName, shareName, skipToken).GetAwaiter().GetResult();
+                return operations.DeleteAsync(resourceGroupName, accountName, shareName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List Synchronizations in a share
+            /// Deletes a share
             /// </summary>
             /// <remarks>
-            /// List synchronizations of a share
+            /// Delete a share
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -279,25 +318,22 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='shareName'>
             /// The name of the share.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ShareSynchronization>> ListSynchronizationsAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<OperationResponse> DeleteAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationsWithHttpMessagesAsync(resourceGroupName, accountName, shareName, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.DeleteWithHttpMessagesAsync(resourceGroupName, accountName, shareName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List data set level details for a share synchronization
+            /// List of available shares under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List shares in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -308,25 +344,25 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='shareName'>
-            /// The name of the share.
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
-            /// <param name='shareSynchronization'>
-            /// Share Synchronization payload.
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
-            public static IPage<SynchronizationDetails> ListSynchronizationDetails(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string))
+            public static IPage<Share> ListByAccount(this ISharesOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string))
             {
-                return operations.ListSynchronizationDetailsAsync(resourceGroupName, accountName, shareName, shareSynchronization, skipToken).GetAwaiter().GetResult();
+                return operations.ListByAccountAsync(resourceGroupName, accountName, skipToken, filter, orderby).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List data set level details for a share synchronization
+            /// List of available shares under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List shares in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -337,21 +373,21 @@ public static OperationResponse Delete(this ISharesOperations operations, string
             /// <param name='accountName'>
             /// The name of the share account.
             /// </param>
-            /// <param name='shareName'>
-            /// The name of the share.
+            /// <param name='skipToken'>
+            /// Continuation Token
             /// </param>
-            /// <param name='shareSynchronization'>
-            /// Share Synchronization payload.
+            /// <param name='filter'>
+            /// Filters the results using OData syntax.
             /// </param>
-            /// <param name='skipToken'>
-            /// Continuation token
+            /// <param name='orderby'>
+            /// Sorts the results using OData syntax.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string shareName, ShareSynchronization shareSynchronization, string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Share>> ListByAccountAsync(this ISharesOperations operations, string resourceGroupName, string accountName, string skipToken = default(string), string filter = default(string), string orderby = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationDetailsWithHttpMessagesAsync(resourceGroupName, accountName, shareName, shareSynchronization, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByAccountWithHttpMessagesAsync(resourceGroupName, accountName, skipToken, filter, orderby, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -410,10 +446,10 @@ public static OperationResponse BeginDelete(this ISharesOperations operations, s
             }
 
             /// <summary>
-            /// List of available shares under an account.
+            /// List data set level details for a share synchronization
             /// </summary>
             /// <remarks>
-            /// List shares in an account
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -421,16 +457,16 @@ public static OperationResponse BeginDelete(this ISharesOperations operations, s
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<Share> ListByAccountNext(this ISharesOperations operations, string nextPageLink)
+            public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this ISharesOperations operations, string nextPageLink)
             {
-                return operations.ListByAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListSynchronizationDetailsNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of available shares under an account.
+            /// List data set level details for a share synchronization
             /// </summary>
             /// <remarks>
-            /// List shares in an account
+            /// List synchronization details
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -441,9 +477,9 @@ public static IPage<Share> ListByAccountNext(this ISharesOperations operations,
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Share>> ListByAccountNextAsync(this ISharesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsNextAsync(this ISharesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSynchronizationDetailsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -490,10 +526,10 @@ public static IPage<ShareSynchronization> ListSynchronizationsNext(this ISharesO
             }
 
             /// <summary>
-            /// List data set level details for a share synchronization
+            /// List of available shares under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List shares in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -501,16 +537,16 @@ public static IPage<ShareSynchronization> ListSynchronizationsNext(this ISharesO
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this ISharesOperations operations, string nextPageLink)
+            public static IPage<Share> ListByAccountNext(this ISharesOperations operations, string nextPageLink)
             {
-                return operations.ListSynchronizationDetailsNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListByAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List data set level details for a share synchronization
+            /// List of available shares under an account.
             /// </summary>
             /// <remarks>
-            /// List synchronization details
+            /// List shares in an account
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -521,9 +557,9 @@ public static IPage<SynchronizationDetails> ListSynchronizationDetailsNext(this
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<SynchronizationDetails>> ListSynchronizationDetailsNextAsync(this ISharesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Share>> ListByAccountNextAsync(this ISharesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListSynchronizationDetailsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }