Skip to content

Commit 9eb4548

Browse files
committed
Merge branch 'master' into master-net10-linq-compatibility
# Conflicts: # Orm/Xtensive.Orm/Orm/Linq/Expressions/LocalCollectionExpression.cs # Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs # Orm/Xtensive.Orm/Orm/Linq/WellknownMembers.Queryable.cs # Orm/Xtensive.Orm/Reflection/WellKnown.QueryableExtensions.cs
2 parents 2f64531 + 5a323f4 commit 9eb4548

510 files changed

Lines changed: 5009 additions & 3185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-dotnets/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ runs:
1111
using: "composite"
1212

1313
steps:
14+
- name: Setup .NET 10 (if needed)
15+
if: ${{ contains(inputs.target_framework, '10.0') }}
16+
uses: actions/setup-dotnet@v4
17+
with:
18+
dotnet-version: '10.0.x'
19+
1420
- name: Setup .NET 9 (if needed)
1521
if: ${{ contains(inputs.target_framework, '9.0') }}
1622
uses: actions/setup-dotnet@v4

.github/workflows/auto-databaseless-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
name: Core Tests
100100
strategy:
101101
matrix:
102-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
102+
net: [ 'net8.0', 'net10.0' ]
103103
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
104104
#
105105
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-firebird5-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
name: Tests on Firebird 5
154154
strategy:
155155
matrix:
156-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
156+
net: [ 'net8.0' ]
157157
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
158158
#
159159
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-mssql2019-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
name: Tests on MS SQL Server 2019
145145
strategy:
146146
matrix:
147-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
147+
net: [ 'net8.0', 'net10.0' ] # only LTS
148148
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
149149
#
150150
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-mysql57-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
name: Tests on MySQL 5.7
151151
strategy:
152152
matrix:
153-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
153+
net: [ 'net8.0', 'net10.0' ] # only LTS
154154
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
155155
#
156156
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-mysql80-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
name: Tests on MySQL 8.0
154154
strategy:
155155
matrix:
156-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
156+
net: [ 'net8.0', 'net10.0' ] # only LTS
157157
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
158158
#
159159
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-mysql90-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
name: Tests on MySQL 9.0
154154
strategy:
155155
matrix:
156-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
156+
net: [ 'net8.0', 'net10.0' ] # only LTS
157157
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
158158
#
159159
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-pgsql140-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
name: Tests on PostgreSQL 14.0
145145
strategy:
146146
matrix:
147-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
147+
net: [ 'net8.0', 'net10.0' ] # only LTS
148148
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
149149
#
150150
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-pgsql170-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
name: Tests on PostgreSQL 17.0
154154
strategy:
155155
matrix:
156-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
156+
net: [ 'net8.0', 'net10.0' ] # only LTS
157157
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
158158
#
159159
# push filter - to cover pushes from the team to main branch of major version

.github/workflows/auto-sqlite3-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
name: Tests on SQLite 3
143143
strategy:
144144
matrix:
145-
net: [ 'net6.0', 'net7.0', 'net8.0' ]
145+
net: [ 'net8.0', 'net10.0' ] # only LTS
146146
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
147147
#
148148
# push filter - to cover pushes from the team to main branch of major version

0 commit comments

Comments
 (0)