Skip to content

Commit fb8bee5

Browse files
committed
Update to .NET 7
1 parent 9e4e9c8 commit fb8bee5

File tree

5 files changed

+9
-9
lines changed

5 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: |
@@ -165,7 +165,7 @@ jobs:
165165
- name: Setup .NET
166166
uses: actions/setup-dotnet@v3
167167
with:
168-
dotnet-version: 6.0.x
168+
dotnet-version: 7.0.x
169169
- name: Restore tools
170170
run: |
171171
dotnet tool restore
@@ -218,7 +218,7 @@ jobs:
218218
- name: Setup .NET
219219
uses: actions/setup-dotnet@v3
220220
with:
221-
dotnet-version: 6.0.x
221+
dotnet-version: 7.0.x
222222
- name: Restore tools
223223
run: |
224224
dotnet tool restore

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworkName>net6.0</TargetFrameworkName>
4-
<AspNetVersion>6.0.*</AspNetVersion>
3+
<TargetFrameworkName>net7.0</TargetFrameworkName>
4+
<AspNetVersion>7.0.*</AspNetVersion>
55
<EFCoreVersion>7.0.*</EFCoreVersion>
66
<EFCorePostgresVersion>7.0.*</EFCorePostgresVersion>
77
<MicrosoftCodeAnalysisVersion>4.7.*</MicrosoftCodeAnalysisVersion>

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).

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<ItemGroup>
3939
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
4040
<PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
41-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
41+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
4343
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
4444
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
4545
</ItemGroup>

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)