From df631b8af51423b262dabe07f0470ef39af33970 Mon Sep 17 00:00:00 2001 From: Havret Date: Sat, 3 May 2025 09:55:27 +0200 Subject: [PATCH 1/3] Unify build configurations and remove redundant properties Centralize target framework and version configurations into shared `Directory.build.props` files. Remove duplicate or unnecessary properties (e.g., `TargetFramework`, `LangVersion`, `OutputType`) across project files to simplify maintenance. # Conflicts: # Confluent.Kafka.sln # src/Confluent.Kafka/Confluent.Kafka.csproj # src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj # src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj # src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj # src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj # src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj # src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj # src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj # src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj # src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj # src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj # Conflicts: # examples/AdminClient/AdminClient.csproj # examples/AvroBlogExamples/AvroBlogExamples.csproj # examples/AvroGeneric/AvroGeneric.csproj # examples/AvroGenericEncryption/AvroGenericEncryption.csproj # examples/AvroGenericMigration/AvroGenericMigration.csproj # examples/AvroSpecific/AvroSpecific.csproj # examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj # examples/ConfluentCloud/ConfluentCloud.csproj # examples/Consumer/Consumer.csproj # examples/ExactlyOnce/ExactlyOnce.csproj # examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj # examples/JsonEncryption/JsonSerializationEncryption.csproj # examples/JsonSerialization/JsonSerialization.csproj # examples/JsonWithReferences/JsonWithReferences.csproj # examples/Producer/Producer.csproj # examples/Protobuf/Protobuf.csproj # examples/ProtobufEncryption/ProtobufEncryption.csproj # src/Confluent.Kafka/Confluent.Kafka.csproj # src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj # src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj # src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj # src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj # src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj # src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj # src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj # src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj # src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj # src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj --- .editorconfig | 12 +++++++++ Confluent.Kafka.sln | 25 +++++++++++++++++++ Directory.build.props | 6 ++--- examples/AdminClient/AdminClient.csproj | 3 --- .../AvroBlogExamples/AvroBlogExamples.csproj | 3 --- examples/AvroGeneric/AvroGeneric.csproj | 3 --- .../AvroGenericEncryption.csproj | 3 --- .../AvroGenericMigration.csproj | 3 --- examples/AvroSpecific/AvroSpecific.csproj | 3 --- .../AvroSpecificEncryption.csproj | 3 --- examples/ConfluentCloud/ConfluentCloud.csproj | 2 -- examples/Consumer/Consumer.csproj | 2 -- examples/Directory.build.props | 7 ++++++ examples/ExactlyOnce/ExactlyOnce.csproj | 3 --- .../ExactlyOnceOldBroker.csproj | 3 --- .../JsonSerializationEncryption.csproj | 3 --- .../JsonSerialization.csproj | 3 --- .../JsonWithReferences.csproj | 4 +-- examples/OAuthConsumer/OAuthConsumer.csproj | 1 - examples/OAuthOIDC/OAuthOIDC.csproj | 1 - examples/OAuthProducer/OAuthProducer.csproj | 1 - examples/Producer/Producer.csproj | 3 --- examples/Protobuf/Protobuf.csproj | 3 --- .../ProtobufEncryption.csproj | 3 --- examples/TlsAuth/TlsAuth.csproj | 1 - src/ConfigGen/ConfigGen.csproj | 1 - src/Confluent.Kafka/Confluent.Kafka.csproj | 2 -- ...luent.SchemaRegistry.Encryption.Aws.csproj | 2 -- ...ent.SchemaRegistry.Encryption.Azure.csproj | 2 -- ...luent.SchemaRegistry.Encryption.Gcp.csproj | 2 -- ...t.SchemaRegistry.Encryption.HcVault.csproj | 2 -- ...Confluent.SchemaRegistry.Encryption.csproj | 2 -- .../Confluent.SchemaRegistry.Rules.csproj | 2 -- ...onfluent.SchemaRegistry.Serdes.Avro.csproj | 2 -- ...onfluent.SchemaRegistry.Serdes.Json.csproj | 2 -- ...uent.SchemaRegistry.Serdes.Protobuf.csproj | 2 -- .../Confluent.SchemaRegistry.csproj | 2 -- src/Directory.build.props | 8 ++++++ .../Confluent.Kafka.Benchmark.csproj | 1 - .../Confluent.Kafka.IntegrationTests.csproj | 1 - .../Confluent.Kafka.SyncOverAsync.csproj | 1 - .../Confluent.Kafka.TestsCommon.csproj | 4 --- .../Confluent.Kafka.Transactions.csproj | 2 -- .../Confluent.Kafka.UnitTests.csproj | 1 - .../Confluent.Kafka.VerifiableClient.csproj | 1 - ...ent.SchemaRegistry.IntegrationTests.csproj | 1 - ...emaRegistry.Serdes.IntegrationTests.csproj | 1 - ...ent.SchemaRegistry.Serdes.UnitTests.csproj | 1 - .../Confluent.SchemaRegistry.UnitTests.csproj | 1 - test/Directory.build.props | 7 ++++++ 50 files changed, 64 insertions(+), 93 deletions(-) create mode 100644 .editorconfig create mode 100644 examples/Directory.build.props create mode 100644 src/Directory.build.props create mode 100644 test/Directory.build.props diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..65cffc093 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# editorconfig.org +# top-most EditorConfig file +root = true + +# Visual Studio XML project files +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 +charset = utf-8 + +# Visual Studio and .NET related XML config files +[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct,stylecop}] +indent_size = 2 \ No newline at end of file diff --git a/Confluent.Kafka.sln b/Confluent.Kafka.sln index aca5e25b8..d28090007 100644 --- a/Confluent.Kafka.sln +++ b/Confluent.Kafka.sln @@ -4,12 +4,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1EFCD839-0726-4BCE-B745-1E829991B1BC}" + ProjectSection(SolutionItems) = preProject + src\Directory.build.props = src\Directory.build.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka", "src\Confluent.Kafka\Confluent.Kafka.csproj", "{09C3255B-1972-4EB8-91D0-FB9F5CD82BCB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry", "src\Confluent.SchemaRegistry\Confluent.SchemaRegistry.csproj", "{AA671E3D-EB85-40A2-B183-8DA037286680}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{90058283-1F8F-465D-89E4-D4374A27E612}" + ProjectSection(SolutionItems) = preProject + test\Directory.build.props = test\Directory.build.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka.UnitTests", "test\Confluent.Kafka.UnitTests\Confluent.Kafka.UnitTests.csproj", "{BD6FCDB1-CC2E-4DE2-AB48-9CBD3F78E637}" EndProject @@ -28,6 +34,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry.IntegrationTests", "test\Confluent.SchemaRegistry.IntegrationTests\Confluent.SchemaRegistry.IntegrationTests.csproj", "{EC57E6D6-371F-4538-8C48-35C37CA2ED67}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9CE4B5F7-9251-4340-BACB-207066A5DBE8}" + ProjectSection(SolutionItems) = preProject + examples\Directory.build.props = examples\Directory.build.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdminClient", "examples\AdminClient\AdminClient.csproj", "{964449D5-3024-420E-9262-1913EC189D6A}" EndProject @@ -101,6 +110,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{B544BD src\Shared\SetEqualityComparer.cs = src\Shared\SetEqualityComparer.cs EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D5322057-682D-49F2-A2FB-68FA69187B28}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + Directory.Build.props = Directory.Build.props + .editorconfig = .editorconfig + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA928213-B366-4290-A4AA-E0FA094333FE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EDA3CED2-A80E-44F5-B5E4-79E38BC1376F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{A4A6EEAB-8053-4746-892F-683FC7C21622}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -673,6 +695,9 @@ Global {6988FB1F-3648-4E5E-821F-55D67CA00FD7} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8} {10CD6000-59A3-40C9-905F-20F4EE03C1B4} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8} {B544BD2C-F46D-4C68-8A31-3010E371E640} = {1EFCD839-0726-4BCE-B745-1E829991B1BC} + {BA928213-B366-4290-A4AA-E0FA094333FE} = {D5322057-682D-49F2-A2FB-68FA69187B28} + {EDA3CED2-A80E-44F5-B5E4-79E38BC1376F} = {D5322057-682D-49F2-A2FB-68FA69187B28} + {A4A6EEAB-8053-4746-892F-683FC7C21622} = {D5322057-682D-49F2-A2FB-68FA69187B28} {85ABD85A-53A2-4222-BE99-CE51F639F623} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8} {493C1E83-B424-488D-B6D6-713D07EF4152} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8} {E72DAB16-FAF7-4365-8151-9450007C93A0} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8} diff --git a/Directory.build.props b/Directory.build.props index ab6a6a0d1..d89307e1f 100644 --- a/Directory.build.props +++ b/Directory.build.props @@ -1,5 +1,5 @@ - - 10 - + + 13 + diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj index e57a3fdb7..e20534695 100755 --- a/examples/AdminClient/AdminClient.csproj +++ b/examples/AdminClient/AdminClient.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AdminClient - net8.0 - Exe - 7.3 diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj index 3e51ad4de..122db55da 100644 --- a/examples/AvroBlogExamples/AvroBlogExamples.csproj +++ b/examples/AvroBlogExamples/AvroBlogExamples.csproj @@ -2,9 +2,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - net8.0 - 7.1 diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj index 80646dae8..abe034882 100644 --- a/examples/AvroGeneric/AvroGeneric.csproj +++ b/examples/AvroGeneric/AvroGeneric.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGeneric - Exe - net8.0 - 7.1 diff --git a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj index 6a31da7da..d6ecf02c5 100644 --- a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj +++ b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGenericEncryption - Exe - net8.0 - 7.1 diff --git a/examples/AvroGenericMigration/AvroGenericMigration.csproj b/examples/AvroGenericMigration/AvroGenericMigration.csproj index 20eaf1186..2050fd072 100644 --- a/examples/AvroGenericMigration/AvroGenericMigration.csproj +++ b/examples/AvroGenericMigration/AvroGenericMigration.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroGenericMigration - Exe - net8.0 - 7.1 diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj index a3617c9dd..2f9e17eb8 100644 --- a/examples/AvroSpecific/AvroSpecific.csproj +++ b/examples/AvroSpecific/AvroSpecific.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroSpecific - Exe - net8.0 - 7.1 diff --git a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj index ccb89cc45..c4e6d9858 100644 --- a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj +++ b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} AvroSpecificEncryption - Exe - net8.0 - 7.1 diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj index d1ed9b473..78d1335c2 100644 --- a/examples/ConfluentCloud/ConfluentCloud.csproj +++ b/examples/ConfluentCloud/ConfluentCloud.csproj @@ -2,8 +2,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - net8.0 diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj index 1a8db7e0b..90a87ad09 100755 --- a/examples/Consumer/Consumer.csproj +++ b/examples/Consumer/Consumer.csproj @@ -3,8 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Consumer - net8.0 - Exe diff --git a/examples/Directory.build.props b/examples/Directory.build.props new file mode 100644 index 000000000..2dad20966 --- /dev/null +++ b/examples/Directory.build.props @@ -0,0 +1,7 @@ + + + net8.0 + Exe + + + diff --git a/examples/ExactlyOnce/ExactlyOnce.csproj b/examples/ExactlyOnce/ExactlyOnce.csproj index ab621534f..4a64664b8 100644 --- a/examples/ExactlyOnce/ExactlyOnce.csproj +++ b/examples/ExactlyOnce/ExactlyOnce.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ExactlyOnce - net8.0 - Exe - 7.3 diff --git a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj index 0269e983d..031e28889 100644 --- a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj +++ b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ExactlyOnceOldBroker - net8.0 - Exe - 7.3 diff --git a/examples/JsonEncryption/JsonSerializationEncryption.csproj b/examples/JsonEncryption/JsonSerializationEncryption.csproj index a2ada3609..0cbb319fb 100644 --- a/examples/JsonEncryption/JsonSerializationEncryption.csproj +++ b/examples/JsonEncryption/JsonSerializationEncryption.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonSerializationEncryption - Exe - net8.0 - 7.1 diff --git a/examples/JsonSerialization/JsonSerialization.csproj b/examples/JsonSerialization/JsonSerialization.csproj index 13a88dff0..e20954408 100644 --- a/examples/JsonSerialization/JsonSerialization.csproj +++ b/examples/JsonSerialization/JsonSerialization.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonSerialization - Exe - net8.0 - 7.1 diff --git a/examples/JsonWithReferences/JsonWithReferences.csproj b/examples/JsonWithReferences/JsonWithReferences.csproj index b5db63597..5e8a2f146 100644 --- a/examples/JsonWithReferences/JsonWithReferences.csproj +++ b/examples/JsonWithReferences/JsonWithReferences.csproj @@ -3,9 +3,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} JsonWithReferences - Exe + + net8.0 - 7.1 diff --git a/examples/OAuthConsumer/OAuthConsumer.csproj b/examples/OAuthConsumer/OAuthConsumer.csproj index 75e45888b..f2d5ece7c 100644 --- a/examples/OAuthConsumer/OAuthConsumer.csproj +++ b/examples/OAuthConsumer/OAuthConsumer.csproj @@ -5,7 +5,6 @@ OAuthConsumer net8.0 Exe - 7.1 diff --git a/examples/OAuthOIDC/OAuthOIDC.csproj b/examples/OAuthOIDC/OAuthOIDC.csproj index da28b5733..628d495d3 100644 --- a/examples/OAuthOIDC/OAuthOIDC.csproj +++ b/examples/OAuthOIDC/OAuthOIDC.csproj @@ -5,7 +5,6 @@ OAuthOIDC net8.0 Exe - 7.1 diff --git a/examples/OAuthProducer/OAuthProducer.csproj b/examples/OAuthProducer/OAuthProducer.csproj index 18e1d3794..a1d5210e9 100644 --- a/examples/OAuthProducer/OAuthProducer.csproj +++ b/examples/OAuthProducer/OAuthProducer.csproj @@ -5,7 +5,6 @@ OAuthProducer net8.0 Exe - 7.1 diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj index f095c65b8..7f48d5a61 100755 --- a/examples/Producer/Producer.csproj +++ b/examples/Producer/Producer.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Producer - net8.0 - Exe - 7.1 diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj index d0009fc1f..cdeb35bf1 100644 --- a/examples/Protobuf/Protobuf.csproj +++ b/examples/Protobuf/Protobuf.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Protobuf - Exe - net8.0 - 7.1 diff --git a/examples/ProtobufEncryption/ProtobufEncryption.csproj b/examples/ProtobufEncryption/ProtobufEncryption.csproj index 93e3fc9c1..1c98e5716 100644 --- a/examples/ProtobufEncryption/ProtobufEncryption.csproj +++ b/examples/ProtobufEncryption/ProtobufEncryption.csproj @@ -3,9 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ProtobufEncryption - Exe - net8.0 - 7.1 diff --git a/examples/TlsAuth/TlsAuth.csproj b/examples/TlsAuth/TlsAuth.csproj index ceac224c9..a3cfc1344 100644 --- a/examples/TlsAuth/TlsAuth.csproj +++ b/examples/TlsAuth/TlsAuth.csproj @@ -5,7 +5,6 @@ TlsAuth net8.0 Exe - 7.1 diff --git a/src/ConfigGen/ConfigGen.csproj b/src/ConfigGen/ConfigGen.csproj index 60d41ee8e..c1f02b63c 100644 --- a/src/ConfigGen/ConfigGen.csproj +++ b/src/ConfigGen/ConfigGen.csproj @@ -3,7 +3,6 @@ Exe net6.0;net8.0 - 7.1 diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj index dfe1d58d6..be61848b0 100644 --- a/src/Confluent.Kafka/Confluent.Kafka.csproj +++ b/src/Confluent.Kafka/Confluent.Kafka.csproj @@ -16,8 +16,6 @@ README.md Confluent.Kafka Confluent.Kafka - 2.11.1 - netstandard2.0;net462;net6.0;net8.0 true true true 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 1a44c4975..feb71dab2 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true 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 eac05f331..72fd38264 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true 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 bcd7cc4e1..befee91ac 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true 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 674d52844..6ae8f7d9a 100644 --- a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true true true diff --git a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj index 6225c03fe..f3c3b49c7 100644 --- a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj +++ b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true true true diff --git a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj index 4a077108c..30769399b 100644 --- a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj +++ b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules - 2.11.1 - netstandard2.1;net462;net6.0;net8.0 true 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 d6783b94d..29ae145bd 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro - 2.11.1 - netstandard2.0;net462;net6.0;net8.0 true 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 35e2ebb7c..97440effb 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj @@ -15,8 +15,6 @@ Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json - 2.11.1 - netstandard2.0;net462;net6.0;net8.0 true 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 072967223..05851008f 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj @@ -16,8 +16,6 @@ Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf - 2.11.1 - netstandard2.0;net462;net6.0;net8.0 true true true diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj index 00a3283e3..b3d513f88 100644 --- a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj +++ b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj @@ -16,8 +16,6 @@ Confluent.SchemaRegistry Confluent.SchemaRegistry Confluent.SchemaRegistry - 2.11.1 - netstandard2.0;net462;net6.0;net8.0 true true true diff --git a/src/Directory.build.props b/src/Directory.build.props new file mode 100644 index 000000000..4df4b98cf --- /dev/null +++ b/src/Directory.build.props @@ -0,0 +1,8 @@ + + + 2.10.0 + netstandard2.0;net6.0;net8.0 + + + + diff --git a/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj b/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj index 179c5ced7..2ab26d65d 100755 --- a/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj +++ b/test/Confluent.Kafka.Benchmark/Confluent.Kafka.Benchmark.csproj @@ -3,7 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Confluent.Kafka.Benchmark - net6.0;net8.0 Exe diff --git a/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj b/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj index 7b344897e..f1d31af73 100644 --- a/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj +++ b/test/Confluent.Kafka.IntegrationTests/Confluent.Kafka.IntegrationTests.csproj @@ -4,7 +4,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.Kafka.IntegrationTests - net6.0;net8.0 true diff --git a/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj b/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj index 666d56bad..ce92735c8 100644 --- a/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj +++ b/test/Confluent.Kafka.SyncOverAsync/Confluent.Kafka.SyncOverAsync.csproj @@ -2,7 +2,6 @@ Exe - net6.0;net8.0 diff --git a/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj b/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj index 9d2764295..2ffb65603 100644 --- a/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj +++ b/test/Confluent.Kafka.TestsCommon/Confluent.Kafka.TestsCommon.csproj @@ -1,8 +1,4 @@ - - net6.0;net8.0 - - diff --git a/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj b/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj index 6224ec4fa..99eaa8a90 100644 --- a/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj +++ b/test/Confluent.Kafka.Transactions/Confluent.Kafka.Transactions.csproj @@ -2,8 +2,6 @@ Exe - net6.0;net8.0 - 7.3 diff --git a/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj b/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj index 7facec972..308abea0b 100755 --- a/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj +++ b/test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj @@ -4,7 +4,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.Kafka.UnitTests - net6.0;net8.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..322848224 100755 --- a/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj +++ b/test/Confluent.Kafka.VerifiableClient/Confluent.Kafka.VerifiableClient.csproj @@ -3,7 +3,6 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Confluent.Kafka.VerifiableClient - net6.0;net8.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..5827d3ddb 100755 --- a/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj +++ b/test/Confluent.SchemaRegistry.IntegrationTests/Confluent.SchemaRegistry.IntegrationTests.csproj @@ -4,7 +4,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.IntegrationTests - net6.0;net8.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..afac1f7cd 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,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.Serdes.IntegrationTests - net6.0;net8.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..ebd0ba7ab 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,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest Confluent.SchemaRegistry.Serdes.UnitTests - net6.0;net8.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..f356b4deb 100644 --- a/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj +++ b/test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj @@ -2,7 +2,6 @@ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - net6.0;net8.0 true Confluent.SchemaRegistry.UnitTests.snk diff --git a/test/Directory.build.props b/test/Directory.build.props new file mode 100644 index 000000000..9874ab460 --- /dev/null +++ b/test/Directory.build.props @@ -0,0 +1,7 @@ + + + net6.0;net8.0 + + + + From 66b6d5517b81ffa99a4d2c121a73b8ac426ec237 Mon Sep 17 00:00:00 2001 From: Havret Date: Thu, 8 May 2025 21:38:06 +0200 Subject: [PATCH 2/3] Use C# 12, as pipeline is using dotnet-sdk-8.0 --- Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.build.props b/Directory.build.props index d89307e1f..eeb6fb7f3 100644 --- a/Directory.build.props +++ b/Directory.build.props @@ -1,5 +1,5 @@ - 13 + 12 From bac16cd74429290422ec32a42f83080caea701c9 Mon Sep 17 00:00:00 2001 From: Havret Date: Thu, 24 Jul 2025 12:05:55 +0100 Subject: [PATCH 3/3] Clean up build.props --- Confluent.Kafka.sln | 18 +++++++++--------- src/ConfigGen/ConfigGen.csproj | 1 - src/Confluent.Kafka/Confluent.Kafka.csproj | 1 + ...fluent.SchemaRegistry.Encryption.Aws.csproj | 1 + ...uent.SchemaRegistry.Encryption.Azure.csproj | 1 + ...fluent.SchemaRegistry.Encryption.Gcp.csproj | 1 + ...nt.SchemaRegistry.Encryption.HcVault.csproj | 1 + .../Confluent.SchemaRegistry.Encryption.csproj | 1 + .../Confluent.SchemaRegistry.Rules.csproj | 1 + ...Confluent.SchemaRegistry.Serdes.Avro.csproj | 1 + ...Confluent.SchemaRegistry.Serdes.Json.csproj | 1 + ...luent.SchemaRegistry.Serdes.Protobuf.csproj | 1 + .../Confluent.SchemaRegistry.csproj | 1 + src/Directory.build.props | 4 ++-- 14 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Confluent.Kafka.sln b/Confluent.Kafka.sln index d28090007..e89b4507c 100644 --- a/Confluent.Kafka.sln +++ b/Confluent.Kafka.sln @@ -4,18 +4,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1EFCD839-0726-4BCE-B745-1E829991B1BC}" - ProjectSection(SolutionItems) = preProject - src\Directory.build.props = src\Directory.build.props - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka", "src\Confluent.Kafka\Confluent.Kafka.csproj", "{09C3255B-1972-4EB8-91D0-FB9F5CD82BCB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry", "src\Confluent.SchemaRegistry\Confluent.SchemaRegistry.csproj", "{AA671E3D-EB85-40A2-B183-8DA037286680}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{90058283-1F8F-465D-89E4-D4374A27E612}" - ProjectSection(SolutionItems) = preProject - test\Directory.build.props = test\Directory.build.props - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka.UnitTests", "test\Confluent.Kafka.UnitTests\Confluent.Kafka.UnitTests.csproj", "{BD6FCDB1-CC2E-4DE2-AB48-9CBD3F78E637}" EndProject @@ -34,9 +28,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry.IntegrationTests", "test\Confluent.SchemaRegistry.IntegrationTests\Confluent.SchemaRegistry.IntegrationTests.csproj", "{EC57E6D6-371F-4538-8C48-35C37CA2ED67}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9CE4B5F7-9251-4340-BACB-207066A5DBE8}" - ProjectSection(SolutionItems) = preProject - examples\Directory.build.props = examples\Directory.build.props - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdminClient", "examples\AdminClient\AdminClient.csproj", "{964449D5-3024-420E-9262-1913EC189D6A}" EndProject @@ -118,10 +109,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D5322057 EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA928213-B366-4290-A4AA-E0FA094333FE}" + ProjectSection(SolutionItems) = preProject + src\Directory.build.props = src\Directory.build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EDA3CED2-A80E-44F5-B5E4-79E38BC1376F}" + ProjectSection(SolutionItems) = preProject + test\Directory.build.props = test\Directory.build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{A4A6EEAB-8053-4746-892F-683FC7C21622}" + ProjectSection(SolutionItems) = preProject + examples\Directory.build.props = examples\Directory.build.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ConfigGen/ConfigGen.csproj b/src/ConfigGen/ConfigGen.csproj index c1f02b63c..65e659543 100644 --- a/src/ConfigGen/ConfigGen.csproj +++ b/src/ConfigGen/ConfigGen.csproj @@ -2,7 +2,6 @@ Exe - net6.0;net8.0 diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj index be61848b0..b5467b334 100644 --- a/src/Confluent.Kafka/Confluent.Kafka.csproj +++ b/src/Confluent.Kafka/Confluent.Kafka.csproj @@ -16,6 +16,7 @@ README.md Confluent.Kafka Confluent.Kafka + $(TargetFrameworks);netstandard2.0;net462 true true true 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 feb71dab2..d19f6b8c4 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws + $(TargetFrameworks);netstandard2.1;net462 true 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 72fd38264..d55dbfd03 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure + $(TargetFrameworks);netstandard2.1;net462 true 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 befee91ac..94b4f668d 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp + $(TargetFrameworks);netstandard2.1;net462 true 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 6ae8f7d9a..0c6441ca3 100644 --- a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault + $(TargetFrameworks);netstandard2.1;net462 true true true diff --git a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj index f3c3b49c7..0fbb73f1e 100644 --- a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj +++ b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption + $(TargetFrameworks);netstandard2.1;net462 true true true diff --git a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj index 30769399b..671579dbc 100644 --- a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj +++ b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules + $(TargetFrameworks);netstandard2.1;net462 true 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 29ae145bd..61fba616b 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro + $(TargetFrameworks);netstandard2.0;net462 true 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 97440effb..a59f43d3c 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj @@ -15,6 +15,7 @@ Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json + $(TargetFrameworks);netstandard2.0;net462 true 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 05851008f..a8635bf13 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj @@ -16,6 +16,7 @@ Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf + $(TargetFrameworks);netstandard2.0;net462 true true true diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj index b3d513f88..f6202e4f5 100644 --- a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj +++ b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj @@ -16,6 +16,7 @@ Confluent.SchemaRegistry Confluent.SchemaRegistry Confluent.SchemaRegistry + $(TargetFrameworks);netstandard2.0;net462 true true true diff --git a/src/Directory.build.props b/src/Directory.build.props index 4df4b98cf..86512de0b 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -1,7 +1,7 @@ - 2.10.0 - netstandard2.0;net6.0;net8.0 + 2.11.1 + net6.0;net8.0