Skip to content

Commit

Permalink
Update to latest .NET versions (#37)
Browse files Browse the repository at this point in the history
Test and Benchmark projects now target .NET Core 3.1. Library now targets .NET Standard 2.1 (and continues to target .NET Standard 2.0 and .NET Core App 2.1).
  • Loading branch information
idg10 authored Jan 29, 2020
1 parent 43207b7 commit 44415dc
Show file tree
Hide file tree
Showing 19 changed files with 3,544 additions and 305 deletions.
2 changes: 1 addition & 1 deletion Solutions/Ais.Net.Benchmarks/Ais.Net.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\Common.NetCore_2_2.proj" />
<Import Project="..\Common.NetCore_3_1.proj" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
19 changes: 13 additions & 6 deletions Solutions/Ais.Net.Specs/Ais.Net.Specs.csproj
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\Common.NetCore_2_2.proj" />
<Import Project="..\Common.NetCore_3_1.proj" />

<PropertyGroup>

<IsPackable>false</IsPackable>
<NoWarn>RCS1029;RCS1089;SA1600;CS1591</NoWarn>
<!--
Note: SA1633 and SA1649 are disabled because of a bug introduced by SpecFlow 3.1.
If https://github.com/SpecFlowOSS/SpecFlow/pull/1790 is ever successfully merged, we should re-enable them.
-->
<NoWarn>RCS1029;RCS1089;SA1600;CS1591;SA1633;SA1649</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="SpecFlow.NUnit.Runners" Version="3.0.225" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.0.225" />
<PackageReference Include="SpecFlow.NUnit.Runners" Version="3.1.78" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.78" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Ais.Net\Ais.Net.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.7.0">
<PackageReference Include="coverlet.msbuild" Version="2.8.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

34 changes: 29 additions & 5 deletions Solutions/Ais.Net.Specs/Ais/Net/Specs/AisStringsSpecs.feature.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 44415dc

Please sign in to comment.