Skip to content

Commit 172feed

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'maintenance/csproj-cleanup' into develop
Removed unnecessary or legacy properties from the `csproj` files. Centralized common elements into a new `Directory.Build.props` file.
2 parents 15a731b + b851900 commit 172feed

10 files changed

Lines changed: 27 additions & 184 deletions

File tree

‎Directory.Build.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<LangVersion>9.0</LangVersion>
5+
<Nullable>enable</Nullable>
6+
<AnalysisLevel>latest</AnalysisLevel>
7+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<Company>Ignia</Company>
12+
<Product>OnTopic</Product>
13+
<Copyright>©2021 Ignia, LLC</Copyright>
14+
<Authors>Ignia</Authors>
15+
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
16+
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
17+
</PropertyGroup>
18+
19+
</Project>

‎OnTopic.All/OnTopic.All.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66

77
<PropertyGroup>
88
<AssemblyTitle>OnTopic Library Metapackage</AssemblyTitle>
9-
<Company>Ignia</Company>
10-
<Product>OnTopic</Product>
119
<Description>
1210
Includes all core packages associated with the OnTopic Library, excluding the OnTopic Editor. Reference this package as a
1311
shorthand for establishing a reference to each of the individual packages.
1412
</Description>
15-
<Copyright>©2021 Ignia, LLC</Copyright>
1613
<OutputPath>bin\$(Configuration)\</OutputPath>
17-
<Authors>Ignia</Authors>
1814
</PropertyGroup>
1915

2016
<ItemGroup>

‎OnTopic.AspNetCore.Mvc/OnTopic.AspNetCore.Mvc.csproj‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,15 @@
22

33
<PropertyGroup>
44
<ProjectGuid>{B7F136A1-C86D-4A74-AC4F-3693CD1358A4}</ProjectGuid>
5-
<RootNamespace>OnTopic.AspNetCore.Mvc</RootNamespace>
65
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
7-
<LangVersion>9.0</LangVersion>
8-
<ShouldCreateLogs>True</ShouldCreateLogs>
9-
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
10-
<Nullable>enable</Nullable>
11-
<AnalysisLevel>latest</AnalysisLevel>
12-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6+
<RootNamespace>OnTopic.AspNetCore.Mvc</RootNamespace>
137
</PropertyGroup>
148

159
<PropertyGroup>
1610
<AssemblyTitle>OnTopic ASP.NET Core Library</AssemblyTitle>
17-
<Company>Ignia</Company>
18-
<Product>OnTopic</Product>
1911
<Description>Provides presentation-layer support for the ASP.NET Core Framework.</Description>
20-
<Copyright>©2021 Ignia, LLC</Copyright>
2112
<OutputPath>bin\$(Configuration)\</OutputPath>
22-
<Authors>Ignia</Authors>
23-
</PropertyGroup>
24-
25-
<PropertyGroup>
26-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2713
<PackageTags>C# .NET CMS Presentation Web MVC ASP.NET Core Controller</PackageTags>
28-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32-
<DebugType>full</DebugType>
33-
<RunCodeAnalysis>false</RunCodeAnalysis>
34-
<LangVersion>latest</LangVersion>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37-
<DebugType>pdbonly</DebugType>
3814
</PropertyGroup>
3915

4016
<ItemGroup>
@@ -53,8 +29,4 @@
5329
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5430
</ItemGroup>
5531

56-
<ItemGroup>
57-
<None Include="README.md" />
58-
</ItemGroup>
59-
6032
</Project>

‎OnTopic.Data.Caching/OnTopic.Data.Caching.csproj‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,15 @@
22

33
<PropertyGroup>
44
<ProjectGuid>{206B7F91-CA25-4E9D-9576-60D2E54A2C0A}</ProjectGuid>
5-
<RootNamespace>OnTopic.Data.Caching</RootNamespace>
65
<TargetFrameworks>netstandard2.1</TargetFrameworks>
7-
<LangVersion>9.0</LangVersion>
8-
<ShouldCreateLogs>True</ShouldCreateLogs>
9-
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
10-
<Nullable>enable</Nullable>
11-
<AnalysisLevel>latest</AnalysisLevel>
12-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6+
<RootNamespace>OnTopic.Data.Caching</RootNamespace>
137
</PropertyGroup>
148

159
<PropertyGroup>
1610
<AssemblyTitle>OnTopic Cached Repository</AssemblyTitle>
17-
<Company>Ignia</Company>
18-
<Product>OnTopic</Product>
1911
<Description>Provides a caching decorator for ITopicRepository implementations.</Description>
20-
<Copyright>©2021 Ignia, LLC</Copyright>
2112
<OutputPath>bin\$(Configuration)\</OutputPath>
22-
<Authors>Ignia</Authors>
23-
</PropertyGroup>
24-
25-
<PropertyGroup>
26-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2713
<PackageTags>C# .NET CMS Caching Data Repository</PackageTags>
28-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32-
<DebugType>full</DebugType>
33-
<RunCodeAnalysis>false</RunCodeAnalysis>
34-
<LangVersion>latest</LangVersion>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37-
<DebugType>pdbonly</DebugType>
38-
<UseVSHostingProcess>false</UseVSHostingProcess>
3914
</PropertyGroup>
4015

4116
<ItemGroup>
@@ -53,8 +28,4 @@
5328
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5429
</ItemGroup>
5530

56-
<ItemGroup>
57-
<None Include="README.md" />
58-
</ItemGroup>
59-
6031
</Project>

‎OnTopic.Data.Sql/OnTopic.Data.Sql.csproj‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,15 @@
22

33
<PropertyGroup>
44
<ProjectGuid>{1DE1F923-C7C2-435B-B49A-975ACBCB5FF0}</ProjectGuid>
5-
<RootNamespace>OnTopic.Data.Sql</RootNamespace>
65
<TargetFrameworks>netstandard2.1</TargetFrameworks>
7-
<LangVersion>9.0</LangVersion>
8-
<Nullable>enable</Nullable>
9-
<AnalysisLevel>latest</AnalysisLevel>
10-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6+
<RootNamespace>OnTopic.Data.Sql</RootNamespace>
117
</PropertyGroup>
128

139
<PropertyGroup>
1410
<AssemblyTitle>OnTopic SQL Server Repository</AssemblyTitle>
15-
<Company>Ignia</Company>
16-
<Product>OnTopic</Product>
1711
<Description>Provides Microsoft SQL Server support for persisting the OnTopic graph to a database.</Description>
18-
<Copyright>©2021 Ignia, LLC</Copyright>
1912
<OutputPath>bin\$(Configuration)\</OutputPath>
20-
<Authors>Ignia</Authors>
21-
</PropertyGroup>
22-
23-
<PropertyGroup>
24-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2513
<PackageTags>C# .NET CMS SQL Data Repository</PackageTags>
26-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
27-
</PropertyGroup>
28-
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
30-
<DebugType>full</DebugType>
31-
<RunCodeAnalysis>false</RunCodeAnalysis>
32-
<LangVersion>latest</LangVersion>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
35-
<DebugType>pdbonly</DebugType>
3614
</PropertyGroup>
3715

3816
<ItemGroup>
@@ -51,8 +29,4 @@
5129
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5230
</ItemGroup>
5331

54-
<ItemGroup>
55-
<None Include="README.md" />
56-
</ItemGroup>
57-
5832
</Project>

‎OnTopic.TestDoubles/OnTopic.TestDoubles.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,13 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.1</TargetFrameworks>
5-
<LangVersion>9.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<AnalysisLevel>latest</AnalysisLevel>
8-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
95
</PropertyGroup>
106

117
<PropertyGroup>
128
<AssemblyTitle>OnTopic Test Doubles</AssemblyTitle>
13-
<Company>Ignia</Company>
14-
<Product>OnTopic</Product>
159
<Description>Test doubles, such as dummies and stubs, useful in setting up unit and integration tests for OnTopic.</Description>
16-
<Copyright>©2021 Ignia, LLC</Copyright>
1710
<OutputPath>bin\$(Configuration)\</OutputPath>
18-
<Authors>Ignia</Authors>
19-
</PropertyGroup>
20-
21-
<PropertyGroup>
22-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2311
<PackageTags>C# .NET AspDotNet Unit-Tests CMS Test-Doubles</PackageTags>
24-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2512
</PropertyGroup>
2613

2714
<ItemGroup>

‎OnTopic.Tests/OnTopic.Tests.csproj‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44
<TargetFrameworks>net5.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<NoWarn>CS1591,1701,1702,CA1707,CA1062,CS8602,CS8604;CA1303;IDE0059</NoWarn>
7-
<Nullable>enable</Nullable>
8-
<AnalysisLevel>latest</AnalysisLevel>
9-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
10-
</PropertyGroup>
11-
12-
<PropertyGroup>
13-
<AssemblyTitle>Ignia OnTopic Unit Tests</AssemblyTitle>
14-
<Company>Ignia</Company>
15-
<Product>Ignia OnTopic Library</Product>
16-
<Description>Provides unit tests for the OnTopic library.</Description>
17-
<Copyright>©2021 Ignia, LLC</Copyright>
18-
<OutputPath>bin\$(Configuration)\</OutputPath>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugType>full</DebugType>
23-
<DocumentationFile>bin\$(Configuration)\OnTopic.Tests.XML</DocumentationFile>
24-
<LangVersion>latest</LangVersion>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
287
</PropertyGroup>
298

309
<ItemGroup>
@@ -45,8 +24,4 @@
4524
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
4625
</ItemGroup>
4726

48-
<ItemGroup>
49-
<Folder Include="ViewModels\Metadata\" />
50-
</ItemGroup>
51-
5227
</Project>

‎OnTopic.ViewModels/OnTopic.ViewModels.csproj‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,15 @@
22

33
<PropertyGroup>
44
<ProjectGuid>{E52FC633-B4C5-4A2B-8CAF-30E756D7A6A7}</ProjectGuid>
5-
<RootNamespace>OnTopic.ViewModels</RootNamespace>
65
<TargetFrameworks>netstandard2.1</TargetFrameworks>
7-
<LangVersion>9.0</LangVersion>
8-
<ShouldCreateLogs>True</ShouldCreateLogs>
9-
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
10-
<Nullable>enable</Nullable>
11-
<AnalysisLevel>latest</AnalysisLevel>
12-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6+
<RootNamespace>OnTopic.ViewModels</RootNamespace>
137
</PropertyGroup>
148

159
<PropertyGroup>
1610
<AssemblyTitle>OnTopic View Models</AssemblyTitle>
17-
<Company>Ignia</Company>
18-
<Product>OnTopic</Product>
1911
<Description>Provides view models that map to the factory default content type schemas.</Description>
20-
<Copyright>©2021 Ignia, LLC</Copyright>
2112
<OutputPath>bin\$(Configuration)\</OutputPath>
22-
<Authors>Ignia</Authors>
23-
</PropertyGroup>
24-
25-
<PropertyGroup>
26-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2713
<PackageTags>C# .NET CMS Presentation View Models POCO</PackageTags>
28-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32-
<DebugType>full</DebugType>
33-
<RunCodeAnalysis>false</RunCodeAnalysis>
34-
<LangVersion>latest</LangVersion>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37-
<DebugType>pdbonly</DebugType>
3814
</PropertyGroup>
3915

4016
<ItemGroup>
@@ -47,12 +23,9 @@
4723
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4824
</PackageReference>
4925
</ItemGroup>
50-
<ItemGroup>
51-
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
52-
</ItemGroup>
5326

5427
<ItemGroup>
55-
<None Include="README.md" />
28+
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5629
</ItemGroup>
5730

5831
</Project>

‎OnTopic.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
ProjectSection(SolutionItems) = preProject
1919
.editorconfig = .editorconfig
2020
.gitignore = .gitignore
21+
Directory.Build.props = Directory.Build.props
2122
GitVersion.yml = GitVersion.yml
2223
README.md = README.md
2324
EndProjectSection
@@ -32,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OnTopic.TestDoubles", "OnTo
3233
EndProject
3334
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnTopic.Data.Sql.Database.Tests", "OnTopic.Data.Sql.Database.Tests\OnTopic.Data.Sql.Database.Tests.csproj", "{D7FE876D-A75F-4493-8283-B316271FD5AE}"
3435
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnTopic.All", "OnTopic.All\OnTopic.All.csproj", "{5AE0A248-0243-4E41-B6AB-CB8ACB5A6E04}"
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OnTopic.All", "OnTopic.All\OnTopic.All.csproj", "{5AE0A248-0243-4E41-B6AB-CB8ACB5A6E04}"
3637
EndProject
3738
Global
3839
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎OnTopic/OnTopic.csproj‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,20 @@
22

33
<PropertyGroup>
44
<ProjectGuid>{B8D5B290-4451-4C3B-AE9E-0FF075958A74}</ProjectGuid>
5-
<RootNamespace>OnTopic</RootNamespace>
65
<TargetFrameworks>netstandard2.1</TargetFrameworks>
7-
<LangVersion>9.0</LangVersion>
8-
<ShouldCreateLogs>True</ShouldCreateLogs>
9-
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
10-
<Nullable>enable</Nullable>
11-
<AnalysisLevel>latest</AnalysisLevel>
12-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6+
<RootNamespace>OnTopic</RootNamespace>
137
</PropertyGroup>
148

159
<PropertyGroup>
1610
<AssemblyTitle>OnTopic Library</AssemblyTitle>
17-
<Company>Ignia</Company>
18-
<Product>OnTopic</Product>
1911
<Description>Libraries for supporting Ignia Topics, a content management system (CMS) based on structured, hierarchical data.</Description>
20-
<Copyright>©2021 Ignia, LLC</Copyright>
2112
<OutputPath>bin\$(Configuration)\</OutputPath>
22-
<Authors>Ignia</Authors>
23-
</PropertyGroup>
24-
25-
<PropertyGroup>
26-
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2713
<PackageTags>C# .NET CMS Domain</PackageTags>
28-
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2914
</PropertyGroup>
3015

3116
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3217
<DebugType>full</DebugType>
3318
<DocumentationFile>bin\$(Configuration)\OnTopic.XML</DocumentationFile>
34-
<RunCodeAnalysis>false</RunCodeAnalysis>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37-
<DebugType>pdbonly</DebugType>
38-
<UseVSHostingProcess>false</UseVSHostingProcess>
3919
</PropertyGroup>
4020

4121
<ItemGroup>
@@ -53,9 +33,4 @@
5333
</PackageReference>
5434
</ItemGroup>
5535

56-
<ItemGroup>
57-
<None Include="Mapping\README.md" />
58-
<None Include="README.md" />
59-
</ItemGroup>
60-
6136
</Project>

0 commit comments

Comments
 (0)