Skip to content

Commit 10dfea1

Browse files
author
Jan Nils Ferner
authored
Merge pull request #9 from messerli-informatik-ag/support-netstandard-2.0
Support netstandard 2.0
2 parents 38758cf + ca8d206 commit 10dfea1

15 files changed

+76
-23
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ language: csharp
33
dotnet: "3.1"
44
mono: none
55

6+
install:
7+
- rvm install ruby-2.7.0
8+
- rvm use ruby-2.7.0
9+
610
script:
711
- dotnet restore
812
- dotnet build
913
- dotnet pack -c Release
14+
- ruby ./scripts/test_files_are_importable_by_msbuild.rb
1015
- 'unzip -l bin/Release/*.nupkg'

CodeStyle.csproj

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.Build.NoTargets">
33
<PropertyGroup>
4-
<Version>1.0.0-alpha.1</Version>
4+
<Version>1.0.0</Version>
55
<RepositoryUrl>https://github.com/messerli-informatik-ag/code-style</RepositoryUrl>
66
<RepositoryType>git</RepositoryType>
77
<PackageId>Messerli.CodeStyle</PackageId>
88
<PackageTags>analyzers</PackageTags>
99
<PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
1010
<Copyright>© Messerli Informatik AG. All rights reserved.</Copyright>
1111
<Description>Various analyzers bundled with opinionated configuration</Description>
12-
<NoWarn>$(NoWarn);NU5105</NoWarn>
13-
<!-- NU5105: The version property specified contains SemVer 2.0.0 components
12+
<NoWarn>$(NoWarn);NU5105;NU5104;NU5128</NoWarn>
13+
<!-- NU5105: The version property specified contains SemVer 2.0.0 components.
1414
See https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5105 -->
15+
<!-- NU5104: A stable release of a package should not have a prerelease dependency.
16+
See https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5104 -->
17+
<!-- NU5128: Some target frameworks declared in the dependencies group of the nuspec and the lib/ref folder do not have exact matches in the other location.
18+
See https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5128 -->
1519
</PropertyGroup>
1620
<PropertyGroup>
17-
<TargetFramework>netstandard2.1</TargetFramework>
21+
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
1822
</PropertyGroup>
1923
<ItemGroup>
2024
<PackageReference Include="IDisposableAnalyzers" Version="3.2.0" PrivateAssets="none" />
2125
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113" PrivateAssets="none" />
2226
</ItemGroup>
2327
<ItemGroup>
24-
<None Include="Config\**\*">
28+
<None Include="build\**\*;buildMultiTargeting\**\*">
2529
<Pack>true</Pack>
26-
<PackagePath>build\$(TargetFramework)\Config</PackagePath>
27-
</None>
28-
<!-- This file is automatically loaded by MSBuild when a project depends on this package using <PackageReference> -->
29-
<None Include="$(PackageId).targets">
30-
<Pack>true</Pack>
31-
<PackagePath>build\$(TargetFramework)</PackagePath>
32-
</None>
33-
<!-- This file makes the nuget package framework dependent -->
34-
<None Include="lib/_._">
35-
<Pack>true</Pack>
36-
<PackagePath>lib\$(TargetFramework)</PackagePath>
30+
<PackagePath>%(Identity)</PackagePath>
3731
</None>
3832
</ItemGroup>
3933
</Project>

Messerli.CodeStyle.targets

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

Config/Default.targets renamed to build/Messerli.CodeStyle.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Default.ruleset</CodeAnalysisRuleSet>
44
</PropertyGroup>
55

6-
<Import Project="$(MSBuildThisFileDirectory)Disposable\Default.targets" />
7-
<Import Project="$(MSBuildThisFileDirectory)StyleCop\Default.targets" />
6+
<Import Project="$(MSBuildThisFileDirectory)StyleCop\Default.props" />
87
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)