Skip to content

Commit

Permalink
Update packages (#597)
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienros authored Nov 15, 2024
1 parent 830b9eb commit ad35509
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 65 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion samples/YesSql.Bench/YesSql.Bench.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DebugType>portable</DebugType>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>YesSql.Bench</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DebugType>portable</DebugType>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>YesSql.Samples.FullText</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DebugType>portable</DebugType>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>YesSql.Samples.Hi</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>YesSql.Samples.Performance</AssemblyName>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Copyright>Sebastien Ros</Copyright>
<Authors>Sebastien Ros</Authors>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://github.com/sebastienros/yessql</PackageProjectUrl>
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<ItemGroup>
<PackageVersion Include="Parlot" Version="1.0.2" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.10" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />
<PackageVersion Include="Npgsql" Version="8.0.5" />
<PackageVersion Include="MySqlConnector" Version="2.3.7" />
<PackageVersion Include="MySqlConnector" Version="2.4.0" />
<PackageVersion Include="Dapper.StrongName" Version="2.1.35" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
Expand Down
19 changes: 3 additions & 16 deletions test/YesSql.Tests/YesSql.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<AssemblyName>YesSql.Tests</AssemblyName>
<PackageId>YesSql.Tests</PackageId>
Expand All @@ -21,22 +21,9 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<!-- 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.20</AspNetCoreTestHostPackagesVersion>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
<AspNetCoreTestHostPackagesVersion>7.0.20</AspNetCoreTestHostPackagesVersion>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreTestHostPackagesVersion)" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.36" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
Expand Down

0 comments on commit ad35509

Please sign in to comment.