diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index 3e89feca07ff..96d85e209af9 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -1826,12 +1826,15 @@
]
},
{
+<<<<<<< HEAD
+=======
"filename": "/sdk/virtualenclaves/**/*.cs",
"words": [
"mobo"
]
},
{
+>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538
"filename": "**/sdk/workloadorchestration/**/*.cs",
"words": [
"Inprogress",
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
index 274f68e03668..597933b7f307 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
@@ -10,6 +10,17 @@
using Azure.Core;
using Azure.ResourceManager.Hci.Vm.Models;
using Azure.ResourceManager.Models;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeSiteReferenceData.cs
+using Azure.ResourceManager.WorkloadOrchestration.Models;
+
+namespace Azure.ResourceManager.WorkloadOrchestration
+{
+ ///
+ /// A class representing the EdgeSiteReference data model.
+ /// Site Reference Resource
+ ///
+ public partial class EdgeSiteReferenceData : ResourceData
+========
namespace Azure.ResourceManager.Hci.Vm
{
@@ -18,6 +29,7 @@ namespace Azure.ResourceManager.Hci.Vm
/// The attestation status of the virtual machine
///
public partial class HciVmAttestationStatusData : ResourceData
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
{
///
/// Keeps track of any properties unknown to the library.
@@ -51,25 +63,42 @@ public partial class HciVmAttestationStatusData : ResourceData
///
private IDictionary _serializedAdditionalRawData;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeSiteReferenceData.cs
+ /// Initializes a new instance of .
+ public EdgeSiteReferenceData()
+ {
+ }
+
+ /// Initializes a new instance of .
+========
/// Initializes a new instance of .
internal HciVmAttestationStatusData()
{
}
/// Initializes a new instance of .
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
/// The id.
/// The name.
/// The resourceType.
/// The systemData.
/// The resource-specific properties for this resource.
/// Keeps track of any properties unknown to the library.
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeSiteReferenceData.cs
+ internal EdgeSiteReferenceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, EdgeSiteReferenceProperties properties, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+========
internal HciVmAttestationStatusData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, HciVmAttestationStatusProperties properties, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
{
Properties = properties;
_serializedAdditionalRawData = serializedAdditionalRawData;
}
/// The resource-specific properties for this resource.
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeSiteReferenceData.cs
+ public EdgeSiteReferenceProperties Properties { get; set; }
+========
public HciVmAttestationStatusProperties Properties { get; }
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusData.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
index 65550f177511..27ef169c2d07 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
@@ -12,6 +12,43 @@
using Azure.Core;
using Azure.Core.Pipeline;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+namespace Azure.ResourceManager.WorkloadOrchestration
+{
+ ///
+ /// A Class representing an EdgeJob along with the instance operations that can be performed on it.
+ /// If you have a you can construct an
+ /// from an instance of using the GetEdgeJobResource method.
+ /// Otherwise you can get one from its parent resource using the GetEdgeJob method.
+ ///
+ public partial class EdgeJobResource : ArmResource
+ {
+ /// Generate the resource identifier of a instance.
+ /// The resourceUri.
+ /// The jobName.
+ public static ResourceIdentifier CreateResourceIdentifier(string resourceUri, string jobName)
+ {
+ var resourceId = $"{resourceUri}/providers/Microsoft.Edge/jobs/{jobName}";
+ return new ResourceIdentifier(resourceId);
+ }
+
+ private readonly ClientDiagnostics _edgeJobJobsClientDiagnostics;
+ private readonly JobsRestOperations _edgeJobJobsRestClient;
+ private readonly EdgeJobData _data;
+
+ /// Gets the resource type for the operations.
+ public static readonly ResourceType ResourceType = "Microsoft.Edge/jobs";
+
+ /// Initializes a new instance of the class for mocking.
+ protected EdgeJobResource()
+ {
+ }
+
+ /// Initializes a new instance of the class.
+ /// The client parameters to use in these operations.
+ /// The resource that is the target of operations.
+ internal EdgeJobResource(ArmClient client, EdgeJobData data) : this(client, data.Id)
+========
namespace Azure.ResourceManager.Hci.Vm
{
///
@@ -46,11 +83,22 @@ protected HciVmAttestationStatusResource()
/// The client parameters to use in these operations.
/// The resource that is the target of operations.
internal HciVmAttestationStatusResource(ArmClient client, HciVmAttestationStatusData data) : this(client, data.Id)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
{
HasData = true;
_data = data;
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ /// Initializes a new instance of the class.
+ /// The client parameters to use in these operations.
+ /// The identifier of the resource that is the target of operations.
+ internal EdgeJobResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+ {
+ _edgeJobJobsClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.WorkloadOrchestration", ResourceType.Namespace, Diagnostics);
+ TryGetApiVersion(ResourceType, out string edgeJobJobsApiVersion);
+ _edgeJobJobsRestClient = new JobsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, edgeJobJobsApiVersion);
+========
/// Initializes a new instance of the class.
/// The client parameters to use in these operations.
/// The identifier of the resource that is the target of operations.
@@ -59,6 +107,7 @@ internal HciVmAttestationStatusResource(ArmClient client, ResourceIdentifier id)
_hciVmAttestationStatusAttestationStatusesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.Hci.Vm", ResourceType.Namespace, Diagnostics);
TryGetApiVersion(ResourceType, out string hciVmAttestationStatusAttestationStatusesApiVersion);
_hciVmAttestationStatusAttestationStatusesRestClient = new AttestationStatusesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, hciVmAttestationStatusAttestationStatusesApiVersion);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
#if DEBUG
ValidateResourceId(Id);
#endif
@@ -69,7 +118,11 @@ internal HciVmAttestationStatusResource(ArmClient client, ResourceIdentifier id)
/// Gets the data representing this Feature.
/// Throws if there is no data loaded in the current instance.
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ public virtual EdgeJobData Data
+========
public virtual HciVmAttestationStatusData Data
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
{
get
{
@@ -86,6 +139,25 @@ internal static void ValidateResourceId(ResourceIdentifier id)
}
///
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ /// Get a Job resource
+ ///
+ /// -
+ /// Request Path
+ /// /{resourceUri}/providers/Microsoft.Edge/jobs/{jobName}
+ ///
+ /// -
+ /// Operation Id
+ /// Job_Get
+ ///
+ /// -
+ /// Default Api Version
+ /// 2025-06-01
+ ///
+ /// -
+ /// Resource
+ ///
+========
/// Implements AttestationStatus GET method.
///
/// -
@@ -103,10 +175,23 @@ internal static void ValidateResourceId(ResourceIdentifier id)
///
-
/// Resource
///
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
///
///
///
/// The cancellation token to use.
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ public virtual async Task> GetAsync(CancellationToken cancellationToken = default)
+ {
+ using var scope = _edgeJobJobsClientDiagnostics.CreateScope("EdgeJobResource.Get");
+ scope.Start();
+ try
+ {
+ var response = await _edgeJobJobsRestClient.GetAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
+ if (response.Value == null)
+ throw new RequestFailedException(response.GetRawResponse());
+ return Response.FromValue(new EdgeJobResource(Client, response.Value), response.GetRawResponse());
+========
public virtual async Task> GetAsync(CancellationToken cancellationToken = default)
{
using var scope = _hciVmAttestationStatusAttestationStatusesClientDiagnostics.CreateScope("HciVmAttestationStatusResource.Get");
@@ -117,6 +202,7 @@ public virtual async Task> GetAsync(Can
if (response.Value == null)
throw new RequestFailedException(response.GetRawResponse());
return Response.FromValue(new HciVmAttestationStatusResource(Client, response.Value), response.GetRawResponse());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
}
catch (Exception e)
{
@@ -126,6 +212,25 @@ public virtual async Task> GetAsync(Can
}
///
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ /// Get a Job resource
+ ///
+ /// -
+ /// Request Path
+ /// /{resourceUri}/providers/Microsoft.Edge/jobs/{jobName}
+ ///
+ /// -
+ /// Operation Id
+ /// Job_Get
+ ///
+ /// -
+ /// Default Api Version
+ /// 2025-06-01
+ ///
+ /// -
+ /// Resource
+ ///
+========
/// Implements AttestationStatus GET method.
///
/// -
@@ -143,10 +248,23 @@ public virtual async Task> GetAsync(Can
///
-
/// Resource
///
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
///
///
///
/// The cancellation token to use.
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/EdgeJobResource.cs
+ public virtual Response Get(CancellationToken cancellationToken = default)
+ {
+ using var scope = _edgeJobJobsClientDiagnostics.CreateScope("EdgeJobResource.Get");
+ scope.Start();
+ try
+ {
+ var response = _edgeJobJobsRestClient.Get(Id.Parent, Id.Name, cancellationToken);
+ if (response.Value == null)
+ throw new RequestFailedException(response.GetRawResponse());
+ return Response.FromValue(new EdgeJobResource(Client, response.Value), response.GetRawResponse());
+========
public virtual Response Get(CancellationToken cancellationToken = default)
{
using var scope = _hciVmAttestationStatusAttestationStatusesClientDiagnostics.CreateScope("HciVmAttestationStatusResource.Get");
@@ -157,6 +275,7 @@ public virtual Response Get(CancellationToken ca
if (response.Value == null)
throw new RequestFailedException(response.GetRawResponse());
return Response.FromValue(new HciVmAttestationStatusResource(Client, response.Value), response.GetRawResponse());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/HciVmAttestationStatusResource.cs
}
catch (Exception e)
{
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
index 731d88e6e14d..592cffa383d2 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
@@ -11,6 +11,15 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+namespace Azure.ResourceManager.WorkloadOrchestration.Models
+{
+ internal partial class SolutionVersionListResult : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
internal partial class GalleryImageListResult : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +27,7 @@ internal partial class GalleryImageListResult : IUtf8JsonSerializable, IJsonMode
void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,10 +38,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(SolutionVersionListResult)} does not support writing '{format}' format.");
+========
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
throw new FormatException($"The model {nameof(GalleryImageListResult)} does not support writing '{format}' format.");
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
}
writer.WritePropertyName("value"u8);
@@ -63,6 +80,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ SolutionVersionListResult 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(SolutionVersionListResult)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeSolutionVersionListResult(document.RootElement, options);
+ }
+
+ internal static SolutionVersionListResult DeserializeSolutionVersionListResult(JsonElement element, ModelReaderWriterOptions options = null)
+========
GalleryImageListResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -76,6 +108,7 @@ GalleryImageListResult IJsonModel.Create(ref Utf8JsonRea
}
internal static GalleryImageListResult DeserializeGalleryImageListResult(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -83,7 +116,11 @@ internal static GalleryImageListResult DeserializeGalleryImageListResult(JsonEle
{
return null;
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ IReadOnlyList value = default;
+========
IReadOnlyList value = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
Uri nextLink = default;
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
@@ -91,10 +128,17 @@ internal static GalleryImageListResult DeserializeGalleryImageListResult(JsonEle
{
if (property.NameEquals("value"u8))
{
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ List array = new List();
+ foreach (var item in property.Value.EnumerateArray())
+ {
+ array.Add(EdgeSolutionVersionData.DeserializeEdgeSolutionVersionData(item, options));
+========
List array = new List();
foreach (var item in property.Value.EnumerateArray())
{
array.Add(HciVmGalleryImageData.DeserializeHciVmGalleryImageData(item, options));
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
}
value = array;
continue;
@@ -114,16 +158,36 @@ internal static GalleryImageListResult DeserializeGalleryImageListResult(JsonEle
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ return new SolutionVersionListResult(value, nextLink, serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return new GalleryImageListResult(value, nextLink, serializedAdditionalRawData);
}
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerWorkloadOrchestrationContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(SolutionVersionListResult)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ SolutionVersionListResult IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return ModelReaderWriter.Write(this, options, AzureResourceManagerHciVmContext.Default);
default:
throw new FormatException($"The model {nameof(GalleryImageListResult)} does not support writing '{options.Format}' format.");
@@ -133,12 +197,23 @@ BinaryData IPersistableModel.Write(ModelReaderWriterOpti
GalleryImageListResult IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionListResult.Serialization.cs
+ return DeserializeSolutionVersionListResult(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(SolutionVersionListResult)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
return DeserializeGalleryImageListResult(document.RootElement, options);
}
default:
@@ -147,5 +222,6 @@ GalleryImageListResult IPersistableModel.Create(BinaryDa
}
string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/GalleryImageListResult.Serialization.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
index 3646cba0b8e2..0885a4abf865 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
@@ -11,6 +11,15 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+namespace Azure.ResourceManager.ContainerInstance.Models
+{
+ public partial class ContainerGroupProfileReferenceDefinition : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
public partial class HciVmExtendedLocation : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +27,7 @@ public partial class HciVmExtendedLocation : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,21 +38,33 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(ContainerGroupProfileReferenceDefinition)} does not support writing '{format}' format.");
+========
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
throw new FormatException($"The model {nameof(HciVmExtendedLocation)} does not support writing '{format}' format.");
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
}
- if (Optional.IsDefined(Name))
+ if (Optional.IsDefined(Id))
{
- writer.WritePropertyName("name"u8);
- writer.WriteStringValue(Name);
+ writer.WritePropertyName("id"u8);
+ writer.WriteStringValue(Id);
}
- if (Optional.IsDefined(Type))
+ if (Optional.IsDefined(Revision))
{
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ writer.WritePropertyName("revision"u8);
+ writer.WriteNumberValue(Revision.Value);
+========
writer.WritePropertyName("type"u8);
writer.WriteStringValue(Type.Value.ToString());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
}
if (options.Format != "W" && _serializedAdditionalRawData != null)
{
@@ -61,6 +83,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ ContainerGroupProfileReferenceDefinition 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(ContainerGroupProfileReferenceDefinition)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeContainerGroupProfileReferenceDefinition(document.RootElement, options);
+ }
+
+ internal static ContainerGroupProfileReferenceDefinition DeserializeContainerGroupProfileReferenceDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+========
HciVmExtendedLocation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -74,6 +111,7 @@ HciVmExtendedLocation IJsonModel.Create(ref Utf8JsonReade
}
internal static HciVmExtendedLocation DeserializeHciVmExtendedLocation(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -81,24 +119,37 @@ internal static HciVmExtendedLocation DeserializeHciVmExtendedLocation(JsonEleme
{
return null;
}
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ ResourceIdentifier id = default;
+ int? revision = default;
+========
string name = default;
HciVmExtendedLocationType? type = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
foreach (var property in element.EnumerateObject())
{
- if (property.NameEquals("name"u8))
+ if (property.NameEquals("id"u8))
{
- name = property.Value.GetString();
+ if (property.Value.ValueKind == JsonValueKind.Null)
+ {
+ continue;
+ }
+ id = new ResourceIdentifier(property.Value.GetString());
continue;
}
- if (property.NameEquals("type"u8))
+ if (property.NameEquals("revision"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
{
continue;
}
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ revision = property.Value.GetInt32();
+========
type = new HciVmExtendedLocationType(property.Value.GetString());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
continue;
}
if (options.Format != "W")
@@ -107,16 +158,36 @@ internal static HciVmExtendedLocation DeserializeHciVmExtendedLocation(JsonEleme
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ return new ContainerGroupProfileReferenceDefinition(id, revision, serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return new HciVmExtendedLocation(name, type, serializedAdditionalRawData);
}
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerContainerInstanceContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(ContainerGroupProfileReferenceDefinition)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ ContainerGroupProfileReferenceDefinition IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return ModelReaderWriter.Write(this, options, AzureResourceManagerHciVmContext.Default);
default:
throw new FormatException($"The model {nameof(HciVmExtendedLocation)} does not support writing '{options.Format}' format.");
@@ -126,12 +197,23 @@ BinaryData IPersistableModel.Write(ModelReaderWriterOptio
HciVmExtendedLocation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/containerinstance/Azure.ResourceManager.ContainerInstance/src/Generated/Models/ContainerGroupProfileReferenceDefinition.Serialization.cs
+ return DeserializeContainerGroupProfileReferenceDefinition(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(ContainerGroupProfileReferenceDefinition)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
return DeserializeHciVmExtendedLocation(document.RootElement, options);
}
default:
@@ -140,5 +222,6 @@ HciVmExtendedLocation IPersistableModel.Create(BinaryData
}
string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.Serialization.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
index 32609494bceb..b0002330f7b0 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
@@ -8,10 +8,17 @@
using System;
using System.Collections.Generic;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/TargetComponentStatus.cs
+namespace Azure.ResourceManager.WorkloadOrchestration.Models
+{
+ /// Component Status.
+ public partial class TargetComponentStatus
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
/// The complex type of the extended location.
public partial class HciVmExtendedLocation
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
{
///
/// Keeps track of any properties unknown to the library.
@@ -45,6 +52,18 @@ public partial class HciVmExtendedLocation
///
private IDictionary _serializedAdditionalRawData;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/TargetComponentStatus.cs
+ /// Initializes a new instance of .
+ internal TargetComponentStatus()
+ {
+ }
+
+ /// Initializes a new instance of .
+ /// Component name.
+ /// Component status.
+ /// Keeps track of any properties unknown to the library.
+ internal TargetComponentStatus(string name, string status, IDictionary serializedAdditionalRawData)
+========
/// Initializes a new instance of .
public HciVmExtendedLocation()
{
@@ -55,15 +74,23 @@ public HciVmExtendedLocation()
/// The type of the extended location.
/// Keeps track of any properties unknown to the library.
internal HciVmExtendedLocation(string name, HciVmExtendedLocationType? type, IDictionary serializedAdditionalRawData)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
{
Name = name;
- Type = type;
+ Status = status;
_serializedAdditionalRawData = serializedAdditionalRawData;
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/TargetComponentStatus.cs
+ /// Component name.
+ public string Name { get; }
+ /// Component status.
+ public string Status { get; }
+========
/// The name of the extended location.
public string Name { get; set; }
/// The type of the extended location.
public HciVmExtendedLocationType? Type { get; set; }
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmExtendedLocation.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
index 0cb91d5820c8..6688fc7b3a58 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
@@ -11,6 +11,15 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+namespace Azure.ResourceManager.WorkloadOrchestration.Models
+{
+ public partial class SolutionVersionSnapshot : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
public partial class HciVmGalleryImageStatus : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +27,7 @@ public partial class HciVmGalleryImageStatus : IUtf8JsonSerializable, IJsonModel
void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,6 +38,41 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(SolutionVersionSnapshot)} does not support writing '{format}' format.");
+ }
+
+ if (Optional.IsDefined(SolutionVersionId))
+ {
+ writer.WritePropertyName("solutionVersionId"u8);
+ writer.WriteStringValue(SolutionVersionId);
+ }
+ if (Optional.IsCollectionDefined(Specification))
+ {
+ writer.WritePropertyName("specification"u8);
+ writer.WriteStartObject();
+ foreach (var item in Specification)
+ {
+ writer.WritePropertyName(item.Key);
+ if (item.Value == null)
+ {
+ writer.WriteNullValue();
+ continue;
+ }
+#if NET6_0_OR_GREATER
+ writer.WriteRawValue(item.Value);
+#else
+ using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+ {
+ JsonSerializer.Serialize(writer, document.RootElement);
+ }
+#endif
+ }
+ writer.WriteEndObject();
+========
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
@@ -58,6 +103,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
{
writer.WritePropertyName("progressPercentage"u8);
writer.WriteNumberValue(ProgressPercentage.Value);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
}
if (options.Format != "W" && _serializedAdditionalRawData != null)
{
@@ -76,6 +122,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ SolutionVersionSnapshot 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(SolutionVersionSnapshot)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeSolutionVersionSnapshot(document.RootElement, options);
+ }
+
+ internal static SolutionVersionSnapshot DeserializeSolutionVersionSnapshot(JsonElement element, ModelReaderWriterOptions options = null)
+========
HciVmGalleryImageStatus IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -89,6 +150,7 @@ HciVmGalleryImageStatus IJsonModel.Create(ref Utf8JsonR
}
internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -96,15 +158,39 @@ internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonE
{
return null;
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ ResourceIdentifier solutionVersionId = default;
+ IReadOnlyDictionary specification = default;
+========
string errorCode = default;
string errorMessage = default;
HciVmGalleryImageProvisioningStatus provisioningStatus = default;
GalleryImageStatusDownloadStatus downloadStatus = default;
long? progressPercentage = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
foreach (var property in element.EnumerateObject())
{
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ if (property.NameEquals("solutionVersionId"u8))
+ {
+ if (property.Value.ValueKind == JsonValueKind.Null)
+ {
+ continue;
+ }
+ solutionVersionId = new ResourceIdentifier(property.Value.GetString());
+ continue;
+ }
+ if (property.NameEquals("specification"u8))
+ {
+ if (property.Value.ValueKind == JsonValueKind.Null)
+ {
+ continue;
+ }
+ Dictionary dictionary = new Dictionary();
+ foreach (var property0 in property.Value.EnumerateObject())
+========
if (property.NameEquals("errorCode"u8))
{
errorCode = property.Value.GetString();
@@ -118,9 +204,20 @@ internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonE
if (property.NameEquals("provisioningStatus"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
{
- continue;
+ if (property0.Value.ValueKind == JsonValueKind.Null)
+ {
+ dictionary.Add(property0.Name, null);
+ }
+ else
+ {
+ dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
+ }
}
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ specification = dictionary;
+========
provisioningStatus = HciVmGalleryImageProvisioningStatus.DeserializeHciVmGalleryImageProvisioningStatus(property.Value, options);
continue;
}
@@ -140,6 +237,7 @@ internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonE
continue;
}
progressPercentage = property.Value.GetInt64();
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
continue;
}
if (options.Format != "W")
@@ -148,6 +246,14 @@ internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonE
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ return new SolutionVersionSnapshot(solutionVersionId, specification ?? new ChangeTrackingDictionary(), serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return new HciVmGalleryImageStatus(
errorCode,
errorMessage,
@@ -160,10 +266,22 @@ internal static HciVmGalleryImageStatus DeserializeHciVmGalleryImageStatus(JsonE
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerWorkloadOrchestrationContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(SolutionVersionSnapshot)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ SolutionVersionSnapshot IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return ModelReaderWriter.Write(this, options, AzureResourceManagerHciVmContext.Default);
default:
throw new FormatException($"The model {nameof(HciVmGalleryImageStatus)} does not support writing '{options.Format}' format.");
@@ -173,12 +291,23 @@ BinaryData IPersistableModel.Write(ModelReaderWriterOpt
HciVmGalleryImageStatus IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SolutionVersionSnapshot.Serialization.cs
+ return DeserializeSolutionVersionSnapshot(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(SolutionVersionSnapshot)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
return DeserializeHciVmGalleryImageStatus(document.RootElement, options);
}
default:
@@ -187,5 +316,6 @@ HciVmGalleryImageStatus IPersistableModel.Create(Binary
}
string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmGalleryImageStatus.Serialization.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
index 3dc5abe339a5..dcc1e28225d4 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
@@ -11,6 +11,15 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+namespace Azure.ResourceManager.StorageMover.Models
+{
+ public partial class SourceEndpointProperties : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
public partial class HciVmNetworkInterfaceProvisioningStatus : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +27,7 @@ public partial class HciVmNetworkInterfaceProvisioningStatus : IUtf8JsonSerializ
void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,6 +38,28 @@ void IJsonModel.Write(Utf8JsonWriter wr
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(SourceEndpointProperties)} does not support writing '{format}' format.");
+ }
+
+ if (Optional.IsDefined(Name))
+ {
+ writer.WritePropertyName("name"u8);
+ writer.WriteStringValue(Name);
+ }
+ if (Optional.IsDefined(SourceEndpointResourceId))
+ {
+ writer.WritePropertyName("sourceEndpointResourceId"u8);
+ writer.WriteStringValue(SourceEndpointResourceId);
+ }
+ if (Optional.IsDefined(AwsS3BucketId))
+ {
+ writer.WritePropertyName("awsS3BucketId"u8);
+ writer.WriteStringValue(AwsS3BucketId);
+========
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
@@ -43,6 +75,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
{
writer.WritePropertyName("status"u8);
writer.WriteStringValue(Status.Value.ToString());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
}
if (options.Format != "W" && _serializedAdditionalRawData != null)
{
@@ -61,6 +94,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ SourceEndpointProperties 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(SourceEndpointProperties)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeSourceEndpointProperties(document.RootElement, options);
+ }
+
+ internal static SourceEndpointProperties DeserializeSourceEndpointProperties(JsonElement element, ModelReaderWriterOptions options = null)
+========
HciVmNetworkInterfaceProvisioningStatus IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -74,6 +122,7 @@ HciVmNetworkInterfaceProvisioningStatus IJsonModel>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -81,24 +130,52 @@ internal static HciVmNetworkInterfaceProvisioningStatus DeserializeHciVmNetworkI
{
return null;
}
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ string name = default;
+ ResourceIdentifier sourceEndpointResourceId = default;
+ ResourceIdentifier awsS3BucketId = default;
+========
string operationId = default;
HciVmOperationStatus? status = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
foreach (var property in element.EnumerateObject())
{
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ if (property.NameEquals("name"u8))
+ {
+ name = property.Value.GetString();
+ continue;
+ }
+ if (property.NameEquals("sourceEndpointResourceId"u8))
+========
if (property.NameEquals("operationId"u8))
{
operationId = property.Value.GetString();
continue;
}
if (property.NameEquals("status"u8))
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
{
if (property.Value.ValueKind == JsonValueKind.Null)
{
continue;
}
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ sourceEndpointResourceId = new ResourceIdentifier(property.Value.GetString());
+ continue;
+ }
+ if (property.NameEquals("awsS3BucketId"u8))
+ {
+ if (property.Value.ValueKind == JsonValueKind.Null)
+ {
+ continue;
+ }
+ awsS3BucketId = new ResourceIdentifier(property.Value.GetString());
+========
status = new HciVmOperationStatus(property.Value.GetString());
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
continue;
}
if (options.Format != "W")
@@ -107,16 +184,36 @@ internal static HciVmNetworkInterfaceProvisioningStatus DeserializeHciVmNetworkI
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ return new SourceEndpointProperties(name, sourceEndpointResourceId, awsS3BucketId, serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return new HciVmNetworkInterfaceProvisioningStatus(operationId, status, serializedAdditionalRawData);
}
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerStorageMoverContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(SourceEndpointProperties)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ SourceEndpointProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
return ModelReaderWriter.Write(this, options, AzureResourceManagerHciVmContext.Default);
default:
throw new FormatException($"The model {nameof(HciVmNetworkInterfaceProvisioningStatus)} does not support writing '{options.Format}' format.");
@@ -126,12 +223,23 @@ BinaryData IPersistableModel.Write(Mode
HciVmNetworkInterfaceProvisioningStatus IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/storagemover/Azure.ResourceManager.StorageMover/src/Generated/Models/SourceEndpointProperties.Serialization.cs
+ return DeserializeSourceEndpointProperties(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(SourceEndpointProperties)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
return DeserializeHciVmNetworkInterfaceProvisioningStatus(document.RootElement, options);
}
default:
@@ -140,5 +248,6 @@ HciVmNetworkInterfaceProvisioningStatus IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkInterfaceProvisioningStatus.Serialization.cs
}
}
diff --git a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs
index 35a58f439e43..5d5a25ce7098 100644
--- a/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs
+++ b/sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs
@@ -8,10 +8,17 @@
using System;
using System.Collections.Generic;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/InstanceReconciliationPolicy.cs
+namespace Azure.ResourceManager.WorkloadOrchestration.Models
+{
+ /// Defines a ReconciliationPolicy.
+ public partial class InstanceReconciliationPolicy
+========
namespace Azure.ResourceManager.Hci.Vm.Models
{
/// Route table resource.
public partial class HciVmNetworkingRouteTable
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs
{
///
/// Keeps track of any properties unknown to the library.
@@ -45,6 +52,40 @@ public partial class HciVmNetworkingRouteTable
///
private IDictionary _serializedAdditionalRawData;
+<<<<<<<< HEAD:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/InstanceReconciliationPolicy.cs
+ /// Initializes a new instance of .
+ /// The state of the ReconciliationPolicy.
+ /// Policy interval.
+ /// is null.
+ public InstanceReconciliationPolicy(InstanceReconciliationState state, string interval)
+ {
+ Argument.AssertNotNull(interval, nameof(interval));
+
+ State = state;
+ Interval = interval;
+ }
+
+ /// Initializes a new instance of .
+ /// The state of the ReconciliationPolicy.
+ /// Policy interval.
+ /// Keeps track of any properties unknown to the library.
+ internal InstanceReconciliationPolicy(InstanceReconciliationState state, string interval, IDictionary serializedAdditionalRawData)
+ {
+ State = state;
+ Interval = interval;
+ _serializedAdditionalRawData = serializedAdditionalRawData;
+ }
+
+ /// Initializes a new instance of for deserialization.
+ internal InstanceReconciliationPolicy()
+ {
+ }
+
+ /// The state of the ReconciliationPolicy.
+ public InstanceReconciliationState State { get; set; }
+ /// Policy interval.
+ public string Interval { get; set; }
+========
/// Initializes a new instance of .
public HciVmNetworkingRouteTable()
{
@@ -74,5 +115,6 @@ internal HciVmNetworkingRouteTable(string etag, string name, string type, IList<
public string Type { get; }
/// Collection of routes contained within a route table.
public IList Routes { get; }
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/azurestackhci/Azure.ResourceManager.Hci.Vm/src/Generated/Models/HciVmNetworkingRouteTable.cs
}
}
diff --git a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
index 3dc024e96c5b..099c35ed1d63 100644
--- a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
+++ b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
@@ -11,6 +11,7 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
namespace Azure.ResourceManager.ComputeSchedule.Models
{
public partial class ScheduledActionPatch : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +19,15 @@ public partial class ScheduledActionPatch : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
+namespace Azure.ResourceManager.VirtualEnclaves.Models
+{
+ public partial class VirtualEnclaveConnectionPatch : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,12 +38,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
throw new FormatException($"The model {nameof(ScheduledActionPatch)} does not support writing '{format}' format.");
+========
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(VirtualEnclaveConnectionPatch)} does not support writing '{format}' format.");
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
}
+ if (Optional.IsDefined(Properties))
+ {
+ writer.WritePropertyName("properties"u8);
+ writer.WriteObjectValue(Properties, options);
+ }
if (Optional.IsCollectionDefined(Tags))
{
writer.WritePropertyName("tags"u8);
@@ -45,11 +67,6 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
writer.WriteEndObject();
}
- if (Optional.IsDefined(Properties))
- {
- writer.WritePropertyName("properties"u8);
- writer.WriteObjectValue(Properties, options);
- }
if (options.Format != "W" && _serializedAdditionalRawData != null)
{
foreach (var item in _serializedAdditionalRawData)
@@ -67,6 +84,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
ScheduledActionPatch IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -80,6 +98,21 @@ ScheduledActionPatch IJsonModel.Create(ref Utf8JsonReader
}
internal static ScheduledActionPatch DeserializeScheduledActionPatch(JsonElement element, ModelReaderWriterOptions options = null)
+========
+ VirtualEnclaveConnectionPatch 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(VirtualEnclaveConnectionPatch)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeVirtualEnclaveConnectionPatch(document.RootElement, options);
+ }
+
+ internal static VirtualEnclaveConnectionPatch DeserializeVirtualEnclaveConnectionPatch(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -87,12 +120,25 @@ internal static ScheduledActionPatch DeserializeScheduledActionPatch(JsonElement
{
return null;
}
+ EnclaveConnectionPatchProperties properties = default;
IDictionary tags = default;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
ScheduledActionPatchProperties properties = default;
+========
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
foreach (var property in element.EnumerateObject())
{
+ if (property.NameEquals("properties"u8))
+ {
+ if (property.Value.ValueKind == JsonValueKind.Null)
+ {
+ continue;
+ }
+ properties = EnclaveConnectionPatchProperties.DeserializeEnclaveConnectionPatchProperties(property.Value, options);
+ continue;
+ }
if (property.NameEquals("tags"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
@@ -107,6 +153,7 @@ internal static ScheduledActionPatch DeserializeScheduledActionPatch(JsonElement
tags = dictionary;
continue;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
if (property.NameEquals("properties"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
@@ -116,22 +163,34 @@ internal static ScheduledActionPatch DeserializeScheduledActionPatch(JsonElement
properties = ScheduledActionPatchProperties.DeserializeScheduledActionPatchProperties(property.Value, options);
continue;
}
+========
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
if (options.Format != "W")
{
rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
return new ScheduledActionPatch(tags ?? new ChangeTrackingDictionary(), properties, serializedAdditionalRawData);
}
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ return new VirtualEnclaveConnectionPatch(properties, tags ?? new ChangeTrackingDictionary(), serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
return ModelReaderWriter.Write(this, options, AzureResourceManagerComputeScheduleContext.Default);
default:
throw new FormatException($"The model {nameof(ScheduledActionPatch)} does not support writing '{options.Format}' format.");
@@ -141,12 +200,24 @@ BinaryData IPersistableModel.Write(ModelReaderWriterOption
ScheduledActionPatch IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerVirtualEnclavesContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(VirtualEnclaveConnectionPatch)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ VirtualEnclaveConnectionPatch IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionPatch.Serialization.cs
return DeserializeScheduledActionPatch(document.RootElement, options);
}
default:
@@ -155,5 +226,15 @@ ScheduledActionPatch IPersistableModel.Create(BinaryData d
}
string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
+ return DeserializeVirtualEnclaveConnectionPatch(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(VirtualEnclaveConnectionPatch)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/VirtualEnclaveConnectionPatch.Serialization.cs
}
}
diff --git a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
index 768d120a00bb..21d1cad5e4b6 100644
--- a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
+++ b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
@@ -11,6 +11,7 @@
using System.Text.Json;
using Azure.Core;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
namespace Azure.ResourceManager.ComputeSchedule.Models
{
public partial class ScheduledActionResourceAttachContent : IUtf8JsonSerializable, IJsonModel
@@ -18,6 +19,15 @@ public partial class ScheduledActionResourceAttachContent : IUtf8JsonSerializabl
void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
+namespace Azure.ResourceManager.VirtualEnclaves.Models
+{
+ public partial class CheckAddressSpaceAvailabilityContent : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -28,6 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter write
/// The client options for reading and writing models.
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
@@ -41,6 +52,18 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
writer.WriteObjectValue(item, options);
}
writer.WriteEndArray();
+========
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(CheckAddressSpaceAvailabilityContent)} does not support writing '{format}' format.");
+ }
+
+ writer.WritePropertyName("communityResourceId"u8);
+ writer.WriteStringValue(CommunityResourceId);
+ writer.WritePropertyName("enclaveVirtualNetwork"u8);
+ writer.WriteObjectValue(EnclaveVirtualNetwork, options);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
if (options.Format != "W" && _serializedAdditionalRawData != null)
{
foreach (var item in _serializedAdditionalRawData)
@@ -58,6 +81,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
}
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
ScheduledActionResourceAttachContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -71,6 +95,21 @@ ScheduledActionResourceAttachContent 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(CheckAddressSpaceAvailabilityContent)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeCheckAddressSpaceAvailabilityContent(document.RootElement, options);
+ }
+
+ internal static CheckAddressSpaceAvailabilityContent DeserializeCheckAddressSpaceAvailabilityContent(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -78,11 +117,17 @@ internal static ScheduledActionResourceAttachContent DeserializeScheduledActionR
{
return null;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
IList resources = default;
+========
+ ResourceIdentifier communityResourceId = default;
+ EnclaveVirtualNetwork enclaveVirtualNetwork = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
IDictionary serializedAdditionalRawData = default;
Dictionary rawDataDictionary = new Dictionary();
foreach (var property in element.EnumerateObject())
{
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
if (property.NameEquals("resources"u8))
{
List array = new List();
@@ -91,6 +136,16 @@ internal static ScheduledActionResourceAttachContent DeserializeScheduledActionR
array.Add(ScheduledActionResourceData.DeserializeScheduledActionResourceData(item, options));
}
resources = array;
+========
+ if (property.NameEquals("communityResourceId"u8))
+ {
+ communityResourceId = new ResourceIdentifier(property.Value.GetString());
+ continue;
+ }
+ if (property.NameEquals("enclaveVirtualNetwork"u8))
+ {
+ enclaveVirtualNetwork = EnclaveVirtualNetwork.DeserializeEnclaveVirtualNetwork(property.Value, options);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
continue;
}
if (options.Format != "W")
@@ -99,16 +154,26 @@ internal static ScheduledActionResourceAttachContent DeserializeScheduledActionR
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
return new ScheduledActionResourceAttachContent(resources, serializedAdditionalRawData);
}
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ return new CheckAddressSpaceAvailabilityContent(communityResourceId, enclaveVirtualNetwork, serializedAdditionalRawData);
+ }
+
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
return ModelReaderWriter.Write(this, options, AzureResourceManagerComputeScheduleContext.Default);
default:
throw new FormatException($"The model {nameof(ScheduledActionResourceAttachContent)} does not support writing '{options.Format}' format.");
@@ -118,12 +183,24 @@ BinaryData IPersistableModel.Write(ModelRe
ScheduledActionResourceAttachContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerVirtualEnclavesContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(CheckAddressSpaceAvailabilityContent)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ CheckAddressSpaceAvailabilityContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourceAttachContent.Serialization.cs
return DeserializeScheduledActionResourceAttachContent(document.RootElement, options);
}
default:
@@ -132,5 +209,15 @@ ScheduledActionResourceAttachContent IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
+ return DeserializeCheckAddressSpaceAvailabilityContent(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(CheckAddressSpaceAvailabilityContent)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/Models/CheckAddressSpaceAvailabilityContent.Serialization.cs
}
}
diff --git a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs
index b3054dc76f12..6c01a6a1796b 100644
--- a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs
+++ b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs
@@ -9,10 +9,17 @@
using System.Collections.Generic;
using System.Linq;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs
namespace Azure.ResourceManager.ComputeSchedule.Models
{
/// Request model perform a resource operation in a list of resources.
public partial class ScheduledActionResourcePatchContent
+========
+namespace Azure.ResourceManager.WorkloadOrchestration.Models
+{
+ /// The response of a Schema list operation.
+ internal partial class SchemaListResult
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SchemaListResult.cs
{
///
/// Keeps track of any properties unknown to the library.
@@ -46,6 +53,7 @@ public partial class ScheduledActionResourcePatchContent
///
private IDictionary _serializedAdditionalRawData;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResourcePatchContent.cs
/// Initializes a new instance of .
/// The list of resources we watch to patch.
/// is null.
@@ -72,5 +80,37 @@ internal ScheduledActionResourcePatchContent()
/// The list of resources we watch to patch.
public IList Resources { get; }
+========
+ /// Initializes a new instance of .
+ /// The Schema items on this page.
+ /// is null.
+ internal SchemaListResult(IEnumerable value)
+ {
+ Argument.AssertNotNull(value, nameof(value));
+
+ Value = value.ToList();
+ }
+
+ /// Initializes a new instance of .
+ /// The Schema items on this page.
+ /// The link to the next page of items.
+ /// Keeps track of any properties unknown to the library.
+ internal SchemaListResult(IReadOnlyList value, Uri nextLink, IDictionary serializedAdditionalRawData)
+ {
+ Value = value;
+ NextLink = nextLink;
+ _serializedAdditionalRawData = serializedAdditionalRawData;
+ }
+
+ /// Initializes a new instance of for deserialization.
+ internal SchemaListResult()
+ {
+ }
+
+ /// The Schema items on this page.
+ public IReadOnlyList Value { get; }
+ /// The link to the next page of items.
+ public Uri NextLink { get; }
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/src/Generated/Models/SchemaListResult.cs
}
}
diff --git a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
index e5ab64275a1c..c299b81311cf 100644
--- a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
+++ b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
@@ -12,6 +12,7 @@
using System.Text.Json;
using Azure.Core;
using Azure.ResourceManager.Models;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
namespace Azure.ResourceManager.ComputeSchedule.Models
{
@@ -20,6 +21,17 @@ public partial class ScheduledActionResources : IUtf8JsonSerializable, IJsonMode
void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
+using Azure.ResourceManager.VirtualEnclaves.Models;
+
+namespace Azure.ResourceManager.VirtualEnclaves
+{
+ public partial class VirtualEnclaveApprovalData : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -30,10 +42,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead
/// The client options for reading and writing models.
protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
throw new FormatException($"The model {nameof(ScheduledActionResources)} does not support writing '{format}' format.");
+========
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(VirtualEnclaveApprovalData)} does not support writing '{format}' format.");
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
}
base.JsonModelWriteCore(writer, options);
@@ -44,6 +63,7 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
}
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
ScheduledActionResources IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -57,6 +77,21 @@ ScheduledActionResources IJsonModel.Create(ref Utf8Jso
}
internal static ScheduledActionResources DeserializeScheduledActionResources(JsonElement element, ModelReaderWriterOptions options = null)
+========
+ VirtualEnclaveApprovalData 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(VirtualEnclaveApprovalData)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeVirtualEnclaveApprovalData(document.RootElement, options);
+ }
+
+ internal static VirtualEnclaveApprovalData DeserializeVirtualEnclaveApprovalData(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -64,7 +99,11 @@ internal static ScheduledActionResources DeserializeScheduledActionResources(Jso
{
return null;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
ScheduledActionsExtensionProperties properties = default;
+========
+ VirtualEnclaveApprovalProperties properties = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
ResourceIdentifier id = default;
string name = default;
ResourceType type = default;
@@ -79,7 +118,11 @@ internal static ScheduledActionResources DeserializeScheduledActionResources(Jso
{
continue;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
properties = ScheduledActionsExtensionProperties.DeserializeScheduledActionsExtensionProperties(property.Value, options);
+========
+ properties = VirtualEnclaveApprovalProperties.DeserializeVirtualEnclaveApprovalProperties(property.Value, options);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
continue;
}
if (property.NameEquals("id"u8))
@@ -103,7 +146,11 @@ internal static ScheduledActionResources DeserializeScheduledActionResources(Jso
{
continue;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
systemData = ModelReaderWriter.Read(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerComputeScheduleContext.Default);
+========
+ systemData = ModelReaderWriter.Read(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerVirtualEnclavesContext.Default);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
continue;
}
if (options.Format != "W")
@@ -112,7 +159,11 @@ internal static ScheduledActionResources DeserializeScheduledActionResources(Jso
}
}
serializedAdditionalRawData = rawDataDictionary;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
return new ScheduledActionResources(
+========
+ return new VirtualEnclaveApprovalData(
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
id,
name,
type,
@@ -121,13 +172,20 @@ internal static ScheduledActionResources DeserializeScheduledActionResources(Jso
serializedAdditionalRawData);
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ BinaryData IPersistableModel.Write(ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
switch (format)
{
case "J":
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
return ModelReaderWriter.Write(this, options, AzureResourceManagerComputeScheduleContext.Default);
default:
throw new FormatException($"The model {nameof(ScheduledActionResources)} does not support writing '{options.Format}' format.");
@@ -137,12 +195,24 @@ BinaryData IPersistableModel.Write(ModelReaderWriterOp
ScheduledActionResources IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+========
+ return ModelReaderWriter.Write(this, options, AzureResourceManagerVirtualEnclavesContext.Default);
+ default:
+ throw new FormatException($"The model {nameof(VirtualEnclaveApprovalData)} does not support writing '{options.Format}' format.");
+ }
+ }
+
+ VirtualEnclaveApprovalData IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options)
+ {
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
switch (format)
{
case "J":
{
using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/Models/ScheduledActionResources.Serialization.cs
return DeserializeScheduledActionResources(document.RootElement, options);
}
default:
@@ -151,5 +221,15 @@ ScheduledActionResources IPersistableModel.Create(Bina
}
string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+========
+ return DeserializeVirtualEnclaveApprovalData(document.RootElement, options);
+ }
+ default:
+ throw new FormatException($"The model {nameof(VirtualEnclaveApprovalData)} does not support reading '{options.Format}' format.");
+ }
+ }
+
+ string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveApprovalData.Serialization.cs
}
}
diff --git a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
index 7bbfc28ff600..bf6e66108790 100644
--- a/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
+++ b/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
@@ -13,6 +13,7 @@
using Azure.Core;
using Azure.ResourceManager.ComputeSchedule.Models;
using Azure.ResourceManager.Models;
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
namespace Azure.ResourceManager.ComputeSchedule
{
@@ -21,6 +22,17 @@ public partial class ScheduledActionData : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+========
+using Azure.ResourceManager.VirtualEnclaves.Models;
+
+namespace Azure.ResourceManager.VirtualEnclaves
+{
+ public partial class VirtualEnclaveConnectionData : IUtf8JsonSerializable, IJsonModel
+ {
+ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveConnectionData.Serialization.cs
{
writer.WriteStartObject();
JsonModelWriteCore(writer, options);
@@ -31,10 +43,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri
/// The client options for reading and writing models.
protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
{
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
if (format != "J")
{
throw new FormatException($"The model {nameof(ScheduledActionData)} does not support writing '{format}' format.");
+========
+ var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
+ if (format != "J")
+ {
+ throw new FormatException($"The model {nameof(VirtualEnclaveConnectionData)} does not support writing '{format}' format.");
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveConnectionData.Serialization.cs
}
base.JsonModelWriteCore(writer, options);
@@ -45,6 +64,7 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
}
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
ScheduledActionData IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
{
var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format;
@@ -58,6 +78,21 @@ ScheduledActionData IJsonModel.Create(ref Utf8JsonReader re
}
internal static ScheduledActionData DeserializeScheduledActionData(JsonElement element, ModelReaderWriterOptions options = null)
+========
+ VirtualEnclaveConnectionData 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(VirtualEnclaveConnectionData)} does not support reading '{format}' format.");
+ }
+
+ using JsonDocument document = JsonDocument.ParseValue(ref reader);
+ return DeserializeVirtualEnclaveConnectionData(document.RootElement, options);
+ }
+
+ internal static VirtualEnclaveConnectionData DeserializeVirtualEnclaveConnectionData(JsonElement element, ModelReaderWriterOptions options = null)
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveConnectionData.Serialization.cs
{
options ??= ModelSerializationExtensions.WireOptions;
@@ -65,7 +100,11 @@ internal static ScheduledActionData DeserializeScheduledActionData(JsonElement e
{
return null;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
ScheduledActionProperties properties = default;
+========
+ VirtualEnclaveConnectionProperties properties = default;
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveConnectionData.Serialization.cs
IDictionary tags = default;
AzureLocation location = default;
ResourceIdentifier id = default;
@@ -82,7 +121,11 @@ internal static ScheduledActionData DeserializeScheduledActionData(JsonElement e
{
continue;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
properties = ScheduledActionProperties.DeserializeScheduledActionProperties(property.Value, options);
+========
+ properties = VirtualEnclaveConnectionProperties.DeserializeVirtualEnclaveConnectionProperties(property.Value, options);
+>>>>>>>> 55d5a2fdb94afd7949d951566821912afaacc538:sdk/virtualenclaves/Azure.ResourceManager.VirtualEnclaves/src/Generated/VirtualEnclaveConnectionData.Serialization.cs
continue;
}
if (property.NameEquals("tags"u8))
@@ -125,7 +168,11 @@ internal static ScheduledActionData DeserializeScheduledActionData(JsonElement e
{
continue;
}
+<<<<<<<< HEAD:sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/src/Generated/ScheduledActionData.Serialization.cs
systemData = ModelReaderWriter.Read