Skip to content

Commit cd3e56c

Browse files
author
Jan Nils Ferner
authored
Merge pull request #45 from messerli-informatik-ag/cleanup
Cleanup
2 parents 9b7be38 + 5f8cd37 commit cd3e56c

File tree

11 files changed

+10
-20
lines changed

11 files changed

+10
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
- name: Test that files are importable by MSBuild
2828
run: ruby ./scripts/test_files_are_importable_by_msbuild.rb
2929
- name: Show NuGet package content
30-
run: unzip -l bin/Release/*.nupkg
30+
run: unzip -l nupkg/*.nupkg

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
bin/
22
obj/
33
/documentation/book/
4+
/nupkg/

CodeStyle.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PackageId>Messerli.CodeStyle</PackageId>
88
<PackageTags>analyzers</PackageTags>
99
<PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
10+
<PackageOutputPath>nupkg</PackageOutputPath>
1011
<Copyright>© Messerli Informatik AG. All rights reserved.</Copyright>
1112
<Description>Various analyzers bundled with opinionated configuration</Description>
1213
<NoWarn>$(NoWarn);NU5105;NU5104;NU5128</NoWarn>
@@ -25,7 +26,7 @@
2526
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="none" />
2627
</ItemGroup>
2728
<ItemGroup>
28-
<None Include="build\**\*;buildMultiTargeting\**\*">
29+
<None Include="build\**\*">
2930
<Pack>true</Pack>
3031
<PackagePath>%(Identity)</PackagePath>
3132
</None>

build/Default.ruleset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RuleSet Name="Default rules for all MesserliOne projects" ToolsVersion="10.0">
3-
<Include Path="Disposable\Default.ruleset" Action="Default" />
4-
<Include Path="StyleCop\Default.ruleset" Action="Default" />
3+
<Include Path="Disposable.ruleset" Action="Default" />
4+
<Include Path="StyleCop.ruleset" Action="Default" />
55
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
66
<Rule Id="CS1591" Action="None" /> <!-- Missing XML comment for publicly visible type or member 'Type_or_Member' -->
77
</Rules>
File renamed without changes.

build/Messerli.CodeStyle.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<PropertyGroup>
44
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Default.ruleset</CodeAnalysisRuleSet>
55
<WarningsAsErrors>$(WarningsAsErrors);nullable</WarningsAsErrors>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile><!-- This is needed so that analyzers can inspect XML comments. Enforced by SA0001. -->
67
</PropertyGroup>
7-
8-
<Import Project="$(MSBuildThisFileDirectory)StyleCop\Default.props" />
8+
<ItemGroup>
9+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" Visible="false" InProject="false" />
10+
</ItemGroup>
911
</Project>
File renamed without changes.

build/StyleCop/Default.props

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.

buildMultiTargeting/Messerli.CodeStyle.props

Lines changed: 0 additions & 4 deletions
This file was deleted.

scripts/test_files_are_importable_by_msbuild.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@ def test_files_are_importable_by_msbuild(directory, files_to_test)
4848

4949
test_files_are_importable_by_msbuild unpacked_directory, [
5050
'build/Messerli.CodeStyle.props',
51-
'buildMultiTargeting/Messerli.CodeStyle.props',
5251
]
5352
end

0 commit comments

Comments
 (0)