From 6d944be62963e1c6b04b70b7c34477cd527d041d Mon Sep 17 00:00:00 2001 From: Yassine BENNANI Date: Wed, 15 Nov 2023 13:06:41 +0100 Subject: [PATCH 1/3] upgrade dotnet 8 and drop dotnet 5 --- benchmark/Benchmark.csproj | 6 +++--- .../Gridify.Elasticsearch.csproj | 2 +- .../Gridify.EntityFramework.csproj | 5 +---- src/Gridify/Gridify.csproj | 6 +----- .../EntityFrameworkIntegrationTests.cs.csproj | 12 ++++++------ ...ntityFrameworkPostgreSqlIntegrationTests.csproj | 14 +++++++------- ...tityFrameworkSqlProviderIntegrationTests.csproj | 14 +++++++------- .../Gridify.Elasticsearch.Tests.csproj | 8 ++++---- test/Gridify.Tests/Gridify.Tests.csproj | 8 ++++---- 9 files changed, 34 insertions(+), 41 deletions(-) diff --git a/benchmark/Benchmark.csproj b/benchmark/Benchmark.csproj index 5ca42a30..8c7b5540 100644 --- a/benchmark/Benchmark.csproj +++ b/benchmark/Benchmark.csproj @@ -2,15 +2,15 @@ Exe - net7.0 + net8.0 Benchmarks - + - + diff --git a/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj b/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj index 4c851870..acfb22b8 100644 --- a/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj +++ b/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj @@ -13,7 +13,7 @@ true snupkg README.md - net5.0;net6.0;netstandard2.0;netstandard2.1;net7.0 + net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0 default enable diff --git a/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj b/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj index 3b0b9386..59fbe987 100644 --- a/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj +++ b/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj @@ -14,7 +14,7 @@ true snupkg README.md - net5.0;net6.0;netstandard2.0;netstandard2.1;net7.0 + net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0 default enable @@ -34,9 +34,6 @@ - - - diff --git a/src/Gridify/Gridify.csproj b/src/Gridify/Gridify.csproj index 20a6cdd6..d587c2bc 100644 --- a/src/Gridify/Gridify.csproj +++ b/src/Gridify/Gridify.csproj @@ -18,7 +18,7 @@ snupkg true README.md - net5.0;net6.0;netstandard2.0;netstandard2.1;net7.0 + net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0 @@ -38,10 +38,6 @@ - - - - diff --git a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj index 6f56cdc4..bcdc8f55 100644 --- a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj +++ b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj index 6a554980..863d3218 100644 --- a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj +++ b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj @@ -1,17 +1,17 @@ - net7.0 + net8.0 enable enable - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj b/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj index 91faa5df..4f257f01 100644 --- a/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj +++ b/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj @@ -1,17 +1,17 @@ - net7.0 + net8.0 EntityFrameworkIntegrationTests.cs - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj b/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj index 7dac1c67..eedb5370 100644 --- a/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj +++ b/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false latest enable @@ -9,9 +9,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Gridify.Tests/Gridify.Tests.csproj b/test/Gridify.Tests/Gridify.Tests.csproj index e473f8a8..d7003ae3 100644 --- a/test/Gridify.Tests/Gridify.Tests.csproj +++ b/test/Gridify.Tests/Gridify.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false latest enable @@ -9,9 +9,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 1a40b7340d6ad9f70f041a8a81e5daed71a9f10d Mon Sep 17 00:00:00 2001 From: Yassine BENNANI Date: Wed, 15 Nov 2023 13:14:18 +0100 Subject: [PATCH 2/3] update workflows --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/publush.yml | 4 ++-- .github/workflows/pullRequest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8581664e..bb839717 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -64,9 +64,9 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Build env: HUSKY: 0 diff --git a/.github/workflows/publush.yml b/.github/workflows/publush.yml index 1abf7507..e6c7780d 100644 --- a/.github/workflows/publush.yml +++ b/.github/workflows/publush.yml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index c8d16ce0..66177a2e 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -12,9 +12,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build From a142912fcc31ca88defe3a0ad6b8b0f15a037672 Mon Sep 17 00:00:00 2001 From: Yassine BENNANI Date: Thu, 16 Nov 2023 12:18:37 +0100 Subject: [PATCH 3/3] fix preview test sdk --- .../EntityFrameworkIntegrationTests.cs.csproj | 2 +- .../EntityFrameworkPostgreSqlIntegrationTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj index bcdc8f55..4029905c 100644 --- a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj +++ b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj @@ -7,7 +7,7 @@ - + all diff --git a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj index 863d3218..43f6b922 100644 --- a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj +++ b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj @@ -9,7 +9,7 @@ - + all