Skip to content

Commit 2fab5fb

Browse files
author
Bart Koelman
authored
Updated dependencies to .NET 5 with EF Core 5 (#1022)
1 parent 6b286aa commit 2fab5fb

File tree

204 files changed

+512
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+512
-498
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2021.1.3",
6+
"version": "2021.1.4",
77
"commands": [
88
"jb"
99
]
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"dotnet-reportgenerator-globaltool": {
24-
"version": "4.8.9",
24+
"version": "4.8.12",
2525
"commands": [
2626
"reportgenerator"
2727
]

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
4-
<AspNetCoreVersion>3.1.*</AspNetCoreVersion>
5-
<EFCoreVersion>3.1.*</EFCoreVersion>
6-
<NpgsqlPostgreSQLVersion>3.1.*</NpgsqlPostgreSQLVersion>
3+
<NetCoreAppVersion>net5.0</NetCoreAppVersion>
4+
<AspNetCoreVersion>5.0.*</AspNetCoreVersion>
5+
<EFCoreVersion>5.0.*</EFCoreVersion>
6+
<NpgsqlPostgreSQLVersion>5.0.*</NpgsqlPostgreSQLVersion>
77
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
88
</PropertyGroup>
99

@@ -22,7 +22,7 @@
2222
<!-- Test Project Dependencies -->
2323
<PropertyGroup>
2424
<BogusVersion>33.0.2</BogusVersion>
25-
<CoverletVersion>3.0.3</CoverletVersion>
25+
<CoverletVersion>3.1.0</CoverletVersion>
2626
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
2727
<MoqVersion>4.16.1</MoqVersion>
2828
<XUnitVersion>2.4.*</XUnitVersion>

‎JsonApiDotNetCore.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
5656
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
5757
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LoopCanBePartlyConvertedToQuery/@EntryIndexedValue">HINT</s:String>
5858
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeInternal/@EntryIndexedValue">SUGGESTION</s:String>
59+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
60+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
5961
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysMatches/@EntryIndexedValue">SUGGESTION</s:String>
6062
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
6163
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">SUGGESTION</s:String>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ See also our [versioning policy](./VERSIONING_POLICY.md).
9090
| .NET Version | EF Core Version | JsonApiDotNetCore Version |
9191
| ----------------- | --------------- | ------------------------- |
9292
| .NET Core 2.x | 2.x | v3.x |
93-
| .NET Core 3.1 | 3.1, 5 | v4 |
94-
| .NET 5 | 5 | v4 |
93+
| .NET Core 3.1 | 3.1, 5 | v4.x |
94+
| .NET 5 | 5 | v4.x, v5.x |
9595

9696

9797
## Contributing

‎benchmarks/LinkBuilder/LinkBuilderGetNamespaceFromPathBenchmarks.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static void GetNamespaceFromPathUsingReadOnlySpan(string path, string re
6767

6868
if (isAtEnd || hasDelimiterAfterSegment)
6969
{
70-
_ = pathSpan.Slice(0, index).ToString();
70+
_ = pathSpan[..index].ToString();
7171
}
7272
}
7373
}

‎benchmarks/Query/QueryParserBenchmarks.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace Benchmarks.Query
2020
[MemoryDiagnoser]
2121
public class QueryParserBenchmarks
2222
{
23-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
24-
private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new FakeRequestQueryStringAccessor();
23+
private readonly DependencyFactory _dependencyFactory = new();
24+
private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new();
2525
private readonly QueryStringReader _queryStringReaderForSort;
2626
private readonly QueryStringReader _queryStringReaderForAll;
2727

‎benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class JsonApiDeserializerBenchmarks
2929
}
3030
});
3131

32-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
32+
private readonly DependencyFactory _dependencyFactory = new();
3333
private readonly IJsonApiDeserializer _jsonApiDeserializer;
3434

3535
public JsonApiDeserializerBenchmarks()

‎benchmarks/Serialization/JsonApiSerializerBenchmarks.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ namespace Benchmarks.Serialization
1515
[MarkdownExporter]
1616
public class JsonApiSerializerBenchmarks
1717
{
18-
private static readonly BenchmarkResource Content = new BenchmarkResource
18+
private static readonly BenchmarkResource Content = new()
1919
{
2020
Id = 123,
2121
Name = Guid.NewGuid().ToString()
2222
};
2323

24-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
24+
private readonly DependencyFactory _dependencyFactory = new();
2525
private readonly IJsonApiSerializer _jsonApiSerializer;
2626

2727
public JsonApiSerializerBenchmarks()

‎src/Examples/ReportsExample/Services/ReportService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private IReadOnlyCollection<Report> GetReports()
3131
{
3232
return new List<Report>
3333
{
34-
new Report
34+
new()
3535
{
3636
Title = "Status Report",
3737
Statistics = new ReportStatistics

‎src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JsonApiDotNetCore.AtomicOperations.Processors
1414
public class SetRelationshipProcessor<TResource, TId> : ISetRelationshipProcessor<TResource, TId>
1515
where TResource : class, IIdentifiable<TId>
1616
{
17-
private readonly CollectionConverter _collectionConverter = new CollectionConverter();
17+
private readonly CollectionConverter _collectionConverter = new();
1818
private readonly ISetRelationshipService<TResource, TId> _service;
1919

2020
public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)

0 commit comments

Comments
 (0)