Update dependencies (#513) (#515)

sebastienros · Nov 16, 2023 · 5d5637e · 5d5637e
1 parent 3b1d745
commit 5d5637e
Show file tree

Hide file tree

Showing 13 changed files with 105 additions and 54 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,17 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\YesSql.Core\YesSql.Core.csproj" />
-    <ProjectReference Include="..\..\src\YesSql.Filters.Query\YesSql.Filters.Query.csproj" />
-    <ProjectReference Include="..\..\src\YesSql.Provider.Sqlite\YesSql.Provider.Sqlite.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\YesSql.Core\YesSql.Core.csproj" />
+        <ProjectReference Include="..\..\src\YesSql.Filters.Query\YesSql.Filters.Query.csproj" />
+        <ProjectReference Include="..\..\src\YesSql.Provider.Sqlite\YesSql.Provider.Sqlite.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,17 +1,17 @@
 <Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageVersion Include="Parlot" Version="0.0.24" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.13" />
-    <PackageVersion Include="Npgsql" Version="7.0.6" />
-    <PackageVersion Include="MySqlConnector" Version="2.2.7" />
-    <PackageVersion Include="Dapper.StrongName" Version="2.1.15" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="Parlot" Version="0.0.24" />
+        <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
+        <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.0" />
+        <PackageVersion Include="Npgsql" Version="7.0.6" />
+        <PackageVersion Include="MySqlConnector" Version="2.3.0" />
+        <PackageVersion Include="Dapper.StrongName" Version="2.1.21" />
+        <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    </ItemGroup>
 </Project>
diff --git a/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj b/src/YesSql.Filters.Query/YesSql.Filters.Query.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-      <ProjectReference Include="..\YesSql.Filters.Abstractions\YesSql.Filters.Abstractions.csproj" />
-      <ProjectReference Include="..\YesSql.Abstractions\YesSql.Abstractions.csproj" />
+        <ProjectReference Include="..\YesSql.Filters.Abstractions\YesSql.Filters.Abstractions.csproj" />
+        <ProjectReference Include="..\YesSql.Abstractions\YesSql.Abstractions.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj b/src/YesSql.Provider.MySql/YesSql.Provider.MySql.csproj
@@ -3,7 +3,9 @@
     <ItemGroup>
         <PackageReference Include="MySqlConnector" />
     </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\YesSql.Core\YesSql.Core.csproj" />
     </ItemGroup>
+
 </Project>
diff --git a/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj b/src/YesSql.Provider.PostgreSql/YesSql.Provider.PostgreSql.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <ItemGroup>
         <ProjectReference Include="..\YesSql.Core\YesSql.Core.csproj" />
     </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Npgsql" />
     </ItemGroup>
+
 </Project>
diff --git a/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj b/src/YesSql.Provider.SqlServer/YesSql.Provider.SqlServer.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <ItemGroup>
         <ProjectReference Include="..\YesSql.Core\YesSql.Core.csproj" />
     </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.Data.SqlClient" />
     </ItemGroup>
+
 </Project>
diff --git a/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj b/src/YesSql.Provider.Sqlite/YesSql.Provider.Sqlite.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <ItemGroup>
         <ProjectReference Include="..\YesSql.Core\YesSql.Core.csproj" />
     </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.Data.Sqlite" />
     </ItemGroup>
+
 </Project>
diff --git 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
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AssemblyName>YesSql.Tests</AssemblyName>
         <PackageId>YesSql.Tests</PackageId>
@@ -21,26 +22,29 @@
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
-    <!-- These versions are used for the NuGet packages that are dependent on the current TFM (default = net7.0) -->
+    <!-- These versions are used for the NuGet packages that are dependent on the current TFM (default = net8.0) -->
     <PropertyGroup>
+        <AspNetCoreTestHostPackagesVersion>8.0.0</AspNetCoreTestHostPackagesVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
         <AspNetCoreTestHostPackagesVersion>7.0.13</AspNetCoreTestHostPackagesVersion>
-        <AspNetCoreTestSdkPackagesVersion>17.7.2</AspNetCoreTestSdkPackagesVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
         <AspNetCoreTestHostPackagesVersion>6.0.24</AspNetCoreTestHostPackagesVersion>
-        <AspNetCoreTestSdkPackagesVersion>16.10.0</AspNetCoreTestSdkPackagesVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreTestHostPackagesVersion)" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(AspNetCoreTestSdkPackagesVersion)" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="xunit" Version="2.6.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.1" />
     </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\..\src\YesSql.Core\YesSql.Core.csproj" />
         <ProjectReference Include="..\..\src\YesSql.Provider.MySql\YesSql.Provider.MySql.csproj" />
@@ -49,12 +53,15 @@
         <ProjectReference Include="..\..\src\YesSql.Provider.SqlServer\YesSql.Provider.SqlServer.csproj" />
         <ProjectReference Include="..\..\src\YesSql.Filters.Query\YesSql.Filters.Query.csproj" />
     </ItemGroup>
+
     <ItemGroup>
         <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
     </ItemGroup>
+
     <ItemGroup>
         <None Update="xunit.runner.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
+
 </Project>