diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj index 647c90b60..2ebdf5dc6 100755 --- a/examples/AdminClient/AdminClient.csproj +++ b/examples/AdminClient/AdminClient.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AdminClient - net6.0 + net9.0 Exe - 7.3 + latest diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj index bcf18fb58..654332945 100644 --- a/examples/AvroBlogExamples/AvroBlogExamples.csproj +++ b/examples/AvroBlogExamples/AvroBlogExamples.csproj @@ -3,8 +3,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj index c4efa5761..28deed0e0 100644 --- a/examples/AvroGeneric/AvroGeneric.csproj +++ b/examples/AvroGeneric/AvroGeneric.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGeneric Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj index f8a1ae598..73ca36222 100644 --- a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj +++ b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGenericEncryption Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/AvroGenericMigration/AvroGenericMigration.csproj b/examples/AvroGenericMigration/AvroGenericMigration.csproj index fe19ecb07..be6ff3d5c 100644 --- a/examples/AvroGenericMigration/AvroGenericMigration.csproj +++ b/examples/AvroGenericMigration/AvroGenericMigration.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGenericMigration Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj index 3eeca411d..bb7523119 100644 --- a/examples/AvroSpecific/AvroSpecific.csproj +++ b/examples/AvroSpecific/AvroSpecific.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroSpecific Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj index fd8e18c8c..98aadafad 100644 --- a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj +++ b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroSpecificEncryption Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj index 6c78072c0..700deb1fa 100644 --- a/examples/ConfluentCloud/ConfluentCloud.csproj +++ b/examples/ConfluentCloud/ConfluentCloud.csproj @@ -3,7 +3,7 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - net6.0 + net9.0 diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj index 0dadd0b75..d1523a71a 100755 --- a/examples/Consumer/Consumer.csproj +++ b/examples/Consumer/Consumer.csproj @@ -3,7 +3,7 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Consumer - net6.0 + net9.0 Exe diff --git a/examples/ExactlyOnce/ExactlyOnce.csproj b/examples/ExactlyOnce/ExactlyOnce.csproj index 187501106..806e1c8b2 100644 --- a/examples/ExactlyOnce/ExactlyOnce.csproj +++ b/examples/ExactlyOnce/ExactlyOnce.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ExactlyOnce - net6.0 + net9.0 Exe - 7.3 + latest diff --git a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj index 8aff2d71e..7fa040573 100644 --- a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj +++ b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ExactlyOnceOldBroker - net6.0 + net9.0 Exe - 7.3 + latest diff --git a/examples/JsonEncryption/JsonSerializationEncryption.csproj b/examples/JsonEncryption/JsonSerializationEncryption.csproj index 6aaae5c2e..f6c098b81 100644 --- a/examples/JsonEncryption/JsonSerializationEncryption.csproj +++ b/examples/JsonEncryption/JsonSerializationEncryption.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonSerializationEncryption Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/JsonSerialization/JsonSerialization.csproj b/examples/JsonSerialization/JsonSerialization.csproj index 6b910ae8d..4c63f0ad1 100644 --- a/examples/JsonSerialization/JsonSerialization.csproj +++ b/examples/JsonSerialization/JsonSerialization.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonSerialization Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/JsonWithReferences/JsonWithReferences.csproj b/examples/JsonWithReferences/JsonWithReferences.csproj index 6863351e4..94df11c5c 100644 --- a/examples/JsonWithReferences/JsonWithReferences.csproj +++ b/examples/JsonWithReferences/JsonWithReferences.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonWithReferences Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/JsonWithReferences/Program.cs b/examples/JsonWithReferences/Program.cs index 1578aec39..da634a72a 100644 --- a/examples/JsonWithReferences/Program.cs +++ b/examples/JsonWithReferences/Program.cs @@ -22,7 +22,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using NJsonSchema.Generation; +#if NET8_0_OR_GREATER +using NJsonSchema.NewtonsoftJson.Generation; +using NewtonsoftJsonSchemaGeneratorSettings = NJsonSchema.NewtonsoftJson.Generation.NewtonsoftJsonSchemaGeneratorSettings; +#else +using NewtonsoftJsonSchemaGeneratorSettings = NJsonSchema.Generation.JsonSchemaGeneratorSettings; +#endif using Newtonsoft.Json; using Newtonsoft.Json.Serialization; @@ -150,7 +155,7 @@ static async Task Main(string[] args) // from default one to camelCase. // It's also possible to add JsonProperty attributes to customize // serialization mapping and all available NJson attributes. - var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings + var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings { SerializerSettings = new JsonSerializerSettings { diff --git a/examples/OAuthConsumer/OAuthConsumer.csproj b/examples/OAuthConsumer/OAuthConsumer.csproj index e36ae72da..82e531f70 100644 --- a/examples/OAuthConsumer/OAuthConsumer.csproj +++ b/examples/OAuthConsumer/OAuthConsumer.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} OAuthConsumer - net6.0 + net9.0 Exe - 7.1 + latest diff --git a/examples/OAuthOIDC/OAuthOIDC.csproj b/examples/OAuthOIDC/OAuthOIDC.csproj index 1f2944766..0a9d741bd 100644 --- a/examples/OAuthOIDC/OAuthOIDC.csproj +++ b/examples/OAuthOIDC/OAuthOIDC.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} OAuthOIDC - net6.0 + net9.0 Exe - 7.1 + latest diff --git a/examples/OAuthProducer/OAuthProducer.csproj b/examples/OAuthProducer/OAuthProducer.csproj index 1d868143c..cb1a5e846 100644 --- a/examples/OAuthProducer/OAuthProducer.csproj +++ b/examples/OAuthProducer/OAuthProducer.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} OAuthProducer - net6.0 + net9.0 Exe - 7.1 + latest diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj index b2973e428..0d51653e5 100755 --- a/examples/Producer/Producer.csproj +++ b/examples/Producer/Producer.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Producer - net6.0 + net9.0 Exe - 7.1 + latest diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj index 233d617c7..b80f2b8aa 100644 --- a/examples/Protobuf/Protobuf.csproj +++ b/examples/Protobuf/Protobuf.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Protobuf Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/examples/ProtobufEncryption/ProtobufEncryption.csproj b/examples/ProtobufEncryption/ProtobufEncryption.csproj index 0290ba1e8..51bdeb73c 100644 --- a/examples/ProtobufEncryption/ProtobufEncryption.csproj +++ b/examples/ProtobufEncryption/ProtobufEncryption.csproj @@ -4,8 +4,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ProtobufEncryption Exe - net6.0 - 7.1 + net9.0 + latest diff --git a/src/ConfigGen/ConfigGen.csproj b/src/ConfigGen/ConfigGen.csproj index 60d41ee8e..3534a5814 100644 --- a/src/ConfigGen/ConfigGen.csproj +++ b/src/ConfigGen/ConfigGen.csproj @@ -2,8 +2,8 @@ Exe - net6.0;net8.0 - 7.1 + net8.0;net9.0 + latest 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 db6eb7c8f..55099c16b 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj @@ -23,10 +23,10 @@ Confluent.SchemaRegistry.Serdes.Json.snk - + - + diff --git a/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj b/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj index 179c5ced7..6e67cca91 100755 --- a/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj +++ b/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj @@ -3,7 +3,7 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Confluent.Kafka.Benchmark - net6.0;net8.0 + net8.0;net9.0 Exe diff --git a/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj b/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj index 7b344897e..83109055e 100644 --- a/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj +++ b/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj @@ -4,7 +4,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.Kafka.IntegrationTests - net6.0;net8.0 + net8.0;net9.0 true diff --git a/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj b/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj index 666d56bad..4834dbdac 100644 --- a/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj +++ b/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net8.0 + net8.0;net9.0 diff --git a/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj b/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj index 9d2764295..04d09d259 100644 --- a/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj +++ b/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0 + net8.0;net9.0 diff --git a/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj b/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj index 6224ec4fa..b98f93b4f 100644 --- a/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj +++ b/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj @@ -2,8 +2,8 @@ Exe - net6.0;net8.0 - 7.3 + net8.0;net9.0 + latest diff --git a/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj b/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj index 7facec972..76418fa29 100755 --- a/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj +++ b/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj @@ -4,7 +4,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.Kafka.UnitTests - net6.0;net8.0 + net8.0;net9.0 true true Confluent.Kafka.UnitTests.snk diff --git a/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj b/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj index daa1d4d41..926ada48f 100755 --- a/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj +++ b/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj @@ -3,7 +3,7 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Confluent.Kafka.VerifiableClient - net6.0;net8.0 + net8.0;net9.0 Exe win-x64;linux-x64;osx-x64 diff --git a/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj b/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj index 5db14e91a..618439892 100755 --- a/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj +++ b/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj @@ -4,7 +4,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.IntegrationTests - net6.0;net8.0 + net8.0;net9.0 diff --git a/test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Confluent.SchemaRegistry.Serdes.IntegrationTests.csproj b/test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Confluent.SchemaRegistry.Serdes.IntegrationTests.csproj index f979c8b7e..a9f40a245 100644 --- a/test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Confluent.SchemaRegistry.Serdes.IntegrationTests.csproj +++ b/test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Confluent.SchemaRegistry.Serdes.IntegrationTests.csproj @@ -4,7 +4,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.Serdes.IntegrationTests - net6.0;net8.0 + net8.0;net9.0 diff --git a/test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj b/test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj index 1a3ff5833..4e6cf73ec 100644 --- a/test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj +++ b/test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj @@ -4,7 +4,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.Serdes.UnitTests - net6.0;net8.0 + net8.0;net9.0 true true ..\..\src\Confluent.SchemaRegistry.Serdes.Protobuf\Confluent.SchemaRegistry.Serdes.Protobuf.snk diff --git a/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj b/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj index 9d3bd6789..ac65f0896 100644 --- a/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj +++ b/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj @@ -2,7 +2,7 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - net6.0;net8.0 + net8.0;net9.0 true Confluent.SchemaRegistry.UnitTests.snk