diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dc9384515..a8b4ccab00 100644 --- 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 index 73e1b54135..9c250b442b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,14 +15,14 @@ - net6.0 + net7.0 4.1.0 0.4.1 - 6.0.0 + 7.0.0 2.14.1 - 6.0.* + 7.0.* 0.13.* 34.0.* 3.8.* @@ -36,7 +36,7 @@ 2023.2.* 7.0.* 1.1.* - 7.0.* + $(AspNetCoreVersion) 17.7.* 2.5.* diff --git a/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs b/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs index 4b4d82b62b..05625517f1 100644 --- 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 index 57da032819..bc3f1c76ab 100644 --- 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 } } };