Skip to content

Commit 5b4ebab

Browse files
Update to serialize / deserialize BinaryData to support untyped yet dynamic used cases (Azure#27382)
* wip * wip * update proj references for files needed by lro * refactor code * update api and unit tests * update keyvault includes * add round trip validation for all cases * remove dupe from storage * one more dupe in storage * change to IDictionary * fix proj files for storage * Remove from json * update to use jsonelement * rename back to ToDictionaryFromJson * throw exception if the json was not a json object * Update sdk/core/Azure.Core/src/Serialization/AzureCoreExtensions.cs Co-authored-by: JoshLove-msft <[email protected]> Co-authored-by: JoshLove-msft <[email protected]>
1 parent 478d768 commit 5b4ebab

File tree

80 files changed

+587
-330
lines changed

Some content is hidden

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

80 files changed

+587
-330
lines changed

eng/Directory.Build.Common.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@
202202
<Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" LinkBase="Shared/Core" />
203203
<Compile Include="$(AzureCoreSharedSources)DiagnosticScope.cs" LinkBase="Shared/Core" />
204204
<Compile Include="$(AzureCoreSharedSources)DiagnosticScopeFactory.cs" LinkBase="Shared/Core" />
205+
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared/Core" />
206+
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared/Core" />
207+
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared/Core" />
208+
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared/Core" />
209+
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared/Core" />
205210
</ItemGroup>
206211

207212
<!-- *********** Management Client Library Override section ************* -->
@@ -211,12 +216,7 @@
211216
<PackageReference Include="System.Text.Json" />
212217

213218
<!-- TODO: Review these file references-->
214-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
215219
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
216-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
217-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
218-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
219-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
220220
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
221221
</ItemGroup>
222222

eng/Packages.Data.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<PackageReference Update="Azure.Security.KeyVault.Secrets" Version="4.2.0-beta.4" />
183183
<PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
184184
<PackageReference Update="Azure.Storage.Files.DataLake" Version="12.8.0" />
185-
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
185+
<PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
186186
<PackageReference Update="Castle.Core" Version="4.4.0" />
187187
<PackageReference Update="CommandLineParser" Version="2.8.0" />
188188
<PackageReference Update="FluentAssertions" Version="5.10.3" />

eng/templates/Azure.ServiceTemplate.Template/src/Azure.ServiceTemplate.Template.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@
1313

1414
<!-- Shared source from Azure.Core -->
1515
<ItemGroup>
16-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
17-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
1816
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
19-
<Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" LinkBase="Shared" />
20-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
21-
<Compile Include="$(AzureCoreSharedSources)DiagnosticScope.cs" LinkBase="Shared" />
22-
<Compile Include="$(AzureCoreSharedSources)DiagnosticScopeFactory.cs" LinkBase="Shared" />
23-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
24-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2517
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
2618
</ItemGroup>
2719
<ItemGroup>

sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Azure.Verticals.AgriFood.Farming.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@
1818

1919
<!-- Shared source from Azure.Core -->
2020
<ItemGroup>
21-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
2221
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
23-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2422
<Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared" />
25-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
26-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
27-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2823
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
2924
</ItemGroup>
3025

sdk/anomalydetector/Azure.AI.AnomalyDetector/src/Azure.AI.AnomalyDetector.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717

1818
<!-- Shared source from Azure.Core -->
1919
<ItemGroup>
20-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
21-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2220
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
2321
<Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared" />
2422
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
25-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
26-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
27-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2823
</ItemGroup>
2924

3025
</Project>

sdk/attestation/Azure.Security.Attestation/src/Azure.Security.Attestation.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@
1818

1919
<!-- Shared source from Azure.Core -->
2020
<ItemGroup>
21-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
22-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2321
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
24-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
25-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
26-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2722
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
2823
<Compile Include="$(AzureCoreSharedSources)Base64Url.cs" LinkBase="Shared" />
2924
<Compile Include="$(AzureCoreSharedSources)SyncAsyncEventHandlerExtensions.cs" LinkBase="Shared" />

sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Azure.AI.Language.Conversations.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616

1717
<!-- Shared source from Azure.Core -->
1818
<ItemGroup>
19-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
20-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2119
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
2220
<Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared" />
2321
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
24-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
25-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
26-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2722
</ItemGroup>
2823

2924
</Project>

sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Azure.AI.Language.QuestionAnswering.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919
<!-- Shared source from Azure.Core -->
2020
<ItemGroup>
21-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
22-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2321
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
2422
<Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared" />
2523
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
26-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
27-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
28-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
2924
</ItemGroup>
3025

3126
</Project>

sdk/communication/Azure.Communication.CallingServer/src/Azure.Communication.CallingServer.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@
2020
<Compile Include="..\..\Shared\src\ClientOptionsExtensions.cs" LinkBase="Shared\Communication" />
2121
<Compile Include="..\..\Shared\src\HMACAuthenticationPolicy.cs" LinkBase="Shared\Communication" />
2222
<Compile Include="..\..\Shared\src\CommunicationIdentifierSerializer.cs" LinkBase="Shared\Communication" />
23-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
24-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
2523
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
2624
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
2725
<Compile Include="$(AzureCoreSharedSources)ConnectionString.cs" LinkBase="Shared" />
28-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
29-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
3026
<Compile Include="$(AzureCoreSharedSources)RetriableStream.cs" LinkBase="Shared" />
3127
<Compile Include="$(AzureCoreSharedSources)CancellationHelper.cs" LinkBase="Shared" />
32-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
3328
</ItemGroup>
3429
<ItemGroup>
3530
<PackageReference Include="Azure.Core" />

sdk/communication/Azure.Communication.Chat/src/Azure.Communication.Chat.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@
2727
<ItemGroup>
2828
<Compile Include="..\..\Shared\src\CommunicationIdentifierSerializer.cs" LinkBase="Shared\Communication" />
2929
<Compile Include="..\..\Shared\src\CommunicationBearerTokenCredential.cs" LinkBase="Shared\Communication" />
30-
<Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
3130
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
32-
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
33-
<Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
34-
<Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared" />
35-
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
3631
</ItemGroup>
3732
<ItemGroup>
3833
<PackageReference Include="Azure.Communication.Common" />

0 commit comments

Comments
 (0)