Update to .NET 7

json-api-dotnet · Oct 9, 2023 · ea12c93 · ea12c93
1 parent 5e56950
commit ea12c93
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Setup PowerShell (Ubuntu)
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -178,7 +178,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Git checkout
       uses: actions/checkout@v4
     - name: Restore tools
@@ -229,7 +229,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Git checkout
       uses: actions/checkout@v4
       with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,14 +15,14 @@
 
   <PropertyGroup>
     <!-- Published dependencies (only update on major version change) -->
-    <TargetFrameworkName>net6.0</TargetFrameworkName>
+    <TargetFrameworkName>net7.0</TargetFrameworkName>
     <CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
     <DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
-    <EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
+    <EntityFrameworkCoreFrozenVersion>7.0.0</EntityFrameworkCoreFrozenVersion>
     <HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
-    <AspNetCoreVersion>6.0.*</AspNetCoreVersion>
+    <AspNetCoreVersion>7.0.*</AspNetCoreVersion>
     <BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
     <BogusVersion>34.0.*</BogusVersion>
     <CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
@@ -36,7 +36,7 @@
     <JetBrainsAnnotationsVersion>2023.2.*</JetBrainsAnnotationsVersion>
     <NpgsqlVersion>7.0.*</NpgsqlVersion>
     <SourceLinkVersion>1.1.*</SourceLinkVersion>
-    <SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
+    <SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
     <TestSdkVersion>17.7.*</TestSdkVersion>
     <XunitVersion>2.5.*</XunitVersion>
   </PropertyGroup>

diff --git a/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs b/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs
@@ -23,7 +23,7 @@ static CascadingCodeTimer()
             // https://www.codeproject.com/Articles/61964/Performance-Tests-Precise-Run-Time-Measurements-wi
 
             // 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.
-            Process.GetCurrentProcess().ProcessorAffinity = new IntPtr(2);
+            Process.GetCurrentProcess().ProcessorAffinity = new nint(2);
 
             // 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.
             // Note we should NOT set the thread priority, because async/await usage makes the code jump between pooled threads (depending on Synchronization Context).

diff --git a/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs b/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs
@@ -498,7 +498,7 @@ public void Can_rewrite_order_by_clause_with_IntPtr()
                 Parent = new TestResource
                 {
                     Id = generator.GetNext(),
-                    Pointer = (IntPtr)1
+                    Pointer = 1
                 }
             }
         };