Skip to content

Commit 7a89c49

Browse files
bkoelmanbkoelman
committed
Drop .NET 6
1 parent 16c461d commit 7a89c49

File tree

45 files changed

+204
-262
lines changed

Some content is hidden

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

45 files changed

+204
-262
lines changed

‎.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
uses: actions/setup-dotnet@v4
4747
with:
4848
dotnet-version: |
49-
6.0.x
5049
8.0.x
5150
9.0.x
5251
- name: Show installed versions
@@ -165,7 +164,6 @@ jobs:
165164
uses: actions/setup-dotnet@v4
166165
with:
167166
dotnet-version: |
168-
6.0.x
169167
8.0.x
170168
9.0.x
171169
- name: Git checkout
@@ -221,7 +219,6 @@ jobs:
221219
uses: actions/setup-dotnet@v4
222220
with:
223221
dotnet-version: |
224-
6.0.x
225222
8.0.x
226223
9.0.x
227224
- name: Git checkout

‎.github/workflows/codeql.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
uses: actions/setup-dotnet@v4
2828
with:
2929
dotnet-version: |
30-
6.0.x
3130
8.0.x
3231
9.0.x
3332
- name: Git checkout

‎Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252
<NoWarn>$(NoWarn);CA1062</NoWarn>
5353
</PropertyGroup>
5454

55-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
56-
<!-- Workaround for https://github.com/dotnet/runtime/issues/72263 -->
57-
<NoWarn>$(NoWarn);SYSLIB1006</NoWarn>
58-
</PropertyGroup>
59-
6055
<ItemGroup>
6156
<PackageReference Include="JetBrains.Annotations" Version="2024.2.*" PrivateAssets="All" />
6257
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />

‎JsonApiDotNetCore.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
1414
<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EThrowExpressionNullCheckPattern/@EntryIndexedValue">3000</s:Int64>
1515
<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002ETraceAssertPattern/@EntryIndexedValue">50</s:Int64>
1616
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
17+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=83FF097C_002DC8C6_002D477B_002D9FAB_002DDF99B84978B5_002Ff_003AReadOnlySet_002Ecs/@EntryIndexedValue">83FF097C-C8C6-477B-9FAB-DF99B84978B5/f:ReadOnlySet.cs</s:String>
1718
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
1819
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IdentifierHighlightingEnabled/@EntryValue">True</s:Boolean>
1920
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IncludeWarningsInSwea/@EntryValue">True</s:Boolean>

‎README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,9 @@ See also our [versioning policy](./VERSIONING_POLICY.md).
8787
| | | 7 | 7 |
8888
| | | 8 | 8, 9 |
8989
| | | 9 | 9 |
90-
| master | Preview | 6 | 6, 7 |
91-
| | | 7 | 7 |
92-
| | | 8 | 8, 9 |
90+
| master | Preview | 8 | 8, 9 |
9391
| | | 9 | 9 |
94-
| openapi | Experimental | 6 | 6, 7 |
95-
| | | 7 | 7 |
96-
| | | 8 | 8, 9 |
92+
| openapi | Experimental | 8 | 8, 9 |
9793
| | | 9 | 9 |
9894

9995
## Contributing

‎package-versions.props

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<GitHubActionsTestLoggerVersion>2.4.*</GitHubActionsTestLoggerVersion>
1616
<InheritDocVersion>2.0.*</InheritDocVersion>
1717
<SourceLinkVersion>8.0.*</SourceLinkVersion>
18+
<SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
1819
<TestSdkVersion>17.11.*</TestSdkVersion>
1920
<XunitVersion>2.9.*</XunitVersion>
2021
<XunitVisualStudioVersion>2.8.*</XunitVisualStudioVersion>
@@ -28,7 +29,6 @@
2829
<AspNetCoreVersion>9.0.*</AspNetCoreVersion>
2930
<EntityFrameworkCoreVersion>9.0.*</EntityFrameworkCoreVersion>
3031
<EntityFrameworkCorePomeloVersion>9.0.0-*</EntityFrameworkCorePomeloVersion>
31-
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
3232
</PropertyGroup>
3333

3434
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -39,18 +39,5 @@
3939
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
4040
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
4141
<EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
42-
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
43-
</PropertyGroup>
44-
45-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
46-
<!-- Published dependencies (only update on major version change) -->
47-
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
48-
49-
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
50-
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
51-
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
52-
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
53-
<EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
54-
<SystemTextJsonVersion>8.0.*</SystemTextJsonVersion>
5542
</PropertyGroup>
5643
</Project>

‎src/Examples/DapperExample/DapperExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/DapperExample/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
}
3232
case DatabaseProvider.MySql:
3333
{
34-
#if NET9_0_OR_GREATER
35-
ServerVersion serverVersion = await ServerVersion.AutoDetectAsync(connectionString);
36-
#else
34+
#if NET8_0
3735
ServerVersion serverVersion = ServerVersion.AutoDetect(connectionString);
36+
#else
37+
ServerVersion serverVersion = await ServerVersion.AutoDetectAsync(connectionString);
3838
#endif
3939

4040
builder.Services.AddMySql<AppDbContext>(connectionString, serverVersion, optionsAction: options => SetDbContextDebugOptions(options));

‎src/Examples/DapperExample/Repositories/ResultSetMapper.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
using JsonApiDotNetCore.Queries.Expressions;
44
using JsonApiDotNetCore.Resources;
55
using JsonApiDotNetCore.Resources.Annotations;
6-
#if NET6_0
7-
using JsonApiDotNetCore;
8-
#endif
96

107
namespace DapperExample.Repositories;
118

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

0 commit comments

Comments
 (0)