From ad355095905e3c7a333ebc8477a1e2c22dca3aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Fri, 15 Nov 2024 08:06:11 -0800 Subject: [PATCH] Update packages (#597) --- .github/workflows/build.yml | 14 +------------- .github/workflows/pr.yml | 14 +------------- .github/workflows/publish.yml | 18 +++--------------- samples/YesSql.Bench/YesSql.Bench.csproj | 2 +- .../YesSql.Samples.FullText.csproj | 2 +- .../YesSql.Samples.Hi.csproj | 2 +- .../YesSql.Samples.Performance.csproj | 2 +- .../YesSql.Samples.Web.csproj | 2 +- src/Directory.Build.props | 2 +- src/Directory.Packages.props | 4 ++-- test/YesSql.Tests/YesSql.Tests.csproj | 19 +++---------------- 11 files changed, 16 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af4e8833..f501592c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@v3 # Required if the .NET version is not available on the GH Actions images - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x @@ -60,36 +60,24 @@ jobs: - name: Test - Sqlite .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net8.0 - - name: Test - Sqlite .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net7.0 - - name: Test - Sqlite .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net6.0 - name: Test - PostgresQL .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net8.0 - - name: Test - PostgresQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net7.0 - - name: Test - PostgresQL .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net6.0 - name: Test - MySQL .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net8.0 - - name: Test - MySQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net7.0 - - name: Test - MySQL .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0 - name: Test - SQL Server 2019 .NET 8.0 run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net8.0 - - name: Test - SQL Server 2019 .NET 7.0 - run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net7.0 - - name: Test - SQL Server 2019 .NET 6.0 run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b425bb4b..c24ffe5d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v3 # Required if the .NET version is not available on the GH Actions images - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x @@ -61,36 +61,24 @@ jobs: - name: Test - Sqlite .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net8.0 - - name: Test - Sqlite .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net7.0 - - name: Test - Sqlite .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net6.0 - name: Test - PostgresQL .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net8.0 - - name: Test - PostgresQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net7.0 - - name: Test - PostgresQL .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net6.0 - name: Test - MySQL .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net8.0 - - name: Test - MySQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net7.0 - - name: Test - MySQL .NET 6.0 run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0 - name: Test - SQL Server 2019 .NET 8.0 run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net8.0 - - name: Test - SQL Server 2019 .NET 7.0 - run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net7.0 - - name: Test - SQL Server 2019 .NET 6.0 run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index de3a6f60..af0f07ed 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v3 # Required if the .NET version is not available on the GH Actions images - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x @@ -69,29 +69,17 @@ jobs: - name: Test - Sqlite .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net8.0 - - name: Test - Sqlite .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net7.0 - - - name: Test - PostgresQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net7.0 - - name: Test - MySQL .NET 8.0 run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net8.0 - - name: Test - MySQL .NET 7.0 - run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net7.0 - - name: Test - SQL Server 2019 .NET 8.0 run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net8.0 - - name: Test - SQL Server 2019 .NET 7.0 - run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net7.0 - - name: Test - PostgresQL Legacy Identity - No Schema - run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net7.0 + run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net8.0 - name: Test - Sqlite Legacy Identity - run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net7.0 + run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net8.0 - name: Pack run: dotnet pack --output artifacts --configuration Release --no-restore --no-build -p:Version=${{ steps.get_version.outputs.VERSION }} diff --git a/samples/YesSql.Bench/YesSql.Bench.csproj b/samples/YesSql.Bench/YesSql.Bench.csproj index eb07c947..4a56bb0c 100644 --- a/samples/YesSql.Bench/YesSql.Bench.csproj +++ b/samples/YesSql.Bench/YesSql.Bench.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 portable true YesSql.Bench diff --git a/samples/YesSql.Samples.FullText/YesSql.Samples.FullText.csproj b/samples/YesSql.Samples.FullText/YesSql.Samples.FullText.csproj index f5b8fdc4..9d16acc6 100644 --- a/samples/YesSql.Samples.FullText/YesSql.Samples.FullText.csproj +++ b/samples/YesSql.Samples.FullText/YesSql.Samples.FullText.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 portable true YesSql.Samples.FullText diff --git a/samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj b/samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj index 79eba186..1edba5d4 100644 --- a/samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj +++ b/samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 portable true YesSql.Samples.Hi diff --git a/samples/YesSql.Samples.Performance/YesSql.Samples.Performance.csproj b/samples/YesSql.Samples.Performance/YesSql.Samples.Performance.csproj index e15f7fde..2553a868 100644 --- a/samples/YesSql.Samples.Performance/YesSql.Samples.Performance.csproj +++ b/samples/YesSql.Samples.Performance/YesSql.Samples.Performance.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 YesSql.Samples.Performance Exe false diff --git a/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj b/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj index 9e47cf5d..dff204d0 100644 --- a/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj +++ b/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0b4b190c..1242df49 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ Sebastien Ros Sebastien Ros - net7.0 + net6.0 true portable https://github.com/sebastienros/yessql diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index c7bf1187..7586b5e3 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -5,9 +5,9 @@ - + - + diff --git a/test/YesSql.Tests/YesSql.Tests.csproj b/test/YesSql.Tests/YesSql.Tests.csproj index 0790f319..a0a9186b 100644 --- a/test/YesSql.Tests/YesSql.Tests.csproj +++ b/test/YesSql.Tests/YesSql.Tests.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net6.0;net8.0 latest YesSql.Tests YesSql.Tests @@ -21,22 +21,9 @@ - - - - 8.0.0 - - - - 7.0.20 - - - - 7.0.20 - - + - +