Skip to content

Commit 6483c7d

Browse files
committed
Update to .NET 7
1 parent b295eb3 commit 6483c7d

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Setup .NET
4848
uses: actions/setup-dotnet@v3
4949
with:
50-
dotnet-version: 6.0.x
50+
dotnet-version: 7.0.x
5151
- name: Setup PowerShell (Ubuntu)
5252
if: matrix.os == 'ubuntu-latest'
5353
run: |
@@ -178,7 +178,7 @@ jobs:
178178
- name: Setup .NET
179179
uses: actions/setup-dotnet@v3
180180
with:
181-
dotnet-version: 6.0.x
181+
dotnet-version: 7.0.x
182182
- name: Git checkout
183183
uses: actions/checkout@v4
184184
- name: Restore tools
@@ -229,7 +229,7 @@ jobs:
229229
- name: Setup .NET
230230
uses: actions/setup-dotnet@v3
231231
with:
232-
dotnet-version: 6.0.x
232+
dotnet-version: 7.0.x
233233
- name: Git checkout
234234
uses: actions/checkout@v4
235235
with:

Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
<PropertyGroup>
1717
<!-- Published dependencies (only update on major version change) -->
18-
<TargetFrameworkName>net6.0</TargetFrameworkName>
18+
<TargetFrameworkName>net7.0</TargetFrameworkName>
1919
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
2020
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
21-
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
21+
<EntityFrameworkCoreFrozenVersion>7.0.0</EntityFrameworkCoreFrozenVersion>
2222
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
2323

2424
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
25-
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
25+
<AspNetCoreVersion>7.0.*</AspNetCoreVersion>
2626
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
2727
<BogusVersion>34.0.*</BogusVersion>
2828
<CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
@@ -36,7 +36,7 @@
3636
<JetBrainsAnnotationsVersion>2023.2.*</JetBrainsAnnotationsVersion>
3737
<NpgsqlVersion>7.0.*</NpgsqlVersion>
3838
<SourceLinkVersion>1.1.*</SourceLinkVersion>
39-
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
39+
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
4040
<TestSdkVersion>17.7.*</TestSdkVersion>
4141
<XunitVersion>2.5.*</XunitVersion>
4242
</PropertyGroup>

src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static CascadingCodeTimer()
2323
// https://www.codeproject.com/Articles/61964/Performance-Tests-Precise-Run-Time-Measurements-wi
2424

2525
// The most important thing is to prevent switching between CPU cores or processors. Switching dismisses the cache, etc. and has a huge performance impact on the test.
26-
Process.GetCurrentProcess().ProcessorAffinity = new IntPtr(2);
26+
Process.GetCurrentProcess().ProcessorAffinity = new nint(2);
2727

2828
// To get the CPU core more exclusively, we must prevent that other processes can use this CPU core. We set our process priority to achieve this.
2929
// Note we should NOT set the thread priority, because async/await usage makes the code jump between pooled threads (depending on Synchronization Context).

test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public void Can_rewrite_order_by_clause_with_IntPtr()
498498
Parent = new TestResource
499499
{
500500
Id = generator.GetNext(),
501-
Pointer = (IntPtr)1
501+
Pointer = 1
502502
}
503503
}
504504
};

0 commit comments

Comments
 (0)