Skip to content

Commit 6f02eed

Browse files
smbeckersmbecker
committed
Update dependencies
1 parent 0642069 commit 6f02eed

File tree

16 files changed

+49
-47
lines changed

16 files changed

+49
-47
lines changed

‎Directory.Packages.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="DotPulsar" Version="5.0.0" />
7-
<PackageVersion Include="Google.Protobuf" Version="3.33.0" />
8-
<PackageVersion Include="Grpc.Tools" Version="2.76.0" />
9-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
10-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
11-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.10" />
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
13-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
14-
<PackageVersion Include="MinVer" Version="6.0.0" PrivateAssets="all" />
15-
<PackageVersion Include="OpenTelemetry.Api" Version="1.13.1" />
16-
<PackageVersion Include="Polly" Version="8.6.4" />
6+
<PackageVersion Include="DotPulsar" Version="5.2.2" />
7+
<PackageVersion Include="Google.Protobuf" Version="3.34.0" />
8+
<PackageVersion Include="Grpc.Tools" Version="2.78.0" />
9+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
10+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
11+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.3" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
13+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="all" />
14+
<PackageVersion Include="MinVer" Version="7.0.0" PrivateAssets="all" />
15+
<PackageVersion Include="OpenTelemetry.Api" Version="1.15.0" />
16+
<PackageVersion Include="Polly" Version="8.6.6" />
1717
<PackageVersion Include="protobuf-net" Version="3.2.56" />
18-
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
19-
<PackageVersion Include="Testcontainers.Pulsar" Version="4.8.1" />
18+
<PackageVersion Include="System.Text.Json" Version="10.0.3" />
19+
<PackageVersion Include="Testcontainers.Pulsar" Version="4.10.0" />
2020
<PackageVersion Include="Ulid" Version="1.4.1" />
2121
<PackageVersion Include="xunit" Version="2.9.3" />
2222
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5">

‎src/DotPulsar.Extensions.DependencyInjection/DotPulsar.Extensions.DependencyInjection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>DotPulsar</RootNamespace>
55
<PackageTags>$(PackageTags);Pulsar</PackageTags>
66
<Description>DotPulsar.Extensions.DependencyInjection adds support for using DotPulsar with the Microsoft.Extensions.DependencyInjection APIs.</Description>
7-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<LangVersion>latest</LangVersion>

‎src/DotPulsar.Extensions.OpenTelemetry/DotPulsar.Extensions.OpenTelemetry.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>DotPulsar</RootNamespace>
55
<PackageTags>$(PackageTags);Pulsar</PackageTags>
66
<Description>DotPulsar.OpenTelemetry integrates DotPulsar with OpenTelemetry APIs.</Description>
7-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<LangVersion>latest</LangVersion>

‎src/DotPulsar.Extensions.Resiliency/DotPulsar.Extensions.Resiliency.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>DotPulsar</RootNamespace>
55
<PackageTags>$(PackageTags);Pulsar</PackageTags>
66
<Description>DotPulsar.Extensions.Resiliency adds resiliency extensions working with Pulsar.</Description>
7-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<LangVersion>latest</LangVersion>

‎src/DotPulsar.Extensions.Schemas/DotPulsar.Extensions.Schemas.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>DotPulsar</RootNamespace>
55
<PackageTags>$(PackageTags);Pulsar</PackageTags>
66
<Description>DotPulsar.Extensions.Schemas adds support for using Json and ProtoBuf producers, consumers, and receivers.</Description>
7-
<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<LangVersion>latest</LangVersion>
@@ -17,12 +17,12 @@
1717
<PackageReference Include="DotPulsar" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
21-
<PackageReference Include="System.Text.Json" />
22-
</ItemGroup>
23-
2420
<ItemGroup>
2521
<None Include="README.md" Pack="true" PackagePath="" />
2622
</ItemGroup>
2723

24+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
25+
<PackageReference Include="System.Text.Json" />
26+
</ItemGroup>
27+
2828
</Project>

‎src/DotPulsar.Extensions.Schemas/Extensions/PulsarSchemaExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static IProducerBuilder<TMessage> NewProtoBufProducer<TMessage>(this IPul
1616

1717
public static IProducerBuilder<TMessage> NewProtoBufProducer<TMessage>(this IPulsarClient client, MessageParser<TMessage> parser)
1818
where TMessage : Google.Protobuf.IMessage<TMessage> {
19-
return client.NewProducer(new ProtoBufSchema<TMessage>(parser));
19+
return client.NewProducer(new TypedProtobufSchema<TMessage>(parser));
2020
}
2121

2222
#if NET8_0_OR_GREATER
@@ -28,7 +28,7 @@ public static IConsumerBuilder<TMessage> NewProtoBufConsumer<TMessage>(this IPul
2828

2929
public static IConsumerBuilder<TMessage> NewProtoBufConsumer<TMessage>(this IPulsarClient client, MessageParser<TMessage> parser)
3030
where TMessage : Google.Protobuf.IMessage<TMessage> {
31-
return client.NewConsumer(new ProtoBufSchema<TMessage>(parser));
31+
return client.NewConsumer(new TypedProtobufSchema<TMessage>(parser));
3232
}
3333

3434
#if NET8_0_OR_GREATER
@@ -40,7 +40,7 @@ public static IReaderBuilder<TMessage> NewProtoBufReader<TMessage>(this IPulsarC
4040

4141
public static IReaderBuilder<TMessage> NewProtoBufReader<TMessage>(this IPulsarClient client, MessageParser<TMessage> parser)
4242
where TMessage : Google.Protobuf.IMessage<TMessage> {
43-
return client.NewReader(new ProtoBufSchema<TMessage>(parser));
43+
return client.NewReader(new TypedProtobufSchema<TMessage>(parser));
4444
}
4545

4646
public static IProducerBuilder<TMessage> NewJsonProducer<TMessage>(this IPulsarClient client, JsonSerializerOptions? serializerOptions = null) {

‎src/DotPulsar.Extensions.Schemas/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ dotnet add package DotPulsar.Extensions.Schemas
1515

1616
## Usage
1717

18-
A JSON schema can be created using `JsonSchema.Get<T>()`. This schema can be used to create a producer, consumer, or receiver.
18+
A JSON schema can be created using `TypedJsonSchema.Get<T>()`. This schema can be used to create a producer, consumer, or receiver.
1919

2020
```c#
21-
await using var producer = client.NewProducer(JsonSchema.Get<YourType>())
21+
await using var producer = client.NewProducer(TypedJsonSchema.Get<YourType>())
2222
.Topic("persistent://public/default/my-topic")
2323
.Create();
2424
```
2525

26-
Custom serialization options can be passed into the constructor `new JsonSchema<T>(options)` or by overriding the default options using `JsonSchema.DefaultSerializerOptions`.
26+
Custom serialization options can be passed into the constructor `new TypedJsonSchema<T>(options)` or by overriding the default options using `TypedJsonSchema.DefaultSerializerOptions`.
2727

28-
The same can be done for ProtoBuf schemas using `ProtoBufSchema.Get<T>()`. Currently, only [protbuf-net](https://github.com/protobuf-net/protobuf-net) serializable types are supported.
28+
The same can be done for Protobuf schemas using `TypedProtobufSchema.Get<T>()`.
2929

3030
```c#
31-
await using var producer = client.NewProducer(ProtoBufSchema.Get<YourType>())
31+
await using var producer = client.NewProducer(TypedProtobufSchema.Get<YourType>())
3232
.Topic("persistent://public/default/my-topic")
3333
.Create();
3434
```
3535

36-
Both `JsonSchema` and `ProtoBufSchema` support passing a custom `ISchema<ReadOnlySequence<byte>>` schema. This allows for custom handling of the bytes that are sent and received. One potential use case would be to implement custom encryption or compression of the message bytes.
36+
Both `TypedJsonSchema` and `TypedProtobufSchema` support passing a custom `ISchema<ReadOnlySequence<byte>>` schema. This allows for custom handling of the bytes that are sent and received. One potential use case would be to implement custom encryption or compression of the message bytes.
3737

3838
## License
3939

src/DotPulsar.Extensions.Schemas/Schemas/JsonSchema.cs renamed to src/DotPulsar.Extensions.Schemas/Schemas/TypedJsonSchema.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public static JsonSerializerOptions? DefaultSerializerOptions {
1313

1414
public static ISchema<TMessage> Get<TMessage>(JsonSerializerOptions? serializerOptions = null) {
1515
if (serializerOptions is not null) {
16-
return new JsonSchema<TMessage>(serializerOptions);
16+
return new TypedJsonSchema<TMessage>(serializerOptions);
1717
}
18-
return JsonSchema<TMessage>.Instance;
18+
return TypedJsonSchema<TMessage>.Instance;
1919
}
2020
}
2121

@@ -24,21 +24,21 @@ public static ISchema<TMessage> Get<TMessage>(JsonSerializerOptions? serializerO
2424
/// </summary>
2525
/// <typeparam name="TMessage"></typeparam>
2626
/// <remarks>This still relies on the native String schema rather than leveraging the official Pulsar schema registry.</remarks>
27-
public sealed class JsonSchema<TMessage> : TypedSchema<TMessage>
27+
public sealed class TypedJsonSchema<TMessage> : TypedSchema<TMessage>
2828
{
2929

3030
private readonly JsonSerializerOptions? serializerOptions;
3131

32-
public JsonSchema(JsonSerializerOptions? serializerOptions = null) {
32+
public TypedJsonSchema(JsonSerializerOptions? serializerOptions = null) {
3333
this.serializerOptions = serializerOptions;
3434
}
3535

36-
public JsonSchema(ISchema<ReadOnlySequence<byte>> byteSchema, JsonSerializerOptions? serializerOptions = null)
36+
public TypedJsonSchema(ISchema<ReadOnlySequence<byte>> byteSchema, JsonSerializerOptions? serializerOptions = null)
3737
: base(byteSchema) {
3838
this.serializerOptions = serializerOptions;
3939
}
4040

41-
internal static JsonSchema<TMessage> Instance {
41+
internal static TypedJsonSchema<TMessage> Instance {
4242
get;
4343
} = new();
4444

src/DotPulsar.Extensions.Schemas/Schemas/ProtoBufSchema.cs renamed to src/DotPulsar.Extensions.Schemas/Schemas/TypedProtobufSchema.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static ISchema<TMessage> Get<TMessage>()
1515
private static class ProtoBufSchemaCache<TMessage>
1616
where TMessage : IMessageWithParser<TMessage>
1717
{
18-
internal static ProtoBufSchema<TMessage> Instance {
18+
internal static TypedProtobufSchema<TMessage> Instance {
1919
get;
2020
} = new(TMessage.Parser);
2121
}
@@ -27,15 +27,15 @@ internal static ProtoBufSchema<TMessage> Instance {
2727
/// </summary>
2828
/// <typeparam name="TMessage"></typeparam>
2929
/// <remarks>This still relies on the native Bytes schema rather than leveraging the official Pulsar schema registry.</remarks>
30-
public sealed class ProtoBufSchema<TMessage> : TypedSchema<TMessage>
30+
public sealed class TypedProtobufSchema<TMessage> : TypedSchema<TMessage>
3131
{
3232
private readonly MessageParser parser;
3333

34-
public ProtoBufSchema(MessageParser parser) {
34+
public TypedProtobufSchema(MessageParser parser) {
3535
this.parser = parser ?? throw new ArgumentNullException(nameof(parser));
3636
}
3737

38-
public ProtoBufSchema(MessageParser parser, ISchema<ReadOnlySequence<byte>> byteSchema)
38+
public TypedProtobufSchema(MessageParser parser, ISchema<ReadOnlySequence<byte>> byteSchema)
3939
: base(byteSchema) {
4040
this.parser = parser ?? throw new ArgumentNullException(nameof(parser));
4141
}

‎src/Ulid.Protobuf/Ulid.Protobuf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<RootNamespace>Google.Protobuf.WellKnownTypes</RootNamespace>
44
<PackageTags>$(PackageTags);Ulid;protobuf</PackageTags>
55
<Description>Adds support for Ulid fields within Google.ProtoBuf serializable types.</Description>
6-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
77
<LangVersion>latest</LangVersion>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)