Skip to content

Commit 041c15b

Browse files
author
Bart Koelman
authored
Updated to .NET Core 3.1 and removed redundant package references (#711)
* Updated to .NET Core 3.1 and removed redundant package references * Updated cibuild config for netcore31 * docs * Guessing some more...
1 parent 7eb2d6e commit 041c15b

File tree

15 files changed

+54
-175
lines changed

15 files changed

+54
-175
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
before_script:
66
- psql -c 'create database JsonApiDotNetCoreExample;' -U postgres
77
mono: none
8-
dotnet: 3.0.100 # https://www.microsoft.com/net/download/linux
8+
dotnet: 3.1
99
branches:
1010
only:
1111
- master

‎Directory.Build.props‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<NetCoreAppVersion>netcoreapp3.0</NetCoreAppVersion>
3+
<NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
44
<NetStandardVersion>netstandard2.1</NetStandardVersion>
5-
<AspNetCoreVersion>3.0</AspNetCoreVersion>
6-
<MicrosoftLoggingVersion>3.0.*</MicrosoftLoggingVersion>
7-
<MicrosoftConfigurationVersion>3.0.*</MicrosoftConfigurationVersion>
8-
<MicrosoftOptionsVersion>3.0.*</MicrosoftOptionsVersion>
9-
<EFCoreVersion>3.0.*</EFCoreVersion>
10-
<EFCoreToolsVersion>3.0.*</EFCoreToolsVersion>
11-
<NpgsqlVersion>4.1.1</NpgsqlVersion>
12-
<NpgsqlPostgreSQLVersion>3.0.1</NpgsqlPostgreSQLVersion>
13-
<TuplesVersion>4.5.0</TuplesVersion>
5+
<AspNetCoreVersion>3.1.*</AspNetCoreVersion>
6+
<EFCoreVersion>3.1.*</EFCoreVersion>
7+
<NpgsqlPostgreSQLVersion>3.1.*</NpgsqlPostgreSQLVersion>
148
</PropertyGroup>
159

1610
<PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -20,9 +14,8 @@
2014

2115
<!-- Test Project Dependencies -->
2216
<PropertyGroup>
23-
<TestSdkVersion>16.3.0</TestSdkVersion>
2417
<XUnitVersion>2.4.1</XUnitVersion>
25-
<BogusVersion>28.4.1</BogusVersion>
18+
<BogusVersion>29.0.1</BogusVersion>
2619
<MoqVersion>4.13.1</MoqVersion>
2720
</PropertyGroup>
2821
</Project>

‎benchmarks/Benchmarks.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
<OutputType>Exe</OutputType>
44
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
55
</PropertyGroup>
6+
67
<ItemGroup>
78
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
89
<PackageReference Include="moq" Version="$(MoqVersion)" />
910
</ItemGroup>
11+
1012
<ItemGroup>
11-
<ProjectReference Include="../src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
13+
<ProjectReference Include="..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
1214
</ItemGroup>
1315
</Project>

‎src/Examples/GettingStarted/GettingStarted.csproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<Folder Include="Properties\" />
8-
<Folder Include="wwwroot\" />
7+
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
98
</ItemGroup>
109

1110
<ItemGroup>
12-
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
1711
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
1812
</ItemGroup>
1913
</Project>

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4-
<PreserveCompilationContext>true</PreserveCompilationContext>
5-
<AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<PackageId>JsonApiDotNetCoreExample</PackageId>
8-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
94
</PropertyGroup>
105

116
<ItemGroup>
12-
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
7+
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
138
</ItemGroup>
149

1510
<ItemGroup>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EFCoreVersion)" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftConfigurationVersion)" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftConfigurationVersion)" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftConfigurationVersion)" />
22-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftLoggingVersion)" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftOptionsVersion)" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EFCoreToolsVersion)" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreToolsVersion)" />
2811
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
2912
</ItemGroup>
30-
31-
<ItemGroup>
32-
<Folder Include="Startups\" />
33-
</ItemGroup>
3413
</Project>

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
54
</PropertyGroup>
5+
66
<ItemGroup>
7-
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
7+
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
88
</ItemGroup>
9+
910
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
11+
<PackageReference Include="Dapper" Version="2.0.30" />
1112
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
12-
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
13-
<PackageReference Include="Dapper" Version="1.50.5" />
1413
</ItemGroup>
1514
</Project>

‎src/Examples/ReportsExample/ReportsExample.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
54
</PropertyGroup>
65

76
<ItemGroup>
8-
<Folder Include="wwwroot\" />
7+
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
98
</ItemGroup>
109

1110
<ItemGroup>
12-
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
11+
<PackageReference Include="Dapper" Version="2.0.30" />
1712
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
18-
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
19-
<PackageReference Include="Dapper" Version="1.50.5" />
2013
</ItemGroup>
21-
2214
</Project>

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<VersionPrefix>4.0.0</VersionPrefix>
4-
<TargetFrameworks>$(NetCoreAppVersion)</TargetFrameworks>
5-
<AssemblyName>JsonApiDotNetCore</AssemblyName>
6-
<PackageId>JsonApiDotNetCore</PackageId>
7-
<LangVersion>8.0</LangVersion>
4+
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
85
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
96
</PropertyGroup>
107

@@ -22,12 +19,14 @@
2219

2320
<ItemGroup>
2421
<FrameworkReference Include="Microsoft.AspNetCore.App" />
25-
<PackageReference Include="Ben.Demystifier" Version="0.1.1" />
26-
<PackageReference Include="Humanizer" Version="2.4.2" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Ben.Demystifier" Version="0.1.6" />
26+
<PackageReference Include="Humanizer" Version="2.7.9" />
2727
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
28-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
29-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
30-
<PackageReference Include="System.ValueTuple" Version="$(TuplesVersion)" />
28+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
29+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3130
</ItemGroup>
3231

3332
<!--
@@ -42,7 +41,4 @@
4241
<ItemGroup Condition="'$(GenerateDocumentation)' == 'true'">
4342
<PackageReference Include="docfx.console" Version="2.33.0" />
4443
</ItemGroup>
45-
<ItemGroup>
46-
<Folder Include="Graph\ResourceNameFormatters\" />
47-
</ItemGroup>
4844
</Project>

‎test/DiscoveryTests/DiscoveryTests.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
5-
<IsPackable>false</IsPackable>
64
</PropertyGroup>
75

86
<ItemGroup>
9-
<ProjectReference Include="../../src/Examples/GettingStarted/GettingStarted.csproj" />
7+
<ProjectReference Include="..\..\src\Examples\GettingStarted\GettingStarted.csproj" />
108
</ItemGroup>
119

1210
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
15-
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
1611
<PackageReference Include="Moq" Version="$(MoqVersion)" />
12+
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
1714
</ItemGroup>
1815
</Project>

‎test/IntegrationTests/IntegrationTests.csproj‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
5-
6-
<IsPackable>false</IsPackable>
7-
8-
<RootNamespace>JADNC.IntegrationTests</RootNamespace>
94
</PropertyGroup>
105

11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
15-
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
16-
<PackageReference Include="moq" Version="$(MoqVersion)" />
17-
<PackageReference Include="Bogus" Version="$(BogusVersion)" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
19-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
20-
</ItemGroup>
21-
226
<ItemGroup>
237
<ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
248
<ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
259
</ItemGroup>
2610

11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Moq" Version="$(MoqVersion)" />
14+
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
16+
</ItemGroup>
2717
</Project>

0 commit comments

Comments
 (0)