From 5d5637e69b7bad468ce9143a53919359f7e741ce Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 16 Nov 2023 11:34:33 -0800 Subject: [PATCH] Update dependencies (#513) (#515) --- .github/workflows/build.yml | 21 +++++++++---- .github/workflows/pr.yml | 21 +++++++++---- .github/workflows/publish.yml | 17 ++++++++++- YesSql.sln | 1 + .../YesSql.Samples.Web.csproj | 21 ++++++------- src/Directory.Packages.props | 30 +++++++++---------- .../YesSql.Filters.Query.csproj | 4 +-- .../YesSql.Provider.MySql.csproj | 2 ++ .../YesSql.Provider.PostgreSql.csproj | 3 ++ .../YesSql.Provider.SqlServer.csproj | 3 ++ .../YesSql.Provider.Sqlite.csproj | 3 ++ test/YesSql.Tests/ProviderTests.cs | 14 ++++----- test/YesSql.Tests/YesSql.Tests.csproj | 19 ++++++++---- 13 files changed, 105 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69d41db8..af4e8833 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,33 +49,44 @@ jobs: - uses: actions/checkout@v3 # Required if the .NET version is not available on the GH Actions images - # - uses: actions/setup-dotnet@v3 - # with: - # dotnet-version: | - # 6.0.x - # 7.0.x + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 8.0.x - name: Build run: dotnet build --configuration Release + - 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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 688f99eb..c75869b0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -50,33 +50,44 @@ jobs: - uses: actions/checkout@v3 # Required if the .NET version is not available on the GH Actions images - # - uses: actions/setup-dotnet@v3 - # with: - # dotnet-version: | - # 6.0.x - # 7.0.x + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 8.0.x - name: Build run: dotnet build --configuration Release + - 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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a5d4d048..de3a6f60 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -46,6 +46,12 @@ jobs: steps: - uses: actions/checkout@v3 + + # Required if the .NET version is not available on the GH Actions images + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 8.0.x - name: Get the version id: get_version @@ -60,15 +66,24 @@ jobs: - name: Build run: dotnet build --configuration Release -p:Version=${{ steps.get_version.outputs.VERSION }} + - 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 diff --git a/YesSql.sln b/YesSql.sln index 31c3aab6..994c49b6 100644 --- a/YesSql.sln +++ b/YesSql.sln @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .github\workflows\build.yml = .github\workflows\build.yml src\Directory.Build.props = src\Directory.Build.props + src\Directory.Packages.props = src\Directory.Packages.props NuGet.config = NuGet.config .github\workflows\pr.yml = .github\workflows\pr.yml .github\workflows\publish.yml = .github\workflows\publish.yml diff --git a/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj b/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj index 9f4c3c80..9e47cf5d 100644 --- a/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj +++ b/samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj @@ -1,17 +1,14 @@ - - net7.0 - false - + + net7.0 + false + - - - - - - - - + + + + + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index b1127f94..1b5bc254 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,17 +1,17 @@ - - true - - - - - - - - - - - - - + + true + + + + + + + + + + + + + diff --git a/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj b/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj index 021fb2d1..e33c4660 100644 --- a/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj +++ b/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj b/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj index 702db1fc..fbeade57 100644 --- a/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj +++ b/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj @@ -3,7 +3,9 @@ + + diff --git a/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj b/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj index 83af4549..c79b64db 100644 --- a/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj +++ b/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj @@ -1,8 +1,11 @@ + + + diff --git a/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj b/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj index 606b0ec0..dfc0d1cd 100644 --- a/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj +++ b/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj @@ -1,8 +1,11 @@ + + + diff --git a/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj b/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj index a5baefba..0eda6619 100644 --- a/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj +++ b/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj @@ -1,8 +1,11 @@ + + + diff --git a/test/YesSql.Tests/ProviderTests.cs b/test/YesSql.Tests/ProviderTests.cs index 5fda006c..876a4f97 100644 --- a/test/YesSql.Tests/ProviderTests.cs +++ b/test/YesSql.Tests/ProviderTests.cs @@ -12,7 +12,7 @@ namespace YesSql.Tests { public class ProviderTests : IDisposable { - private TemporaryFolder _tempFolder; + private readonly TemporaryFolder _tempFolder; public ProviderTests() { @@ -44,17 +44,15 @@ public async void AddedDbProviderStoreShouldPresentInDIContainer() // Assert Assert.NotNull(store); - return Task.FromResult(0); + return Task.CompletedTask; }); }); - using (var server = new TestServer(builder)) - { - var client = server.CreateClient(); - var response = await client.GetAsync("/"); + using var server = new TestServer(builder); + var client = server.CreateClient(); + var response = await client.GetAsync("/"); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } + Assert.Equal(HttpStatusCode.OK, response.StatusCode); } } } diff --git a/test/YesSql.Tests/YesSql.Tests.csproj b/test/YesSql.Tests/YesSql.Tests.csproj index ecd76c38..7cbec95b 100644 --- a/test/YesSql.Tests/YesSql.Tests.csproj +++ b/test/YesSql.Tests/YesSql.Tests.csproj @@ -1,6 +1,7 @@ + - net6.0;net7.0 + net6.0;net7.0;net8.0 latest YesSql.Tests YesSql.Tests @@ -21,26 +22,29 @@ - + + 8.0.0 + + + 7.0.13 - 17.7.2 6.0.24 - 16.10.0 - + + all runtime; build; native; contentfiles; analyzers - + @@ -49,12 +53,15 @@ + + PreserveNewest +