diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8eb65955..5246e8916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 2.5.2
+
+## Fixes
+
+- Fix CSFLE (client-side field-level encryption) to use the Google Tink format for DEKs for interoperability with clients in other languages (Java, go, etc.).
+- Improve error when specifying an invalid KMS type for CSFLE
+- Enhance CSFLE examples with KMS configuration settings
+
+
# 2.5.1
## Fixes
diff --git a/README.md b/README.md
index 8658f9fca..264fb4da5 100644
--- a/README.md
+++ b/README.md
@@ -49,13 +49,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide the following packa
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.5.1
+Install-Package Confluent.Kafka -Version 2.5.2
```
To add a reference to a dotnet core project, execute the following at the command line:
```
-dotnet add package -v 2.5.1 Confluent.Kafka
+dotnet add package -v 2.5.2 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.
diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj
index c8a20b778..1ab8cbe30 100755
--- a/examples/AdminClient/AdminClient.csproj
+++ b/examples/AdminClient/AdminClient.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj
index fae1c4fb8..afb8b5119 100644
--- a/examples/AvroBlogExamples/AvroBlogExamples.csproj
+++ b/examples/AvroBlogExamples/AvroBlogExamples.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj
index d9c95f1bc..fda8d39a2 100644
--- a/examples/AvroGeneric/AvroGeneric.csproj
+++ b/examples/AvroGeneric/AvroGeneric.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj
index a8c68a47e..3c7ad785f 100644
--- a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj
+++ b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/AvroGenericMigration/AvroGenericMigration.csproj b/examples/AvroGenericMigration/AvroGenericMigration.csproj
index c023c3c81..14777c5f7 100644
--- a/examples/AvroGenericMigration/AvroGenericMigration.csproj
+++ b/examples/AvroGenericMigration/AvroGenericMigration.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj
index 9ba1dce10..bd5e4fefc 100644
--- a/examples/AvroSpecific/AvroSpecific.csproj
+++ b/examples/AvroSpecific/AvroSpecific.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj
index e6861125a..711441b1b 100644
--- a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj
+++ b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/Configuration/Configuration.csproj b/examples/Configuration/Configuration.csproj
index 6424cbcd8..f7ae78a9b 100644
--- a/examples/Configuration/Configuration.csproj
+++ b/examples/Configuration/Configuration.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj
index 6f8837210..64592ca60 100644
--- a/examples/ConfluentCloud/ConfluentCloud.csproj
+++ b/examples/ConfluentCloud/ConfluentCloud.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj
index 4538c9116..4c07abe37 100755
--- a/examples/Consumer/Consumer.csproj
+++ b/examples/Consumer/Consumer.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/examples/ExactlyOnce/ExactlyOnce.csproj b/examples/ExactlyOnce/ExactlyOnce.csproj
index e3699d5f8..62cdc7c8a 100644
--- a/examples/ExactlyOnce/ExactlyOnce.csproj
+++ b/examples/ExactlyOnce/ExactlyOnce.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj
index 872bb397f..985574ddb 100644
--- a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj
+++ b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/JsonEncryption/JsonSerializationEncryption.csproj b/examples/JsonEncryption/JsonSerializationEncryption.csproj
index 38f2f0d38..f775400ec 100644
--- a/examples/JsonEncryption/JsonSerializationEncryption.csproj
+++ b/examples/JsonEncryption/JsonSerializationEncryption.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/JsonSerialization/JsonSerialization.csproj b/examples/JsonSerialization/JsonSerialization.csproj
index df9600bb3..2ad2f81fb 100644
--- a/examples/JsonSerialization/JsonSerialization.csproj
+++ b/examples/JsonSerialization/JsonSerialization.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/JsonWithReferences/JsonWithReferences.csproj b/examples/JsonWithReferences/JsonWithReferences.csproj
index 6affebec6..5d791b989 100644
--- a/examples/JsonWithReferences/JsonWithReferences.csproj
+++ b/examples/JsonWithReferences/JsonWithReferences.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/MultiProducer/MultiProducer.csproj b/examples/MultiProducer/MultiProducer.csproj
index 4f2d492a0..5f9138fd3 100644
--- a/examples/MultiProducer/MultiProducer.csproj
+++ b/examples/MultiProducer/MultiProducer.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/examples/OAuthConsumer/OAuthConsumer.csproj b/examples/OAuthConsumer/OAuthConsumer.csproj
index 72f8d9944..3a5207ad9 100644
--- a/examples/OAuthConsumer/OAuthConsumer.csproj
+++ b/examples/OAuthConsumer/OAuthConsumer.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/OAuthOIDC/OAuthOIDC.csproj b/examples/OAuthOIDC/OAuthOIDC.csproj
index 006af21b5..b4717bf01 100644
--- a/examples/OAuthOIDC/OAuthOIDC.csproj
+++ b/examples/OAuthOIDC/OAuthOIDC.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/OAuthProducer/OAuthProducer.csproj b/examples/OAuthProducer/OAuthProducer.csproj
index d853dd004..a49ad7584 100644
--- a/examples/OAuthProducer/OAuthProducer.csproj
+++ b/examples/OAuthProducer/OAuthProducer.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj
index a838e3991..bde06d845 100755
--- a/examples/Producer/Producer.csproj
+++ b/examples/Producer/Producer.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj
index cddb729af..d1f982af4 100644
--- a/examples/Protobuf/Protobuf.csproj
+++ b/examples/Protobuf/Protobuf.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/ProtobufEncryption/ProtobufEncryption.csproj b/examples/ProtobufEncryption/ProtobufEncryption.csproj
index 231b68f44..dcc25786a 100644
--- a/examples/ProtobufEncryption/ProtobufEncryption.csproj
+++ b/examples/ProtobufEncryption/ProtobufEncryption.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/TlsAuth/TlsAuth.csproj b/examples/TlsAuth/TlsAuth.csproj
index 5ff6e38b2..210def9bb 100644
--- a/examples/TlsAuth/TlsAuth.csproj
+++ b/examples/TlsAuth/TlsAuth.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/examples/Web/Web.csproj b/examples/Web/Web.csproj
index 4f873736f..1d3df59ba 100644
--- a/examples/Web/Web.csproj
+++ b/examples/Web/Web.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj
index 9954037e2..3265a86b3 100644
--- a/src/Confluent.Kafka/Confluent.Kafka.csproj
+++ b/src/Confluent.Kafka/Confluent.Kafka.csproj
@@ -16,7 +16,7 @@
README.md
Confluent.Kafka
Confluent.Kafka
- 2.5.1
+ 2.5.2
netstandard2.0;netstandard1.3;net462;net6.0
true
true
@@ -48,4 +48,4 @@
-
\ No newline at end of file
+
diff --git a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj
index 2c5ec232b..39194db47 100644
--- a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj
+++ b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Encryption.Aws
Confluent.SchemaRegistry.Encryption.Aws
Confluent.SchemaRegistry.Encryption.Aws
- 2.5.1
+ 2.5.2
netcoreapp3.1;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj
index 30dc7d50e..4f90ed37c 100644
--- a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj
+++ b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Encryption.Azure
Confluent.SchemaRegistry.Encryption.Azure
Confluent.SchemaRegistry.Encryption.Azure
- 2.5.1
+ 2.5.2
netcoreapp3.1;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj
index 4846f5466..8c292b76a 100644
--- a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj
+++ b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Encryption.Gcp
Confluent.SchemaRegistry.Encryption.Gcp
Confluent.SchemaRegistry.Encryption.Gcp
- 2.5.1
+ 2.5.2
netcoreapp3.1;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj
index 73e068f5f..b625bd6ab 100644
--- a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj
+++ b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Encryption.HcVault
Confluent.SchemaRegistry.Encryption.HcVault
Confluent.SchemaRegistry.Encryption.HcVault
- 2.5.1
+ 2.5.2
netcoreapp3.1;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj
index 8378f67f5..b5de70393 100644
--- a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj
+++ b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Encryption
Confluent.SchemaRegistry.Encryption
Confluent.SchemaRegistry.Encryption
- 2.5.1
+ 2.5.2
netcoreapp3.1;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj
index 68413da8f..247fd1e03 100644
--- a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj
+++ b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Rules
Confluent.SchemaRegistry.Rules
Confluent.SchemaRegistry.Rules
- 2.5.1
+ 2.5.2
net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj
index 8b3c3d3b4..75159e3fc 100644
--- a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj
+++ b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Serdes.Avro
Confluent.SchemaRegistry.Serdes.Avro
Confluent.SchemaRegistry.Serdes.Avro
- 2.5.1
+ 2.5.2
netstandard2.0;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj
index b538a1a3f..cea07e58e 100644
--- a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj
+++ b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj
@@ -15,7 +15,7 @@
Confluent.SchemaRegistry.Serdes.Json
Confluent.SchemaRegistry.Serdes.Json
Confluent.SchemaRegistry.Serdes.Json
- 2.5.1
+ 2.5.2
netstandard2.0;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj
index 1aca36244..1d5933ccd 100644
--- a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj
+++ b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj
@@ -16,7 +16,7 @@
Confluent.SchemaRegistry.Serdes.Protobuf
Confluent.SchemaRegistry.Serdes.Protobuf
Confluent.SchemaRegistry.Serdes.Protobuf
- 2.5.1
+ 2.5.2
netstandard2.0;net6.0
true
true
diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
index 25b13be94..bbdcc0381 100644
--- a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
+++ b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
@@ -16,7 +16,7 @@
Confluent.SchemaRegistry
Confluent.SchemaRegistry
Confluent.SchemaRegistry
- 2.5.1
+ 2.5.2
netstandard2.0;net6.0
true
true