Skip to content

Commit

Permalink
Cleanup project files (#543)
Browse files Browse the repository at this point in the history
* Remove langversion override in project files
* Unifiy authors, copyright and product properties
* Remove XML property
* Remove output type
* Unifiy documentation files
* Cleanup whitespace
* Remove compiler defines
* Cleanup references
* Include StyleCop in all projects
* Move test references to Directory.Build.props
* Move copyright to Directory.Build.Props
* Move NetAnalyzers to Directory.Build.Props
  • Loading branch information
pascalberger authored Apr 21, 2024
1 parent ec2e1cc commit 437ac43
Show file tree
Hide file tree
Showing 36 changed files with 137 additions and 808 deletions.
39 changes: 7 additions & 32 deletions src/Cake.Issues.DocFx.Tests/Cake.Issues.DocFx.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,56 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Description>Tests for the Cake.Issues.DocFx addin</Description>
<Authors>Cake Issues contributors</Authors>
<Product>Cake.Issues</Product>
<Copyright>Copyright © Cake Issues contributors</Copyright>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CodeAnalysisRuleSet>..\Cake.Issues.Tests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

<PropertyGroup>
<CodeAnalysisRuleSet>..\Cake.Issues.Tests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<None Remove="Testfiles\entry-of-level-suggestion.json" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Testfiles\docfx.json" />
<EmbeddedResource Include="Testfiles\entry-of-level-suggestion.json" />
<EmbeddedResource Include="Testfiles\entry-with-line.json" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Testfiles\entry-with-line-0.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="StyleCop.Analyzers">
<Version>1.2.0-beta.556</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit">
<Version>2.7.1</Version>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio">
<Version>2.5.8</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
<ProjectReference Include="..\Cake.Issues.Testing\Cake.Issues.Testing.csproj" />
<ProjectReference Include="..\Cake.Issues.DocFx\Cake.Issues.DocFx.csproj" />
</ItemGroup>
Expand Down
27 changes: 1 addition & 26 deletions src/Cake.Issues.DocFx/Cake.Issues.DocFx.csproj
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Description>DocFx support for the Cake.Issues Addin for Cake Build Automation System</Description>
<Authors>Cake Issues contributors</Authors>
<Product>Cake.Issues</Product>
<Copyright>Copyright © Cake Issues contributors</Copyright>
</PropertyGroup>

<PropertyGroup>
<DebugType>full</DebugType>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<DocumentationFile>bin\Debug\Cake.Issues.DocFx.xml</DocumentationFile>
<CodeAnalysisRuleSet>..\Cake.Issues.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Issues.DocFx.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="4.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.2.0-beta.556</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
</ItemGroup>
Expand Down
19 changes: 1 addition & 18 deletions src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Product>Cake.Issues</Product>
<Copyright>Copyright © Cake Issues contributors</Copyright>
<IsTestProject>true</IsTestProject>
<Description>Tests for the Cake.Issues.EsLint addin</Description>
<Authors>Cake Issues contributors</Authors>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -26,21 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
<ProjectReference Include="..\Cake.Issues.Testing\Cake.Issues.Testing.csproj" />
<ProjectReference Include="..\Cake.Issues.EsLint\Cake.Issues.EsLint.csproj" />
</ItemGroup>

</Project>
15 changes: 0 additions & 15 deletions src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Description>EsLint support for the Cake.Issues Addin for Cake Build Automation System</Description>
<Authors>Cake Issues contributors</Authors>
<Copyright>Copyright © Cake Issues contributors</Copyright>
<Product>Cake.Issues</Product>
</PropertyGroup>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
Expand All @@ -18,20 +13,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,48 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Description>Tests for the Cake.Issues.GitRepository addin</Description>
<Authors>Cake Issues contributors</Authors>
<Copyright>Copyright © Cake Issues contributors</Copyright>
<Product>Cake.Issues</Product>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CodeAnalysisRuleSet>..\Cake.Issues.Tests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

<PropertyGroup>
<CodeAnalysisRuleSet>..\Cake.Issues.Tests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cake.Testing">
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Shouldly">
<Version>4.2.1</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.2.0-beta.556</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit">
<Version>2.7.1</Version>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio">
<Version>2.5.8</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
<ProjectReference Include="..\Cake.Issues.Testing\Cake.Issues.Testing.csproj" />
<ProjectReference Include="..\Cake.Issues.GitRepository\Cake.Issues.GitRepository.csproj" />
</ItemGroup>
Expand Down
33 changes: 2 additions & 31 deletions src/Cake.Issues.GitRepository/Cake.Issues.GitRepository.csproj
Original file line number Diff line number Diff line change
@@ -1,47 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Description>Git repository linting support for the Cake.Issues addin for Cake Build Automation System</Description>
<Authors>Cake Issues contributors</Authors>
<Copyright>Copyright © Cake Issues contributors</Copyright>
<Product>Cake.Issues</Product>
</PropertyGroup>

<PropertyGroup>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<CodeAnalysisRuleSet>..\Cake.Issues.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Issues.GitRepository.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DocumentationFile>bin\Debug\Cake.Issues.GitRepository.xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DocumentationFile>bin\Release\Cake.Issues.GitRepository.xml</DocumentationFile>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core">
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.2.0-beta.556</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Product>Cake.Issues</Product>
<IsTestProject>true</IsTestProject>
<Description>Tests for the Cake.Issues.InspectCode addin</Description>
<Authors>Cake Issues contributors</Authors>
<Copyright>Copyright © Cake Issues contributors</Copyright>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -26,24 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
<ProjectReference Include="..\Cake.Issues.Testing\Cake.Issues.Testing.csproj" />
<ProjectReference Include="..\Cake.Issues.InspectCode\Cake.Issues.InspectCode.csproj" />
</ItemGroup>
</Project>
</Project>
23 changes: 1 addition & 22 deletions src/Cake.Issues.InspectCode/Cake.Issues.InspectCode.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,16 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Product>Cake.Issues</Product>
<Description>JetBrains Inspect Code support for the Cake.Issues Addin for Cake Build Automation System</Description>
<Authors>Cake Issues contributors</Authors>
<Copyright>Copyright © Cake Issues contributors</Copyright>
</PropertyGroup>

<PropertyGroup>
<DebugType>full</DebugType>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<CodeAnalysisRuleSet>..\Cake.Issues.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Issues.InspectCode.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup>
<DebugType>full</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="4.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Cake.Issues\Cake.Issues.csproj" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 437ac43

Please sign in to comment.