Skip to content

Commit f0d1883

Browse files
authored
Upgrading BCL packages pt. 1 (Azure#48547)
* initial changes * fixes 1 * upgrade system.memory.data in test projects * fix aot warnings * webpubsub fixes * more webpubsub fixes * use polyfill for webpubsub json converters for now * pin versions * ignore tfm warnings * shift to net8.0 * more web pub sub fixes * digital twins * monitor * slimming num of package upgrades to make pipeline debugging easier * also update test reference * experiment * another package * try sb update * experiment 2 * digital twins * just microsoft bcl async interfaces * fixed * get encodings too * fix extra new line added when fixing conflict * update servicebus api
1 parent 0ce5eaf commit f0d1883

File tree

20 files changed

+130
-21
lines changed

20 files changed

+130
-21
lines changed

common/Perf/Azure.Test.Perf/Azure.Test.Perf.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PackageReference Include="CommandLineParser" />
1010
<PackageReference Include="System.Reflection.Emit" />
1111
<PackageReference Include="System.Text.Json" />
12-
<PackageReference Include="System.Text.Encodings.Web" />
1312
<PackageReference Include="System.Threading.Channels" />
1413
<PackageReference Include="BenchmarkDotNet" />
1514
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />

eng/Packages.Data.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
<PackageReference Update="System.Threading.Channels" Version="6.0.0" />
100100
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
101101
<PackageReference Update="System.Text.Json" Version="6.0.11" />
102-
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.1" />
102+
<PackageReference Update="System.Text.Encodings.Web" Version="8.0.0" />
103103
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
104-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
104+
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
105105
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
106106
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0"/>
107107

sdk/digitaltwins/Azure.DigitalTwins.Core/samples/DigitalTwinsClientSample/DigitalTwinsClientSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="CommandLineParser" Version="2.7.82" />
1818
<PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
1919

20-
<PackageReference Include="System.Text.Json" Version="6.0.11" />
20+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
2121
</ItemGroup>
2222

2323
<ItemGroup>
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
namespace Azure.Monitor.Ingestion
2+
{
3+
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
4+
public readonly partial struct LogsIngestionAudience : System.IEquatable<Azure.Monitor.Ingestion.LogsIngestionAudience>
5+
{
6+
private readonly object _dummy;
7+
private readonly int _dummyPrimitive;
8+
public LogsIngestionAudience(string value) { throw null; }
9+
public static Azure.Monitor.Ingestion.LogsIngestionAudience AzureChina { get { throw null; } }
10+
public static Azure.Monitor.Ingestion.LogsIngestionAudience AzureGovernment { get { throw null; } }
11+
public static Azure.Monitor.Ingestion.LogsIngestionAudience AzurePublicCloud { get { throw null; } }
12+
public bool Equals(Azure.Monitor.Ingestion.LogsIngestionAudience other) { throw null; }
13+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
14+
public override bool Equals(object obj) { throw null; }
15+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
16+
public override int GetHashCode() { throw null; }
17+
public static bool operator ==(Azure.Monitor.Ingestion.LogsIngestionAudience left, Azure.Monitor.Ingestion.LogsIngestionAudience right) { throw null; }
18+
public static implicit operator Azure.Monitor.Ingestion.LogsIngestionAudience (string value) { throw null; }
19+
public static bool operator !=(Azure.Monitor.Ingestion.LogsIngestionAudience left, Azure.Monitor.Ingestion.LogsIngestionAudience right) { throw null; }
20+
public override string ToString() { throw null; }
21+
}
22+
public partial class LogsIngestionClient
23+
{
24+
protected LogsIngestionClient() { }
25+
public LogsIngestionClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
26+
public LogsIngestionClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.Monitor.Ingestion.LogsIngestionClientOptions options) { }
27+
public virtual Azure.Core.Pipeline.HttpPipeline Pipeline { get { throw null; } }
28+
public virtual Azure.Response Upload(string ruleId, string streamName, Azure.Core.RequestContent content, string contentEncoding = null, Azure.RequestContext context = null) { throw null; }
29+
public virtual System.Threading.Tasks.Task<Azure.Response> UploadAsync(string ruleId, string streamName, Azure.Core.RequestContent content, string contentEncoding = null, Azure.RequestContext context = null) { throw null; }
30+
public virtual System.Threading.Tasks.Task<Azure.Response> UploadAsync<T>(string ruleId, string streamName, System.Collections.Generic.IEnumerable<T> logs, Azure.Monitor.Ingestion.LogsUploadOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
31+
public virtual Azure.Response Upload<T>(string ruleId, string streamName, System.Collections.Generic.IEnumerable<T> logs, Azure.Monitor.Ingestion.LogsUploadOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
32+
}
33+
public partial class LogsIngestionClientOptions : Azure.Core.ClientOptions
34+
{
35+
public LogsIngestionClientOptions(Azure.Monitor.Ingestion.LogsIngestionClientOptions.ServiceVersion version = Azure.Monitor.Ingestion.LogsIngestionClientOptions.ServiceVersion.V2023_01_01) { }
36+
public Azure.Monitor.Ingestion.LogsIngestionAudience? Audience { get { throw null; } set { } }
37+
public enum ServiceVersion
38+
{
39+
V2023_01_01 = 1,
40+
}
41+
}
42+
public partial class LogsUploadFailedEventArgs : Azure.SyncAsyncEventArgs
43+
{
44+
public LogsUploadFailedEventArgs(System.Collections.Generic.IEnumerable<object> failedLogs, System.Exception exception, bool isRunningSynchronously, System.Threading.CancellationToken cancellationToken) : base (default(bool), default(System.Threading.CancellationToken)) { }
45+
public System.Exception Exception { get { throw null; } }
46+
public System.Collections.Generic.IReadOnlyList<object> FailedLogs { get { throw null; } }
47+
}
48+
public partial class LogsUploadOptions
49+
{
50+
public LogsUploadOptions() { }
51+
public int MaxConcurrency { get { throw null; } set { } }
52+
public Azure.Core.Serialization.ObjectSerializer Serializer { get { throw null; } set { } }
53+
public event Azure.Core.SyncAsyncEventHandler<Azure.Monitor.Ingestion.LogsUploadFailedEventArgs> UploadFailed { add { } remove { } }
54+
}
55+
}
56+
namespace Microsoft.Extensions.Azure
57+
{
58+
public static partial class IngestionClientBuilderExtensions
59+
{
60+
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Monitor.Ingestion.LogsIngestionClient, Azure.Monitor.Ingestion.LogsIngestionClientOptions> AddLogsIngestionClient<TBuilder>(this TBuilder builder, System.Uri endpoint) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
61+
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Monitor.Ingestion.LogsIngestionClient, Azure.Monitor.Ingestion.LogsIngestionClientOptions> AddLogsIngestionClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
62+
}
63+
}

sdk/monitor/Azure.Monitor.Ingestion/src/Azure.Monitor.Ingestion.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
77
<ApiCompatVersion>1.1.2</ApiCompatVersion>
88
<PackageTags>Azure Monitor Ingestion</PackageTags>
9-
<TargetFrameworks>$(RequiredTargetFrameworks);net461</TargetFrameworks>
9+
<TargetFrameworks>$(RequiredTargetFrameworks);net462</TargetFrameworks>
1010
<NoWarn>$(NoWarn);CA1835</NoWarn> <!--TODO: Suppressing warning in shared source-->
1111
<IncludeOperationsSharedSource>true</IncludeOperationsSharedSource>
12+
<ApiCompatBaselineTargetFramework Condition="'$(TargetFramework)' == 'net462'">net461</ApiCompatBaselineTargetFramework>
1213
</PropertyGroup>
1314

1415
<!-- Shared source from Azure.Core -->

sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.net8.0.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,12 +1037,10 @@ public static partial class ServiceBusClientBuilderExtensions
10371037
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClient, Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions> AddServiceBusAdministrationClientWithNamespace<TBuilder>(this TBuilder builder, string fullyQualifiedNamespace) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
10381038
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClient, Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions> AddServiceBusAdministrationClient<TBuilder>(this TBuilder builder, string connectionString) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilder { throw null; }
10391039
[System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute("Binding strongly typed objects to configuration values requires generating dynamic code at runtime, for example instantiating generic types. Use the Configuration Binder Source Generator (EnableConfigurationBindingGenerator=true) instead.")]
1040-
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("Binding strongly typed objects to configuration values is not supported with trimming. Use the Configuration Binder Source Generator (EnableConfigurationBindingGenerator=true) instead.")]
10411040
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClient, Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions> AddServiceBusAdministrationClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
10421041
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.ServiceBusClient, Azure.Messaging.ServiceBus.ServiceBusClientOptions> AddServiceBusClientWithNamespace<TBuilder>(this TBuilder builder, string fullyQualifiedNamespace) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
10431042
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.ServiceBusClient, Azure.Messaging.ServiceBus.ServiceBusClientOptions> AddServiceBusClient<TBuilder>(this TBuilder builder, string connectionString) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilder { throw null; }
10441043
[System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute("Binding strongly typed objects to configuration values requires generating dynamic code at runtime, for example instantiating generic types. Use the Configuration Binder Source Generator (EnableConfigurationBindingGenerator=true) instead.")]
1045-
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("Binding strongly typed objects to configuration values is not supported with trimming. Use the Configuration Binder Source Generator (EnableConfigurationBindingGenerator=true) instead.")]
10461044
public static Azure.Core.Extensions.IAzureClientBuilder<Azure.Messaging.ServiceBus.ServiceBusClient, Azure.Messaging.ServiceBus.ServiceBusClientOptions> AddServiceBusClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
10471045
}
10481046
}

sdk/servicebus/Azure.Messaging.ServiceBus/stress/src/Azure.Messaging.ServiceBus.Stress.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="System.Memory.Data" />
1110
<PackageReference Include="Azure.Storage.Blobs" />
1211
<PackageReference Include="Microsoft.ApplicationInsights" />
1312
<PackageReference Include="CommandLineParser" />

sdk/servicebus/Azure.Messaging.ServiceBus/tests/Azure.Messaging.ServiceBus.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<PackageReference Include="Moq" />
2727
<PackageReference Include="Polly" />
2828
<PackageReference Include="System.Threading.Tasks.Extensions" />
29-
<PackageReference Include="System.Memory.Data" />
3029
<PackageReference Include="Azure.Storage.Blobs" />
3130
</ItemGroup>
3231

sdk/webpubsub/Microsoft.Azure.Functions.Worker.Extensions.WebPubSub/src/Models/Output/SendToAllAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public sealed class SendToAllAction : WebPubSubAction
1515
/// <summary>
1616
/// Message to broadcast.
1717
/// </summary>
18-
[JsonConverter(typeof(BinaryDataJsonConverter))]
18+
[JsonConverter(typeof(System.BinaryDataJsonConverter))]
1919
public BinaryData Data { get; set; }
2020

2121
/// <summary>

sdk/webpubsub/Microsoft.Azure.Functions.Worker.Extensions.WebPubSub/src/Models/Output/SendToConnectionAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class SendToConnectionAction : WebPubSubAction
1919
/// <summary>
2020
/// Message to send.
2121
/// </summary>
22-
[JsonConverter(typeof(BinaryDataJsonConverter))]
22+
[JsonConverter(typeof(System.BinaryDataJsonConverter))]
2323
public BinaryData Data { get; set; }
2424

2525
/// <summary>

0 commit comments

Comments
 (0)