Skip to content

Commit bfaca70

Browse files
author
Bart Koelman
committed
Fixed: exclude CSharpGuidelinesAnalyzer and JetBrains.Annotations dependencies in the generated JADNC NuGet package
1 parent f6c96f3 commit bfaca70

File tree

4 files changed

+7
-22
lines changed

4 files changed

+7
-22
lines changed

Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<AdditionalFiles Include="$(SolutionDir)CSharpGuidelinesAnalyzer.config">
12-
<Link>CSharpGuidelinesAnalyzer.config</Link>
13-
</AdditionalFiles>
11+
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
12+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.6.0" PrivateAssets="All" />
13+
<AdditionalFiles Include="$(SolutionDir)CSharpGuidelinesAnalyzer.config" Visible="False" />
1414
</ItemGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)'=='Release'">

JsonApiDotNetCore.sln

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{24B15015-6
88
EndProject
99
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5B4D998-CECB-454D-9F32-085A897577BE}"
1010
ProjectSection(SolutionItems) = preProject
11+
.editorconfig = .editorconfig
1112
.gitignore = .gitignore
12-
.travis.yml = .travis.yml
13-
appveyor.yml = appveyor.yml
14-
Build.ps1 = Build.ps1
15-
build.sh = build.sh
13+
CSharpGuidelinesAnalyzer.config = CSharpGuidelinesAnalyzer.config
1614
Directory.Build.props = Directory.Build.props
17-
README.md = README.md
1815
EndProjectSection
1916
EndProject
2017
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{026FBC6C-AF76-4568-9B87-EC73457899FD}"
@@ -45,7 +42,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiDbContextExample", "sr
4542
EndProject
4643
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiDbContextTests", "test\MultiDbContextTests\MultiDbContextTests.csproj", "{EC3202C6-1D4C-4B14-A599-B9D3F27FE3BA}"
4744
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBuildingBlocks", "test\TestBuildingBlocks\TestBuildingBlocks.csproj", "{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}"
45+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBuildingBlocks", "test\TestBuildingBlocks\TestBuildingBlocks.csproj", "{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}"
4946
EndProject
5047
Global
5148
GlobalSection(SolutionConfigurationPlatforms) = preSolution

markdownlint.config

-5
This file was deleted.

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,12 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Ben.Demystifier" Version="0.3.0" />
25-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.6.0">
26-
<PrivateAssets>none</PrivateAssets>
27-
</PackageReference>
2825
<PackageReference Include="Humanizer" Version="2.8.26" />
29-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
3026
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
3127
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
3228
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
3329
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
34-
<PackageReference Include="SauceControl.InheritDoc" Version="1.2.0">
35-
<PrivateAssets>all</PrivateAssets>
36-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
37-
</PackageReference>
30+
<PackageReference Include="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
3831
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3932
</ItemGroup>
4033
</Project>

0 commit comments

Comments
 (0)