diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ArmContainerRegistryModelFactory.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ArmContainerRegistryModelFactory.cs index 22250a1b72f1..3e5086aaa18f 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ArmContainerRegistryModelFactory.cs +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ArmContainerRegistryModelFactory.cs @@ -56,8 +56,8 @@ public static ContainerRegistryCacheRuleData ContainerRegistryCacheRuleData(Reso /// The current version of ACR runtime on the connected registry. /// The current connection state of the connected registry. /// The last activity time of the connected registry. - /// - /// The properties of the connected registry parent. + /// The activation properties of the connected registry. + /// The parent of the connected registry. /// The list of the ACR token resource IDs used to authenticate clients to the connected registry. /// The login server properties of the connected registry. /// The logging properties of the connected registry. @@ -81,7 +81,7 @@ public static ConnectedRegistryData ConnectedRegistryData(ResourceIdentifier id version, connectionState, lastActivityOn, - activationStatus != null ? new ConnectedRegistryPropertiesActivation(activationStatus, serializedAdditionalRawData: null) : null, + activationStatus != null ? new ConnectedRegistryActivation(activationStatus, serializedAdditionalRawData: null) : null, parent, clientTokenIds?.ToList(), loginServer, diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.Serialization.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.Serialization.cs index a1c67db14052..1b2fff2736b1 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.Serialization.cs +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.Serialization.cs @@ -158,7 +158,7 @@ internal static ConnectedRegistryData DeserializeConnectedRegistryData(JsonEleme string version = default; ConnectedRegistryConnectionState? connectionState = default; DateTimeOffset? lastActivityTime = default; - ConnectedRegistryPropertiesActivation activation = default; + ConnectedRegistryActivation activation = default; ConnectedRegistryParent parent = default; IList clientTokenIds = default; ConnectedRegistryLoginServer loginServer = default; @@ -250,7 +250,7 @@ internal static ConnectedRegistryData DeserializeConnectedRegistryData(JsonEleme { continue; } - activation = ConnectedRegistryPropertiesActivation.DeserializeConnectedRegistryPropertiesActivation(property0.Value, options); + activation = ConnectedRegistryActivation.DeserializeConnectedRegistryActivation(property0.Value, options); continue; } if (property0.NameEquals("parent"u8)) diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.cs index 30fc1097128c..d45939008e2b 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.cs +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/ConnectedRegistryData.cs @@ -69,8 +69,8 @@ public ConnectedRegistryData() /// The current version of ACR runtime on the connected registry. /// The current connection state of the connected registry. /// The last activity time of the connected registry. - /// - /// The properties of the connected registry parent. + /// The activation properties of the connected registry. + /// The parent of the connected registry. /// The list of the ACR token resource IDs used to authenticate clients to the connected registry. /// The login server properties of the connected registry. /// The logging properties of the connected registry. @@ -78,7 +78,7 @@ public ConnectedRegistryData() /// The list of notifications subscription information for the connected registry. /// The garbage collection properties of the connected registry. /// Keeps track of any properties unknown to the library. - internal ConnectedRegistryData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, ContainerRegistryProvisioningState? provisioningState, ConnectedRegistryMode? mode, string version, ConnectedRegistryConnectionState? connectionState, DateTimeOffset? lastActivityOn, ConnectedRegistryPropertiesActivation activation, ConnectedRegistryParent parent, IList clientTokenIds, ConnectedRegistryLoginServer loginServer, ConnectedRegistryLogging logging, IReadOnlyList statusDetails, IList notificationsList, GarbageCollectionProperties garbageCollection, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData) + internal ConnectedRegistryData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, ContainerRegistryProvisioningState? provisioningState, ConnectedRegistryMode? mode, string version, ConnectedRegistryConnectionState? connectionState, DateTimeOffset? lastActivityOn, ConnectedRegistryActivation activation, ConnectedRegistryParent parent, IList clientTokenIds, ConnectedRegistryLoginServer loginServer, ConnectedRegistryLogging logging, IReadOnlyList statusDetails, IList notificationsList, GarbageCollectionProperties garbageCollection, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData) { ProvisioningState = provisioningState; Mode = mode; @@ -111,8 +111,8 @@ internal ConnectedRegistryData(ResourceIdentifier id, string name, ResourceType /// The last activity time of the connected registry. [WirePath("properties.lastActivityTime")] public DateTimeOffset? LastActivityOn { get; } - /// Gets the activation. - internal ConnectedRegistryPropertiesActivation Activation { get; } + /// The activation properties of the connected registry. + internal ConnectedRegistryActivation Activation { get; } /// The activation status of the connected registry. [WirePath("properties.activation.status")] public ConnectedRegistryActivationStatus? ActivationStatus @@ -120,7 +120,7 @@ public ConnectedRegistryActivationStatus? ActivationStatus get => Activation?.Status; } - /// The properties of the connected registry parent. + /// The parent of the connected registry. [WirePath("properties.parent")] public ConnectedRegistryParent Parent { get; set; } /// The list of the ACR token resource IDs used to authenticate clients to the connected registry. diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryActivation.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryActivation.cs index b4146f220dcb..10a0dcc15443 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryActivation.cs +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryActivation.cs @@ -43,7 +43,7 @@ internal partial class ConnectedRegistryActivation /// /// /// - private protected IDictionary _serializedAdditionalRawData; + private IDictionary _serializedAdditionalRawData; /// Initializes a new instance of . internal ConnectedRegistryActivation() diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPatch.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPatch.cs index 30d117394bc5..d243f0fe0f42 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPatch.cs +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPatch.cs @@ -54,7 +54,7 @@ public ConnectedRegistryPatch() } /// Initializes a new instance of . - /// The parameters for updating the sync properties of the connected registry with its parent. + /// The sync properties of the connected registry with its parent. /// The logging properties of the connected registry. /// The list of the ACR token resource IDs used to authenticate clients to the connected registry. /// The list of notifications subscription information for the connected registry. @@ -70,7 +70,7 @@ internal ConnectedRegistryPatch(ConnectedRegistrySyncUpdateProperties syncProper _serializedAdditionalRawData = serializedAdditionalRawData; } - /// The parameters for updating the sync properties of the connected registry with its parent. + /// The sync properties of the connected registry with its parent. [WirePath("properties.syncProperties")] public ConnectedRegistrySyncUpdateProperties SyncProperties { get; set; } /// The logging properties of the connected registry. diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.Serialization.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.Serialization.cs deleted file mode 100644 index 6f43a1144050..000000000000 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.Serialization.cs +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.ClientModel.Primitives; -using System.Collections.Generic; -using System.Text; -using System.Text.Json; -using Azure.Core; - -namespace Azure.ResourceManager.ContainerRegistry.Models -{ - internal partial class ConnectedRegistryPropertiesActivation : IUtf8JsonSerializable, IJsonModel - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - if (format != "J") - { - throw new FormatException($"The model {nameof(ConnectedRegistryPropertiesActivation)} does not support writing '{format}' format."); - } - - base.JsonModelWriteCore(writer, options); - } - - ConnectedRegistryPropertiesActivation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) - { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - if (format != "J") - { - throw new FormatException($"The model {nameof(ConnectedRegistryPropertiesActivation)} does not support reading '{format}' format."); - } - - using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeConnectedRegistryPropertiesActivation(document.RootElement, options); - } - - internal static ConnectedRegistryPropertiesActivation DeserializeConnectedRegistryPropertiesActivation(JsonElement element, ModelReaderWriterOptions options = null) - { - options ??= ModelSerializationExtensions.WireOptions; - - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - ConnectedRegistryActivationStatus? status = default; - IDictionary serializedAdditionalRawData = default; - Dictionary rawDataDictionary = new Dictionary(); - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("status"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - status = new ConnectedRegistryActivationStatus(property.Value.GetString()); - continue; - } - if (options.Format != "W") - { - rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); - } - } - serializedAdditionalRawData = rawDataDictionary; - return new ConnectedRegistryPropertiesActivation(status, serializedAdditionalRawData); - } - - private BinaryData SerializeBicep(ModelReaderWriterOptions options) - { - StringBuilder builder = new StringBuilder(); - BicepModelReaderWriterOptions bicepOptions = options as BicepModelReaderWriterOptions; - IDictionary propertyOverrides = null; - bool hasObjectOverride = bicepOptions != null && bicepOptions.PropertyOverrides.TryGetValue(this, out propertyOverrides); - bool hasPropertyOverride = false; - string propertyOverride = null; - - builder.AppendLine("{"); - - hasPropertyOverride = hasObjectOverride && propertyOverrides.TryGetValue(nameof(Status), out propertyOverride); - if (hasPropertyOverride) - { - builder.Append(" status: "); - builder.AppendLine(propertyOverride); - } - else - { - if (Optional.IsDefined(Status)) - { - builder.Append(" status: "); - builder.AppendLine($"'{Status.Value.ToString()}'"); - } - } - - builder.AppendLine("}"); - return BinaryData.FromString(builder.ToString()); - } - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) - { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options); - case "bicep": - return SerializeBicep(options); - default: - throw new FormatException($"The model {nameof(ConnectedRegistryPropertiesActivation)} does not support writing '{options.Format}' format."); - } - } - - ConnectedRegistryPropertiesActivation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) - { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - - switch (format) - { - case "J": - { - using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeConnectedRegistryPropertiesActivation(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ConnectedRegistryPropertiesActivation)} does not support reading '{options.Format}' format."); - } - } - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - } -} diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.cs b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.cs deleted file mode 100644 index 124a7f7eba9c..000000000000 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/Generated/Models/ConnectedRegistryPropertiesActivation.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.ResourceManager.ContainerRegistry.Models -{ - /// The ConnectedRegistryPropertiesActivation. - internal partial class ConnectedRegistryPropertiesActivation : ConnectedRegistryActivation - { - /// Initializes a new instance of . - internal ConnectedRegistryPropertiesActivation() - { - } - - /// Initializes a new instance of . - /// The activation status of the connected registry. - /// Keeps track of any properties unknown to the library. - internal ConnectedRegistryPropertiesActivation(ConnectedRegistryActivationStatus? status, IDictionary serializedAdditionalRawData) : base(status, serializedAdditionalRawData) - { - } - } -} diff --git a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/autorest.md b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/autorest.md index e63afc30bc49..b12d828d1df8 100644 --- a/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/autorest.md +++ b/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/src/autorest.md @@ -7,7 +7,7 @@ azure-arm: true csharp: true library-name: ContainerRegistry namespace: Azure.ResourceManager.ContainerRegistry -require: https://github.com/Azure/azure-rest-api-specs/blob/a55917cb512540bc3d0aec760d4e28712c3a4ae0/specification/containerregistry/resource-manager/readme.md +require: /mnt/vss/_work/1/s/azure-rest-api-specs/specification/containerregistry/resource-manager/readme.md output-folder: $(this-folder)/Generated clear-output-folder: true sample-gen: diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 2ca0501b60bd..4e749e6b85b1 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -12,6 +12,8 @@ trigger: - sdk/storage/Azure.Storage.DataMovement/ - sdk/storage/Azure.Storage.DataMovement.Blobs/ - sdk/storage/Azure.Storage.DataMovement.Files/ + exclude: + - sdk/storage/Azure.ResourceManager.Storage/ - sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/ exclude: - sdk/storage/Azure.ResourceManager.Storage/