Skip to content

Commit 6975fb7

Browse files
JoshLove-msftJoshLove-msft
authored
Move BD extensions to Core.Experimental for now (Azure#16556)
1 parent 14ae651 commit 6975fb7

File tree

12 files changed

+33
-35
lines changed

12 files changed

+33
-35
lines changed

‎eng/Packages.Data.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
3535
<PackageReference Update="FluentAssertions" Version="5.10.3" />
3636
<PackageReference Update="FsCheck.Xunit" Version="2.14.0" />
37-
<PackageReference Update="Microsoft.Azure.Amqp" Version="2.4.6" />
37+
<PackageReference Update="Microsoft.Azure.Amqp" Version="2.4.8" />
3838
<PackageReference Update="Microsoft.Azure.Batch" Version="11.0.0" />
3939
<PackageReference Update="Microsoft.Azure.Devices.Client" Version="1.23.2" />
4040
<PackageReference Update="Microsoft.Azure.Devices" Version="1.19.0" />
@@ -107,6 +107,7 @@
107107
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
108108
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
109109
<PackageReference Update="System.Linq" Version="4.3.0" />
110+
<PackageReference Update="System.Memory.Data" Version="1.0.0" />
110111
<PackageReference Update="System.Net.Http" Version="4.3.4" />
111112
<PackageReference Update="System.Net.WebSockets.Client" Version="4.3.2" />
112113
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />

‎sdk/core/Azure.Core.Experimental/api/Azure.Core.Experimental.netstandard2.0.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
namespace Azure
2+
{
3+
public static partial class SerializationExtensions
4+
{
5+
public static System.BinaryData SerializeToBinaryData(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
6+
public static System.Threading.Tasks.ValueTask<System.BinaryData> SerializeToBinaryDataAsync(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
7+
public static System.Threading.Tasks.ValueTask<T> ToObjectAsync<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
8+
public static T ToObject<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
9+
}
10+
}
111
namespace Azure.Core
212
{
313
public partial class DynamicJson : System.Dynamic.IDynamicMetaObjectProvider

‎sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<ProjectReference Include="../../Azure.Core/src/Azure.Core.csproj" />
1414
</ItemGroup>
1515

16+
<ItemGroup>
17+
<PackageReference Include="System.Memory.Data" />
18+
</ItemGroup>
19+
1620
<ItemGroup>
1721
<Compile Include="$(AzureCoreSharedSources)Argument.cs" />
1822
<Compile Include="$(AzureCoreSharedSources)HashCodeBuilder.cs" />

sdk/core/Azure.Core/src/Serialization/SerializationExtensions.cs renamed to sdk/core/Azure.Core.Experimental/src/Serialization/SerializationExtensions.cs

File renamed without changes.

sdk/core/Azure.Core/tests/SerializationExtensionsTests.cs renamed to sdk/core/Azure.Core.Experimental/tests/SerializationExtensionsTests.cs

File renamed without changes.

‎sdk/core/Azure.Core/api/Azure.Core.net461.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,6 @@ protected Response() { }
174174
public static implicit operator T (Azure.Response<T> response) { throw null; }
175175
public override string ToString() { throw null; }
176176
}
177-
public static partial class SerializationExtensions
178-
{
179-
public static System.BinaryData SerializeToBinaryData(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
180-
public static System.Threading.Tasks.ValueTask<System.BinaryData> SerializeToBinaryDataAsync(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
181-
public static System.Threading.Tasks.ValueTask<T> ToObjectAsync<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
182-
public static T ToObject<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
183-
}
184177
}
185178
namespace Azure.Core
186179
{

‎sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,6 @@ protected Response() { }
174174
public static implicit operator T (Azure.Response<T> response) { throw null; }
175175
public override string ToString() { throw null; }
176176
}
177-
public static partial class SerializationExtensions
178-
{
179-
public static System.BinaryData SerializeToBinaryData(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
180-
public static System.Threading.Tasks.ValueTask<System.BinaryData> SerializeToBinaryDataAsync(this Azure.Core.Serialization.ObjectSerializer serializer, object? value, System.Type? inputType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
181-
public static System.Threading.Tasks.ValueTask<T> ToObjectAsync<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
182-
public static T ToObject<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
183-
}
184177
}
185178
namespace Azure.Core
186179
{

‎sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="System.Text.Json" />
12+
<!--This can be removed once this dependency is added to Core in the next release.-->
13+
<PackageReference Include="System.Memory.Data" />
1214
</ItemGroup>
1315

16+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\core\Azure.Core\src\Azure.Core.props" />
17+
1418
<!-- Shared source from Azure.Core -->
1519
<ItemGroup>
1620
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
@@ -25,9 +29,5 @@
2529
<Compile Include="$(AzureCoreSharedSources)Argument.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
2630
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
2731
</ItemGroup>
28-
<ItemGroup>
29-
<ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
30-
<ProjectReference Include="..\..\..\core\System.Memory.Data\src\System.Memory.Data.csproj" />
31-
</ItemGroup>
3232

3333
</Project>

‎sdk/eventhub/Azure.Messaging.EventHubs/src/Azure.Messaging.EventHubs.csproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,20 @@
1212
<Folder Include="Properties\" />
1313
</ItemGroup>
1414

15-
<ItemGroup><!-- This package will be removed when v5.3.0 is released for GA -->
15+
<ItemGroup>
1616
<PackageReference Include="Microsoft.Azure.Amqp" />
1717
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
1818
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
1919
<PackageReference Include="System.Reflection.TypeExtensions" />
2020
<PackageReference Include="System.Threading.Channels" />
2121
<PackageReference Include="System.Threading.Tasks.Extensions" />
22+
<!-- This package will be removed when v5.3.0 is released for GA as the dependency will be available from Core -->
23+
<PackageReference Include="System.Memory.Data" />
2224
</ItemGroup>
2325

2426
<!-- Import the Azure.Core reference -->
2527
<Import Project="$(MSBuildThisFileDirectory)..\..\..\core\Azure.Core\src\Azure.Core.props" />
2628

27-
<!-- TEMP: Use a project reference to Data; remove when published"-->
28-
<ItemGroup>
29-
<ProjectReference Include="..\..\..\core\System.Memory.Data\src\System.Memory.Data.csproj" />
30-
</ItemGroup>
31-
<!-- END TEMP-->
32-
3329
<!-- Import Event Hubs shared source -->
3430
<Import Project="$(MSBuildThisFileDirectory)..\..\Azure.Messaging.EventHubs.Shared\src\Azure.Messaging.EventHubs.Shared.Core.projitems" Label="Core" />
3531
<Import Project="$(MSBuildThisFileDirectory)..\..\Azure.Messaging.EventHubs.Shared\src\Azure.Messaging.EventHubs.Shared.Diagnostics.projitems" Label="Diagnostics" />
@@ -62,4 +58,4 @@
6258
<CustomToolNamespace>Azure.Messaging.EventHubs</CustomToolNamespace>
6359
</EmbeddedResource>
6460
</ItemGroup>
65-
</Project>
61+
</Project>

‎sdk/eventhub/Azure.Messaging.EventHubs/tests/Azure.Messaging.EventHubs.Tests.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
<ProjectReference Include="..\src\Azure.Messaging.EventHubs.csproj" />
3232
</ItemGroup>
3333

34-
<!-- TEMP: Use a project reference to Data; remove when published"-->
35-
<ItemGroup>
36-
<ProjectReference Include="..\..\..\core\System.Memory.Data\src\System.Memory.Data.csproj" />
37-
</ItemGroup>
38-
<!-- END TEMP-->
39-
4034
<!-- Import Event Hubs shared source -->
4135
<Import Project="$(MSBuildThisFileDirectory)..\..\Azure.Messaging.EventHubs.Shared\src\Azure.Messaging.EventHubs.Shared.Testing.projitems" Label="Testing" />
4236

0 commit comments

Comments
 (0)