Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SDKs/ServiceFabric/AzSdk.RP.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>ServiceFabric_2017-07-01-preview;ServiceFabric_2018-02-01;</AzureApiTag>
<AzureApiTag>ServiceFabric_2019-03-01-preview;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "version");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -125,7 +124,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("version", version);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
}
Expand All @@ -138,9 +136,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
_url = _url.Replace("{version}", System.Uri.EscapeDataString(version));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -385,7 +383,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -396,7 +393,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
}
Expand All @@ -408,9 +404,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName));
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -605,7 +601,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
{
parameters.Validate();
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -617,7 +612,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("version", version);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("parameters", parameters);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters);
Expand All @@ -631,9 +625,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
_url = _url.Replace("{version}", System.Uri.EscapeDataString(version));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -820,7 +814,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "version");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -832,7 +825,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("version", version);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
}
Expand All @@ -845,9 +837,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
_url = _url.Replace("{version}", System.Uri.EscapeDataString(version));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -116,7 +115,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
}
Expand All @@ -128,9 +126,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName));
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -268,8 +266,8 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
/// <param name='applicationTypeName'>
/// The name of the application type name resource.
/// </param>
/// <param name='location'>
/// Azure resource location.
/// <param name='parameters'>
/// The application type name resource.
/// </param>
/// <param name='customHeaders'>
/// Headers that will be added to request.
Expand All @@ -292,7 +290,7 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse<ApplicationTypeResource>> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
public async Task<AzureOperationResponse<ApplicationTypeResource>> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
{
if (Client.SubscriptionId == null)
{
Expand All @@ -310,11 +308,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName");
}
string apiVersion = "2017-07-01-preview";
ApplicationTypeResource parameters = new ApplicationTypeResource();
if (location != null)
if (parameters == null)
{
parameters.Location = location;
throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
}
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
Expand All @@ -326,7 +322,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("parameters", parameters);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
Expand All @@ -339,9 +334,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName));
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -547,7 +542,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "clusterName");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -557,7 +551,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
}
Expand All @@ -568,9 +561,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
_url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down Expand Up @@ -744,7 +737,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName");
}
string apiVersion = "2017-07-01-preview";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand All @@ -755,7 +747,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("clusterName", clusterName);
tracingParameters.Add("applicationTypeName", applicationTypeName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
}
Expand All @@ -767,9 +758,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client)
_url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName));
_url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName));
List<string> _queryParameters = new List<string>();
if (apiVersion != null)
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (_queryParameters.Count > 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ public static ApplicationTypeResource Get(this IApplicationTypesOperations opera
/// <param name='applicationTypeName'>
/// The name of the application type name resource.
/// </param>
/// <param name='location'>
/// Azure resource location.
/// <param name='parameters'>
/// The application type name resource.
/// </param>
public static ApplicationTypeResource Create(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string))
public static ApplicationTypeResource Create(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters)
{
return operations.CreateAsync(resourceGroupName, clusterName, applicationTypeName, location).GetAwaiter().GetResult();
return operations.CreateAsync(resourceGroupName, clusterName, applicationTypeName, parameters).GetAwaiter().GetResult();
}

/// <summary>
Expand All @@ -121,15 +121,15 @@ public static ApplicationTypeResource Get(this IApplicationTypesOperations opera
/// <param name='applicationTypeName'>
/// The name of the application type name resource.
/// </param>
/// <param name='location'>
/// Azure resource location.
/// <param name='parameters'>
/// The application type name resource.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
public static async Task<ApplicationTypeResource> CreateAsync(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string), CancellationToken cancellationToken = default(CancellationToken))
public static async Task<ApplicationTypeResource> CreateAsync(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters, CancellationToken cancellationToken = default(CancellationToken))
{
using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationTypeName, location, null, cancellationToken).ConfigureAwait(false))
using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationTypeName, parameters, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
Expand Down
Loading