Skip to content

Commit

Permalink
2.2.0 Release (#2082)
Browse files Browse the repository at this point in the history
* 2.2.0 Release

* Address comments

* Fix config values

* Fix config
  • Loading branch information
anchitj authored Jul 12, 2023
1 parent a71043f commit 19d4fa1
Show file tree
Hide file tree
Showing 25 changed files with 35 additions and 31 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide five packages:
To install Confluent.Kafka from within Visual Studio, search for Confluent.Kafka in the NuGet Package Manager UI, or run the following command in the Package Manager Console:

```
Install-Package Confluent.Kafka -Version 2.1.1
Install-Package Confluent.Kafka -Version 2.2.0
```

To add a reference to a dotnet core project, execute the following at the command line:

```
dotnet add package -v 2.1.1 Confluent.Kafka
dotnet add package -v 2.2.0 Confluent.Kafka
```

Note: `Confluent.Kafka` depends on the `librdkafka.redist` package which provides a number of different builds of `librdkafka` that are compatible with [common platforms](https://github.com/edenhill/librdkafka/wiki/librdkafka.redist-NuGet-package-runtime-libraries). If you are on one of these platforms this will all work seamlessly (and you don't need to explicitly reference `librdkafka.redist`). If you are on a different platform, you may need to [build librdkafka](https://github.com/edenhill/librdkafka#building) manually (or acquire it via other means) and load it using the [Library.Load](https://docs.confluent.io/current/clients/confluent-kafka-dotnet/api/Confluent.Kafka.Library.html#Confluent_Kafka_Library_Load_System_String_) method.
Expand Down
2 changes: 1 addition & 1 deletion examples/AdminClient/AdminClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroBlogExamples/AvroBlogExamples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroGeneric/AvroGeneric.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroSpecific/AvroSpecific.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Configuration/Configuration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion examples/ConfluentCloud/ConfluentCloud.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Consumer/Consumer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/ExactlyOnce/ExactlyOnce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
<PackageReference Include="Microsoft.FASTER.Core" Version="1.8.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
<PackageReference Include="RocksDbSharp" Version="6.2.2" />
<PackageReference Include="RocksDbNative" Version="6.2.2" />
Expand Down
2 changes: 1 addition & 1 deletion examples/JsonSerialization/JsonSerialization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/OAuthConsumer/OAuthConsumer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/OAuthOIDC/OAuthOIDC.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/OAuthProducer/OAuthProducer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Producer/Producer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Protobuf/Protobuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Protobuf" Version="2.2.0-RC2" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Protobuf" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/TlsAuth/TlsAuth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.1.1" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.2.0" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion src/ConfigGen/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ static string ConfigNameToDotnetName(string configName)
{ "roundrobin", "RoundRobin" },
{ "cooperative-sticky", "CooperativeSticky"},
{ "read_uncommitted", "ReadUncommitted" },
{ "read_committed", "ReadCommitted" }
{ "read_committed", "ReadCommitted" },
{ "use_all_dns_ips", "UseAllDnsIps"},
{ "resolve_canonical_bootstrap_servers_only", "ResolveCanonicalBootstrapServersOnly"}
};

static string EnumNameToDotnetName(string enumName)
Expand Down
4 changes: 3 additions & 1 deletion src/Confluent.Kafka/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public class Config : IEnumerable<KeyValuePair<string, string>>
{ "murmur2random", "murmur2_random" },
{ "readcommitted", "read_committed" },
{ "readuncommitted", "read_uncommitted" },
{ "cooperativesticky", "cooperative-sticky" }
{ "cooperativesticky", "cooperative-sticky" },
{ "usealldnsips", "use_all_dns_ips"},
{ "resolvecanonicalbootstrapserversonly", "resolve_canonical_bootstrap_servers_only"}
};

/// <summary>
Expand Down
10 changes: 5 additions & 5 deletions src/Confluent.Kafka/Config_gen.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// *** Auto-generated from librdkafka v2.2.0-RC2 *** - do not modify manually.
// *** Auto-generated from librdkafka v2.2.0 *** - do not modify manually.
//
// Copyright 2018-2022 Confluent Inc.
//
Expand Down Expand Up @@ -229,14 +229,14 @@ public enum CompressionType
public enum ClientDnsLookup
{
/// <summary>
/// Use_all_dns_ips
/// UseAllDnsIps
/// </summary>
Use_all_dns_ips,
UseAllDnsIps,

/// <summary>
/// Resolve_canonical_bootstrap_servers_only
/// ResolveCanonicalBootstrapServersOnly
/// </summary>
Resolve_canonical_bootstrap_servers_only
ResolveCanonicalBootstrapServersOnly
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/Confluent.Kafka/Confluent.Kafka.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageId>Confluent.Kafka</PackageId>
<Title>Confluent.Kafka</Title>
<AssemblyName>Confluent.Kafka</AssemblyName>
<VersionPrefix>2.2.0-RC2</VersionPrefix>
<VersionPrefix>2.2.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard1.3;net462;net6.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="librdkafka.redist" Version="2.2.0-RC2">
<PackageReference Include="librdkafka.redist" Version="2.2.0">
<PrivateAssets Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.5.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Avro</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Avro</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Avro</AssemblyName>
<VersionPrefix>2.2.0-RC2</VersionPrefix>
<VersionPrefix>2.2.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Json</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Json</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Json</AssemblyName>
<VersionPrefix>2.2.0-RC2</VersionPrefix>
<VersionPrefix>2.2.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Protobuf</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Protobuf</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Protobuf</AssemblyName>
<VersionPrefix>2.2.0-RC2</VersionPrefix>
<VersionPrefix>2.2.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry</PackageId>
<Title>Confluent.SchemaRegistry</Title>
<AssemblyName>Confluent.SchemaRegistry</AssemblyName>
<VersionPrefix>2.2.0-RC2</VersionPrefix>
<VersionPrefix>2.2.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard1.4</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down

0 comments on commit 19d4fa1

Please sign in to comment.