diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperations.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperations.cs index 3a90bf5f01560..144126363202d 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperations.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperations.cs @@ -723,7 +723,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -848,7 +848,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -861,7 +861,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -907,7 +907,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -1053,7 +1053,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -1066,7 +1066,7 @@ internal AttestationProvidersOperations(AttestationManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperationsExtensions.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperationsExtensions.cs index 1e5b7fa16c5d5..b72ced3bf7424 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperationsExtensions.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/AttestationProvidersOperationsExtensions.cs @@ -13,8 +13,6 @@ namespace Microsoft.Azure.Management.Attestation using Microsoft.Rest; using Microsoft.Rest.Azure; using Models; - using System.Collections; - using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -152,7 +150,7 @@ public static void Delete(this IAttestationProvidersOperations operations, strin /// /// The operations group for this extension method. /// - public static IEnumerable List(this IAttestationProvidersOperations operations) + public static AttestationProviderListResult List(this IAttestationProvidersOperations operations) { return operations.ListAsync().GetAwaiter().GetResult(); } @@ -166,7 +164,7 @@ public static IEnumerable List(this IAttestationProvidersOp /// /// The cancellation token. /// - public static async Task> ListAsync(this IAttestationProvidersOperations operations, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListAsync(this IAttestationProvidersOperations operations, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false)) { @@ -183,7 +181,7 @@ public static IEnumerable List(this IAttestationProvidersOp /// /// The name of the resource group. The name is case insensitive. /// - public static IEnumerable ListByResourceGroup(this IAttestationProvidersOperations operations, string resourceGroupName) + public static AttestationProviderListResult ListByResourceGroup(this IAttestationProvidersOperations operations, string resourceGroupName) { return operations.ListByResourceGroupAsync(resourceGroupName).GetAwaiter().GetResult(); } @@ -200,7 +198,7 @@ public static IEnumerable ListByResourceGroup(this IAttesta /// /// The cancellation token. /// - public static async Task> ListByResourceGroupAsync(this IAttestationProvidersOperations operations, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListByResourceGroupAsync(this IAttestationProvidersOperations operations, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListByResourceGroupWithHttpMessagesAsync(resourceGroupName, null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IAttestationProvidersOperations.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IAttestationProvidersOperations.cs index 75218fb7bd3ff..697445043c275 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IAttestationProvidersOperations.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IAttestationProvidersOperations.cs @@ -116,7 +116,7 @@ public partial interface IAttestationProvidersOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Returns attestation providers list in a resource group. /// @@ -138,6 +138,6 @@ public partial interface IAttestationProvidersOperations /// /// Thrown when a required parameter is null /// - Task>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IOperations.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IOperations.cs index ab7abf8e62179..c504661a385e6 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IOperations.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/IOperations.cs @@ -41,6 +41,6 @@ public partial interface IOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationProviderListResult.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationProviderListResult.cs new file mode 100644 index 0000000000000..6c7ea60b0b585 --- /dev/null +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationProviderListResult.cs @@ -0,0 +1,55 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Attestation.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Attestation Providers List. + /// + public partial class AttestationProviderListResult + { + /// + /// Initializes a new instance of the AttestationProviderListResult + /// class. + /// + public AttestationProviderListResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AttestationProviderListResult + /// class. + /// + /// Attestation Provider array. + public AttestationProviderListResult(IList value = default(IList)) + { + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets attestation Provider array. + /// + [JsonProperty(PropertyName = "value")] + public IList Value { get; set; } + + } +} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationServiceCreationParams.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationServiceCreationParams.cs index 6c11227515f7d..c60d0e0f78de7 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationServiceCreationParams.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/AttestationServiceCreationParams.cs @@ -32,9 +32,14 @@ public AttestationServiceCreationParams() /// class. /// /// Name of attestation policy. - public AttestationServiceCreationParams(string attestationPolicy = default(string)) + /// JSON Web Key Set defining a + /// set of X.509 Certificates that will represent the parent + /// certificate for the signing certificate used for policy + /// operations + public AttestationServiceCreationParams(string attestationPolicy = default(string), JSONWebKeySet policySigningCertificates = default(JSONWebKeySet)) { AttestationPolicy = attestationPolicy; + PolicySigningCertificates = policySigningCertificates; CustomInit(); } @@ -49,5 +54,13 @@ public AttestationServiceCreationParams() [JsonProperty(PropertyName = "attestationPolicy")] public string AttestationPolicy { get; set; } + /// + /// Gets or sets JSON Web Key Set defining a set of X.509 Certificates + /// that will represent the parent certificate for the signing + /// certificate used for policy operations + /// + [JsonProperty(PropertyName = "policySigningCertificates")] + public JSONWebKeySet PolicySigningCertificates { get; set; } + } } diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKey.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKey.cs new file mode 100644 index 0000000000000..71a4b0aa1ac84 --- /dev/null +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKey.cs @@ -0,0 +1,279 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Attestation.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + public partial class JSONWebKey + { + /// + /// Initializes a new instance of the JSONWebKey class. + /// + public JSONWebKey() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the JSONWebKey class. + /// + /// The "alg" (algorithm) parameter identifies the + /// algorithm intended for + /// use with the key. The values used should either be registered in + /// the + /// IANA "JSON Web Signature and Encryption Algorithms" registry + /// established by [JWA] or be a value that contains a Collision- + /// Resistant Name. + /// The "kid" (key ID) parameter is used to match a + /// specific key. This + /// is used, for instance, to choose among a set of keys within a JWK + /// Set + /// during key rollover. The structure of the "kid" value is + /// unspecified. When "kid" values are used within a JWK Set, + /// different + /// keys within the JWK Set SHOULD use distinct "kid" values. (One + /// example in which different keys might use the same "kid" value is + /// if + /// they have different "kty" (key type) values but are considered to + /// be + /// equivalent alternatives by the application using them.) The "kid" + /// value is a case-sensitive string. + /// The "kty" (key type) parameter identifies the + /// cryptographic algorithm + /// family used with the key, such as "RSA" or "EC". "kty" values + /// should + /// either be registered in the IANA "JSON Web Key Types" registry + /// established by [JWA] or be a value that contains a Collision- + /// Resistant Name. The "kty" value is a case-sensitive + /// string. + /// Use ("public key use") identifies the intended + /// use of + /// the public key. The "use" parameter is employed to indicate whether + /// a public key is used for encrypting data or verifying the signature + /// on data. Values are commonly "sig" (signature) or "enc" + /// (encryption). + /// The "crv" (curve) parameter identifies the curve + /// type + /// RSA private exponent or ECC private key + /// RSA Private Key Parameter + /// RSA Private Key Parameter + /// RSA public exponent, in Base64 + /// Symmetric key + /// RSA modulus, in Base64 + /// RSA secret prime + /// RSA secret prime, with p < q + /// RSA Private Key Parameter + /// X coordinate for the Elliptic Curve point + /// The "x5c" (X.509 certificate chain) parameter + /// contains a chain of one + /// or more PKIX certificates [RFC5280]. The certificate chain is + /// represented as a JSON array of certificate value strings. Each + /// string in the array is a base64-encoded (Section 4 of [RFC4648] -- + /// not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. + /// The PKIX certificate containing the key value MUST be the first + /// certificate. + /// Y coordinate for the Elliptic Curve point + public JSONWebKey(string alg, string kid, string kty, string use, string crv = default(string), string d = default(string), string dp = default(string), string dq = default(string), string e = default(string), string k = default(string), string n = default(string), string p = default(string), string q = default(string), string qi = default(string), string x = default(string), IList x5c = default(IList), string y = default(string)) + { + Alg = alg; + Crv = crv; + D = d; + Dp = dp; + Dq = dq; + E = e; + K = k; + Kid = kid; + Kty = kty; + N = n; + P = p; + Q = q; + Qi = qi; + Use = use; + X = x; + X5c = x5c; + Y = y; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the "alg" (algorithm) parameter identifies the + /// algorithm intended for + /// use with the key. The values used should either be registered in + /// the + /// IANA "JSON Web Signature and Encryption Algorithms" registry + /// established by [JWA] or be a value that contains a Collision- + /// Resistant Name. + /// + [JsonProperty(PropertyName = "alg")] + public string Alg { get; set; } + + /// + /// Gets or sets the "crv" (curve) parameter identifies the curve type + /// + [JsonProperty(PropertyName = "crv")] + public string Crv { get; set; } + + /// + /// Gets or sets RSA private exponent or ECC private key + /// + [JsonProperty(PropertyName = "d")] + public string D { get; set; } + + /// + /// Gets or sets RSA Private Key Parameter + /// + [JsonProperty(PropertyName = "dp")] + public string Dp { get; set; } + + /// + /// Gets or sets RSA Private Key Parameter + /// + [JsonProperty(PropertyName = "dq")] + public string Dq { get; set; } + + /// + /// Gets or sets RSA public exponent, in Base64 + /// + [JsonProperty(PropertyName = "e")] + public string E { get; set; } + + /// + /// Gets or sets symmetric key + /// + [JsonProperty(PropertyName = "k")] + public string K { get; set; } + + /// + /// Gets or sets the "kid" (key ID) parameter is used to match a + /// specific key. This + /// is used, for instance, to choose among a set of keys within a JWK + /// Set + /// during key rollover. The structure of the "kid" value is + /// unspecified. When "kid" values are used within a JWK Set, + /// different + /// keys within the JWK Set SHOULD use distinct "kid" values. (One + /// example in which different keys might use the same "kid" value is + /// if + /// they have different "kty" (key type) values but are considered to + /// be + /// equivalent alternatives by the application using them.) The "kid" + /// value is a case-sensitive string. + /// + [JsonProperty(PropertyName = "kid")] + public string Kid { get; set; } + + /// + /// Gets or sets the "kty" (key type) parameter identifies the + /// cryptographic algorithm + /// family used with the key, such as "RSA" or "EC". "kty" values + /// should + /// either be registered in the IANA "JSON Web Key Types" registry + /// established by [JWA] or be a value that contains a Collision- + /// Resistant Name. The "kty" value is a case-sensitive string. + /// + [JsonProperty(PropertyName = "kty")] + public string Kty { get; set; } + + /// + /// Gets or sets RSA modulus, in Base64 + /// + [JsonProperty(PropertyName = "n")] + public string N { get; set; } + + /// + /// Gets or sets RSA secret prime + /// + [JsonProperty(PropertyName = "p")] + public string P { get; set; } + + /// + /// Gets or sets RSA secret prime, with p &lt; q + /// + [JsonProperty(PropertyName = "q")] + public string Q { get; set; } + + /// + /// Gets or sets RSA Private Key Parameter + /// + [JsonProperty(PropertyName = "qi")] + public string Qi { get; set; } + + /// + /// Gets or sets use ("public key use") identifies the intended use of + /// the public key. The "use" parameter is employed to indicate whether + /// a public key is used for encrypting data or verifying the signature + /// on data. Values are commonly "sig" (signature) or "enc" + /// (encryption). + /// + [JsonProperty(PropertyName = "use")] + public string Use { get; set; } + + /// + /// Gets or sets x coordinate for the Elliptic Curve point + /// + [JsonProperty(PropertyName = "x")] + public string X { get; set; } + + /// + /// Gets or sets the "x5c" (X.509 certificate chain) parameter contains + /// a chain of one + /// or more PKIX certificates [RFC5280]. The certificate chain is + /// represented as a JSON array of certificate value strings. Each + /// string in the array is a base64-encoded (Section 4 of [RFC4648] -- + /// not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. + /// The PKIX certificate containing the key value MUST be the first + /// certificate. + /// + [JsonProperty(PropertyName = "x5c")] + public IList X5c { get; set; } + + /// + /// Gets or sets y coordinate for the Elliptic Curve point + /// + [JsonProperty(PropertyName = "y")] + public string Y { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Alg == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Alg"); + } + if (Kid == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Kid"); + } + if (Kty == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Kty"); + } + if (Use == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Use"); + } + } + } +} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKeySet.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKeySet.cs new file mode 100644 index 0000000000000..6c2e75edfa002 --- /dev/null +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/JSONWebKeySet.cs @@ -0,0 +1,64 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Attestation.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + public partial class JSONWebKeySet + { + /// + /// Initializes a new instance of the JSONWebKeySet class. + /// + public JSONWebKeySet() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the JSONWebKeySet class. + /// + /// The value of the "keys" parameter is an array of + /// JWK values. By + /// default, the order of the JWK values within the array does not + /// imply + /// an order of preference among them, although applications of JWK + /// Sets + /// can choose to assign a meaning to the order for their purposes, if + /// desired. + public JSONWebKeySet(IList keys = default(IList)) + { + Keys = keys; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the value of the "keys" parameter is an array of JWK + /// values. By + /// default, the order of the JWK values within the array does not + /// imply + /// an order of preference among them, although applications of JWK + /// Sets + /// can choose to assign a meaning to the order for their purposes, if + /// desired. + /// + [JsonProperty(PropertyName = "keys")] + public IList Keys { get; set; } + + } +} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/OperationList.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/OperationList.cs new file mode 100644 index 0000000000000..3ffcb68ab59bd --- /dev/null +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/OperationList.cs @@ -0,0 +1,53 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Attestation.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// List of supported operations. + /// + public partial class OperationList + { + /// + /// Initializes a new instance of the OperationList class. + /// + public OperationList() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the OperationList class. + /// + /// List of supported operations. + public OperationList(IList value = default(IList)) + { + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of supported operations. + /// + [JsonProperty(PropertyName = "value")] + public IList Value { get; set; } + + } +} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page.cs deleted file mode 100644 index db61fe55ea083..0000000000000 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.Attestation.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - - /// - /// Defines a page in Azure responses. - /// - /// Type of the page content items - [JsonObject] - public class Page : IPage - { - /// - /// Gets the link to the next page. - /// - [JsonProperty("")] - public string NextPageLink { get; private set; } - - [JsonProperty("value")] - private IList Items{ get; set; } - - /// - /// Returns an enumerator that iterates through the collection. - /// - /// A an enumerator that can be used to iterate through the collection. - public IEnumerator GetEnumerator() - { - return Items == null ? System.Linq.Enumerable.Empty().GetEnumerator() : Items.GetEnumerator(); - } - - /// - /// Returns an enumerator that iterates through the collection. - /// - /// A an enumerator that can be used to iterate through the collection. - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } -} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page1.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page1.cs deleted file mode 100644 index 52643eb715967..0000000000000 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Models/Page1.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.Attestation.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - - /// - /// Defines a page in Azure responses. - /// - /// Type of the page content items - [JsonObject] - public class Page1 : IPage - { - /// - /// Gets the link to the next page. - /// - [JsonProperty("")] - public string NextPageLink { get; private set; } - - [JsonProperty("keys")] - private IList Items{ get; set; } - - /// - /// Returns an enumerator that iterates through the collection. - /// - /// A an enumerator that can be used to iterate through the collection. - public IEnumerator GetEnumerator() - { - return Items == null ? System.Linq.Enumerable.Empty().GetEnumerator() : Items.GetEnumerator(); - } - - /// - /// Returns an enumerator that iterates through the collection. - /// - /// A an enumerator that can be used to iterate through the collection. - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } -} diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Operations.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Operations.cs index d8efd6c507a68..01412dc4fd9c9 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Operations.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/Operations.cs @@ -68,7 +68,7 @@ internal Operations(AttestationManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -181,7 +181,7 @@ internal Operations(AttestationManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -194,7 +194,7 @@ internal Operations(AttestationManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/OperationsExtensions.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/OperationsExtensions.cs index 7b482b509c0f7..b0654baf16919 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/OperationsExtensions.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/OperationsExtensions.cs @@ -13,8 +13,6 @@ namespace Microsoft.Azure.Management.Attestation using Microsoft.Rest; using Microsoft.Rest.Azure; using Models; - using System.Collections; - using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -29,7 +27,7 @@ public static partial class OperationsExtensions /// /// The operations group for this extension method. /// - public static IEnumerable List(this IOperations operations) + public static OperationList List(this IOperations operations) { return operations.ListAsync().GetAwaiter().GetResult(); } @@ -43,7 +41,7 @@ public static IEnumerable List(this IOperations operations /// /// The cancellation token. /// - public static async Task> ListAsync(this IOperations operations, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListAsync(this IOperations operations, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/SdkInfo_AttestationManagementClient.cs b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/SdkInfo_AttestationManagementClient.cs index 8a7744bc37a76..d73cbdde8c921 100644 --- a/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/SdkInfo_AttestationManagementClient.cs +++ b/sdk/attestation/Microsoft.Azure.Management.Attestation/src/Generated/SdkInfo_AttestationManagementClient.cs @@ -24,16 +24,5 @@ public static IEnumerable> ApiInfo_AttestationMana }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "latest"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/attestation/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "76c353d92b8037fe1e02c36deeb06d78d284e5d7"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/peering/Microsoft.Azure.Management.Peering/src/Generated/SdkInfo_PeeringManagementClient.cs b/sdk/peering/Microsoft.Azure.Management.Peering/src/Generated/SdkInfo_PeeringManagementClient.cs new file mode 100644 index 0000000000000..ed84e77cd4fd0 --- /dev/null +++ b/sdk/peering/Microsoft.Azure.Management.Peering/src/Generated/SdkInfo_PeeringManagementClient.cs @@ -0,0 +1,36 @@ + +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Peering +{ + using System; + using System.Collections.Generic; + using System.Linq; + + internal static partial class SdkInfo + { + public static IEnumerable> ApiInfo_PeeringManagementClient + { + get + { + return new Tuple[] + { + new Tuple("Peering", "CheckServiceProviderAvailability", "2019-09-01-preview"), + new Tuple("Peering", "LegacyPeerings", "2019-09-01-preview"), + new Tuple("Peering", "Operations", "2019-09-01-preview"), + new Tuple("Peering", "PeerAsns", "2019-09-01-preview"), + new Tuple("Peering", "PeeringLocations", "2019-09-01-preview"), + new Tuple("Peering", "PeeringServiceLocations", "2019-09-01-preview"), + new Tuple("Peering", "PeeringServiceProviders", "2019-09-01-preview"), + new Tuple("Peering", "PeeringServices", "2019-09-01-preview"), + new Tuple("Peering", "Peerings", "2019-09-01-preview"), + new Tuple("Peering", "Prefixes", "2019-09-01-preview"), + }.AsEnumerable(); + } + } + } +} diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index 99979bf5d0950..b73c428c76dcc 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -6,7 +6,8 @@ "reflect-api-versions": "", "license-header": "MICROSOFT_MIT_NO_VERSION", "sdkrel:csharp-sdks-folder": "./sdk", - "use": "@microsoft.azure/autorest.csharp" + "use": "@microsoft.azure/autorest.csharp", + "csharp.clear-output-folder": "" }, "advanced_options": { "create_sdk_pull_requests": true,