Skip to content

Commit 5e3311a

Browse files
HavretHavret
committed
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.
1 parent 24472e6 commit 5e3311a

File tree

50 files changed

+64
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+64
-87
lines changed

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# editorconfig.org
2+
# top-most EditorConfig file
3+
root = true
4+
5+
# Visual Studio XML project files
6+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
7+
indent_size = 2
8+
charset = utf-8
9+
10+
# Visual Studio and .NET related XML config files
11+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct,stylecop}]
12+
indent_size = 2

‎Confluent.Kafka.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1EFCD839-0726-4BCE-B745-1E829991B1BC}"
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.build.props = src\Directory.build.props
9+
EndProjectSection
710
EndProject
811
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka", "src\Confluent.Kafka\Confluent.Kafka.csproj", "{09C3255B-1972-4EB8-91D0-FB9F5CD82BCB}"
912
EndProject
1013
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry", "src\Confluent.SchemaRegistry\Confluent.SchemaRegistry.csproj", "{AA671E3D-EB85-40A2-B183-8DA037286680}"
1114
EndProject
1215
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{90058283-1F8F-465D-89E4-D4374A27E612}"
16+
ProjectSection(SolutionItems) = preProject
17+
test\Directory.build.props = test\Directory.build.props
18+
EndProjectSection
1319
EndProject
1420
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka.UnitTests", "test\Confluent.Kafka.UnitTests\Confluent.Kafka.UnitTests.csproj", "{BD6FCDB1-CC2E-4DE2-AB48-9CBD3F78E637}"
1521
EndProject
@@ -28,6 +34,9 @@ EndProject
2834
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.SchemaRegistry.IntegrationTests", "test\Confluent.SchemaRegistry.IntegrationTests\Confluent.SchemaRegistry.IntegrationTests.csproj", "{EC57E6D6-371F-4538-8C48-35C37CA2ED67}"
2935
EndProject
3036
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9CE4B5F7-9251-4340-BACB-207066A5DBE8}"
37+
ProjectSection(SolutionItems) = preProject
38+
examples\Directory.build.props = examples\Directory.build.props
39+
EndProjectSection
3140
EndProject
3241
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdminClient", "examples\AdminClient\AdminClient.csproj", "{964449D5-3024-420E-9262-1913EC189D6A}"
3342
EndProject
@@ -101,6 +110,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{B544BD
101110
src\Shared\SetEqualityComparer.cs = src\Shared\SetEqualityComparer.cs
102111
EndProjectSection
103112
EndProject
113+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D5322057-682D-49F2-A2FB-68FA69187B28}"
114+
ProjectSection(SolutionItems) = preProject
115+
README.md = README.md
116+
Directory.Build.props = Directory.Build.props
117+
.editorconfig = .editorconfig
118+
EndProjectSection
119+
EndProject
120+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA928213-B366-4290-A4AA-E0FA094333FE}"
121+
EndProject
122+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EDA3CED2-A80E-44F5-B5E4-79E38BC1376F}"
123+
EndProject
124+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{A4A6EEAB-8053-4746-892F-683FC7C21622}"
125+
EndProject
104126
Global
105127
GlobalSection(SolutionConfigurationPlatforms) = preSolution
106128
Debug|Any CPU = Debug|Any CPU
@@ -673,5 +695,8 @@ Global
673695
{6988FB1F-3648-4E5E-821F-55D67CA00FD7} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8}
674696
{10CD6000-59A3-40C9-905F-20F4EE03C1B4} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8}
675697
{B544BD2C-F46D-4C68-8A31-3010E371E640} = {1EFCD839-0726-4BCE-B745-1E829991B1BC}
698+
{BA928213-B366-4290-A4AA-E0FA094333FE} = {D5322057-682D-49F2-A2FB-68FA69187B28}
699+
{EDA3CED2-A80E-44F5-B5E4-79E38BC1376F} = {D5322057-682D-49F2-A2FB-68FA69187B28}
700+
{A4A6EEAB-8053-4746-892F-683FC7C21622} = {D5322057-682D-49F2-A2FB-68FA69187B28}
676701
EndGlobalSection
677702
EndGlobal

‎Directory.build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<PropertyGroup>
3-
<LangVersion>10</LangVersion>
4-
</PropertyGroup>
2+
<PropertyGroup>
3+
<LangVersion>13</LangVersion>
4+
</PropertyGroup>
55
</Project>

‎examples/AdminClient/AdminClient.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AdminClient</AssemblyName>
6-
<TargetFramework>net6.0</TargetFramework>
7-
<OutputType>Exe</OutputType>
8-
<LangVersion>7.3</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

‎examples/AvroBlogExamples/AvroBlogExamples.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
5-
<OutputType>Exe</OutputType>
6-
<TargetFramework>net6.0</TargetFramework>
7-
<LangVersion>7.1</LangVersion>
85
</PropertyGroup>
96

107
<ItemGroup>

‎examples/AvroGeneric/AvroGeneric.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AvroGeneric</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<LangVersion>7.1</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

‎examples/AvroGenericEncryption/AvroGenericEncryption.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AvroGenericEncryption</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<LangVersion>7.1</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

‎examples/AvroGenericMigration/AvroGenericMigration.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AvroGenericMigration</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<LangVersion>7.1</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

‎examples/AvroSpecific/AvroSpecific.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AvroSpecific</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<LangVersion>7.1</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

‎examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
55
<AssemblyName>AvroSpecificEncryption</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<LangVersion>7.1</LangVersion>
96
</PropertyGroup>
107

118
<ItemGroup>

0 commit comments

Comments
 (0)