Skip to content

Commit f4ffe1f

Browse files
authored
Fix DFE type filtering and remove ifDef for JsonMarshal (#5368)
1 parent be4f04e commit f4ffe1f

File tree

220 files changed

+334
-2666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+334
-2666
lines changed

samples/AzureSample.ResourceManager.Sample/src/Generated/AvailabilitySetData.Serialization.cs

Lines changed: 3 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/AzureSample.ResourceManager.Sample/src/Generated/DedicatedHostData.Serialization.cs

Lines changed: 2 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/AzureSample.ResourceManager.Sample/src/Generated/DedicatedHostGroupData.Serialization.cs

Lines changed: 2 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/AzureSample.ResourceManager.Sample/src/Generated/ImageData.Serialization.cs

Lines changed: 2 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/AzureSample.ResourceManager.Sample/src/Generated/Models/AvailabilitySetPatch.Serialization.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System;
99
using System.ClientModel.Primitives;
1010
using System.Collections.Generic;
11-
using System.Runtime.InteropServices;
1211
using System.Text;
1312
using System.Text.Json;
1413
using Azure.Core;
@@ -173,13 +172,7 @@ internal static AvailabilitySetPatch DeserializeAvailabilitySetPatch(JsonElement
173172
List<WritableSubResource> array = new List<WritableSubResource>();
174173
foreach (var item in property0.Value.EnumerateArray())
175174
{
176-
array.Add(
177-
#if NET9_0_OR_GREATER
178-
global::System.ClientModel.Primitives.ModelReaderWriter.Read<global::Azure.ResourceManager.Resources.Models.WritableSubResource>(new global::System.BinaryData(global::System.Runtime.InteropServices.JsonMarshal.GetRawUtf8Value(item).ToArray()), options, AzureSampleResourceManagerSampleContext.Default)
179-
#else
180-
ModelReaderWriter.Read<WritableSubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default)
181-
#endif
182-
);
175+
array.Add(ModelReaderWriter.Read<WritableSubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default));
183176
}
184177
virtualMachines = array;
185178
continue;
@@ -190,13 +183,7 @@ internal static AvailabilitySetPatch DeserializeAvailabilitySetPatch(JsonElement
190183
{
191184
continue;
192185
}
193-
proximityPlacementGroup =
194-
#if NET9_0_OR_GREATER
195-
global::System.ClientModel.Primitives.ModelReaderWriter.Read<global::Azure.ResourceManager.Resources.Models.WritableSubResource>(new global::System.BinaryData(global::System.Runtime.InteropServices.JsonMarshal.GetRawUtf8Value(property0.Value).ToArray()), options, AzureSampleResourceManagerSampleContext.Default)
196-
#else
197-
ModelReaderWriter.Read<WritableSubResource>(new BinaryData(Encoding.UTF8.GetBytes(property0.Value.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default)
198-
#endif
199-
;
186+
proximityPlacementGroup = ModelReaderWriter.Read<WritableSubResource>(new BinaryData(Encoding.UTF8.GetBytes(property0.Value.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default);
200187
continue;
201188
}
202189
if (property0.NameEquals("statuses"u8))

samples/AzureSample.ResourceManager.Sample/src/Generated/Models/DedicatedHostGroupPatch.Serialization.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System;
99
using System.ClientModel.Primitives;
1010
using System.Collections.Generic;
11-
using System.Runtime.InteropServices;
1211
using System.Text;
1312
using System.Text.Json;
1413
using Azure.Core;
@@ -163,13 +162,7 @@ internal static DedicatedHostGroupPatch DeserializeDedicatedHostGroupPatch(JsonE
163162
List<Azure.ResourceManager.Resources.Models.SubResource> array = new List<Azure.ResourceManager.Resources.Models.SubResource>();
164163
foreach (var item in property0.Value.EnumerateArray())
165164
{
166-
array.Add(
167-
#if NET9_0_OR_GREATER
168-
global::System.ClientModel.Primitives.ModelReaderWriter.Read<global::Azure.ResourceManager.Resources.Models.SubResource>(new global::System.BinaryData(global::System.Runtime.InteropServices.JsonMarshal.GetRawUtf8Value(item).ToArray()), options, AzureSampleResourceManagerSampleContext.Default)
169-
#else
170-
ModelReaderWriter.Read<Azure.ResourceManager.Resources.Models.SubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default)
171-
#endif
172-
);
165+
array.Add(ModelReaderWriter.Read<Azure.ResourceManager.Resources.Models.SubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default));
173166
}
174167
hosts = array;
175168
continue;

samples/AzureSample.ResourceManager.Sample/src/Generated/Models/DedicatedHostPatch.Serialization.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System;
99
using System.ClientModel.Primitives;
1010
using System.Collections.Generic;
11-
using System.Runtime.InteropServices;
1211
using System.Text;
1312
using System.Text.Json;
1413
using Azure.Core;
@@ -176,13 +175,7 @@ internal static DedicatedHostPatch DeserializeDedicatedHostPatch(JsonElement ele
176175
List<Azure.ResourceManager.Resources.Models.SubResource> array = new List<Azure.ResourceManager.Resources.Models.SubResource>();
177176
foreach (var item in property0.Value.EnumerateArray())
178177
{
179-
array.Add(
180-
#if NET9_0_OR_GREATER
181-
global::System.ClientModel.Primitives.ModelReaderWriter.Read<global::Azure.ResourceManager.Resources.Models.SubResource>(new global::System.BinaryData(global::System.Runtime.InteropServices.JsonMarshal.GetRawUtf8Value(item).ToArray()), options, AzureSampleResourceManagerSampleContext.Default)
182-
#else
183-
ModelReaderWriter.Read<Azure.ResourceManager.Resources.Models.SubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default)
184-
#endif
185-
);
178+
array.Add(ModelReaderWriter.Read<Azure.ResourceManager.Resources.Models.SubResource>(new BinaryData(Encoding.UTF8.GetBytes(item.GetRawText())), options, AzureSampleResourceManagerSampleContext.Default));
186179
}
187180
virtualMachines = array;
188181
continue;

0 commit comments

Comments
 (0)