Skip to content

Commit 579c21f

Browse files
Copilotsebastienros
Copilot
and
sebastienros
authored
Remove net6.0 target, add net10.0 to all projects (#668)
* Initial plan * Update target frameworks: Remove net6.0, add net10.0 Co-authored-by: sebastienros <[email protected]> * Remove net6.0 conditional package versions from Versions.props Co-authored-by: sebastienros <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: sebastienros <[email protected]>
1 parent 77116da commit 579c21f

File tree

11 files changed

+30
-36
lines changed

11 files changed

+30
-36
lines changed

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,41 +52,41 @@ jobs:
5252
- uses: actions/setup-dotnet@v4
5353
with:
5454
dotnet-version: |
55-
6.0.x
5655
8.0.x
56+
10.0.x
5757
5858
- name: Build
5959
run: dotnet build --configuration Release
6060

6161
- name: Test - Sqlite .NET 8.0
6262
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net8.0
6363

64-
- name: Test - Sqlite .NET 6.0
65-
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net6.0
64+
- name: Test - Sqlite .NET 10.0
65+
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net10.0
6666

6767
- name: Test - PostgresQL .NET 8.0
6868
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net8.0
6969

70-
- name: Test - PostgresQL .NET 6.0
71-
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net6.0
70+
- name: Test - PostgresQL .NET 10.0
71+
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net10.0
7272

7373
- name: Test - MySQL .NET 8.0
7474
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net8.0
7575

76-
- name: Test - MySQL .NET 6.0
77-
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0
76+
- name: Test - MySQL .NET 10.0
77+
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net10.0
7878

7979
- name: Test - SQL Server 2019 .NET 8.0
8080
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net8.0
8181

82-
- name: Test - SQL Server 2019 .NET 6.0
83-
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
82+
- name: Test - SQL Server 2019 .NET 10.0
83+
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net10.0
8484

8585
- name: Test - PostgresQL Legacy Identity - No Schema
86-
run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net6.0
86+
run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net8.0
8787

8888
- name: Test - Sqlite Legacy Identity
89-
run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net6.0
89+
run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net8.0
9090

9191
- name: Pack with dotnet
9292
run: dotnet pack --output artifacts --configuration Release --no-restore --no-build -p:PackageVersion=$GITHUB_RUN_NUMBER

‎.github/workflows/pr.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,38 @@ jobs:
5353
- uses: actions/setup-dotnet@v4
5454
with:
5555
dotnet-version: |
56-
6.0.x
5756
8.0.x
57+
10.0.x
5858
5959
- name: Build
6060
run: dotnet build --configuration Release
6161

6262
- name: Test - Sqlite .NET 8.0
6363
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net8.0
6464

65-
- name: Test - Sqlite .NET 6.0
66-
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net6.0
65+
- name: Test - Sqlite .NET 10.0
66+
run: dotnet test --configuration Release --filter YesSql.Tests.SqliteTests --no-restore --no-build --framework net10.0
6767

6868
- name: Test - PostgresQL .NET 8.0
6969
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net8.0
7070

71-
- name: Test - PostgresQL .NET 6.0
72-
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net6.0
71+
- name: Test - PostgresQL .NET 10.0
72+
run: dotnet test --configuration Release --filter YesSql.Tests.PostgreSqlTests --no-restore --no-build --framework net10.0
7373

7474
- name: Test - MySQL .NET 8.0
7575
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net8.0
7676

77-
- name: Test - MySQL .NET 6.0
78-
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0
77+
- name: Test - MySQL .NET 10.0
78+
run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net10.0
7979

8080
- name: Test - SQL Server 2019 .NET 8.0
8181
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net8.0
8282

83-
- name: Test - SQL Server 2019 .NET 6.0
84-
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
83+
- name: Test - SQL Server 2019 .NET 10.0
84+
run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net10.0
8585

8686
- name: Test - PostgresQL Legacy Identity - No Schema
87-
run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net6.0
87+
run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net8.0
8888

8989
- name: Test - Sqlite Legacy Identity
90-
run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net6.0
90+
run: dotnet test --configuration release --filter YesSql.Tests.SqliteLegacyIdentityTests --no-restore --no-build --framework net8.0

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151
- uses: actions/setup-dotnet@v4
5252
with:
5353
dotnet-version: |
54-
6.0.x
5554
8.0.x
55+
10.0.x
5656
5757
- name: Get the version
5858
id: get_version

‎samples/YesSql.Bench/YesSql.Bench.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<DebugType>portable</DebugType>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>YesSql.Bench</AssemblyName>

‎samples/YesSql.Samples.FullText/YesSql.Samples.FullText.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<DebugType>portable</DebugType>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>YesSql.Samples.FullText</AssemblyName>

‎samples/YesSql.Samples.Hi/YesSql.Samples.Hi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<DebugType>portable</DebugType>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>YesSql.Samples.Hi</AssemblyName>

‎samples/YesSql.Samples.Performance/YesSql.Samples.Performance.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<AssemblyName>YesSql.Samples.Performance</AssemblyName>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>

‎samples/YesSql.Samples.Web/YesSql.Samples.Web.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<Copyright>Sebastien Ros</Copyright>
77
<Authors>Sebastien Ros</Authors>
8-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
8+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<DebugType>portable</DebugType>
1111
<PackageProjectUrl>https://github.com/sebastienros/yessql</PackageProjectUrl>

‎src/Versions.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,5 @@
55
<MicrosoftDataSqlClientPackageVersion>6.1.2</MicrosoftDataSqlClientPackageVersion>
66
</PropertyGroup>
77

8-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
9-
<!-- New versions depend on Microsoft.Bcl.AsyncInterfaces 9.0.* which doesn't support net6.0 -->
10-
<DapperStrongNamePackageVersion>2.1.35</DapperStrongNamePackageVersion>
118

12-
<!-- New versions don't support net6.0 -->
13-
<MicrosoftDataSqlClientPackageVersion>5.2.3</MicrosoftDataSqlClientPackageVersion>
14-
</PropertyGroup>
159
</Project>

0 commit comments

Comments
 (0)