Skip to content

Commit 6bbb6dc

Browse files
alex-kulakovalex-kulakov
committed
Merge branch 'master' into tuple-transform-refactoring
# Conflicts: # Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/CutInTransformTest.cs # Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/MapTransformTest.cs # Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/MergeTransformTest.cs # Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/ReadOnlyTransformTest.cs # Orm/Xtensive.Orm/Linq/ExpressionExtensions.cs # Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs # Version.props
2 parents db0a4e1 + c9c92ab commit 6bbb6dc

861 files changed

Lines changed: 19821 additions & 23924 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.

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,6 @@ dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parame
272272
dotnet_naming_rule.type_parameter_rule.symbols = type_parameter_group
273273
dotnet_naming_rule.type_parameter_rule.style = capital_t_prefix_style
274274
dotnet_naming_rule.type_parameter_rule.severity = warning
275+
276+
# IDE0040: Add accessibility modifiers
277+
dotnet_diagnostic.IDE0040.severity = suggestion

‎.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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Core tests triggered by '${{ github.event_name }}'. Run No ${{ github.
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# extensions
1111
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -32,7 +32,7 @@ on:
3232

3333
pull_request:
3434
branches:
35-
- '7.2'
35+
- 'master'
3636
paths:
3737
# extensions
3838
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -59,7 +59,7 @@ on:
5959

6060
pull_request_review:
6161
branches:
62-
- '7.2'
62+
- 'master'
6363
paths:
6464
# extensions
6565
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -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
@@ -110,13 +110,13 @@ jobs:
110110
github.event_name == 'push'
111111
|| (github.event_name == 'pull_request_review'
112112
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
113-
&& startsWith(github.event.pull_request.base.ref, '7.2')
113+
&& startsWith(github.event.pull_request.base.ref, 'master')
114114
&& github.event.review.state == 'approved')
115115
|| (github.event_name == 'pull_request'
116116
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
117-
&& !startsWith(github.head_ref, '7.2-'))
117+
&& !startsWith(github.head_ref, 'master-'))
118118
119-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-independant-tests.yml@7.2
119+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-independant-tests.yml@master
120120
with:
121121
build_config: Release
122122
target_framework: ${{ matrix.net }}

‎.github/workflows/auto-firebird3-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on Firebird 3 tests triggered by '${{ github.event_name }}'. Run
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/firebird/do-firebird-3_0'
@@ -50,7 +50,7 @@ on:
5050

5151
pull_request:
5252
branches:
53-
- '7.2'
53+
- 'master'
5454
paths:
5555
# containers
5656
- 'Containers/firebird/do-firebird-3_0'
@@ -95,7 +95,7 @@ on:
9595

9696
pull_request_review:
9797
branches:
98-
- '7.2'
98+
- 'master'
9999
paths:
100100
# containers
101101
- 'Containers/firebird/do-firebird-3_0'
@@ -164,12 +164,12 @@ jobs:
164164
github.event_name == 'push'
165165
|| (github.event_name == 'pull_request_review'
166166
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
167-
&& startsWith(github.event.pull_request.base.ref, '7.2')
167+
&& startsWith(github.event.pull_request.base.ref, 'master')
168168
&& github.event.review.state == 'approved')
169169
|| (github.event_name == 'pull_request'
170170
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
171-
&& !startsWith(github.head_ref, '7.2-'))
172-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
171+
&& !startsWith(github.head_ref, 'master-'))
172+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
173173
with:
174174
storage: firebird30
175175
build_config: Release

‎.github/workflows/auto-firebird4-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on Firebird 4 tests triggered by '${{ github.event_name }}'. Run
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/firebird/do-firebird-4_0'
@@ -39,7 +39,7 @@ on:
3939

4040
pull_request:
4141
branches:
42-
- '7.2'
42+
- 'master'
4343
paths:
4444
# containers
4545
- 'Containers/firebird/do-firebird-4_0'
@@ -73,7 +73,7 @@ on:
7373

7474
pull_request_review:
7575
branches:
76-
- '7.2'
76+
- 'master'
7777
paths:
7878
# containers
7979
- 'Containers/firebird/do-firebird-4_0'
@@ -131,12 +131,12 @@ jobs:
131131
github.event_name == 'push'
132132
|| (github.event_name == 'pull_request_review'
133133
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
134-
&& startsWith(github.event.pull_request.base.ref, '7.2')
134+
&& startsWith(github.event.pull_request.base.ref, 'master')
135135
&& github.event.review.state == 'approved')
136136
|| (github.event_name == 'pull_request'
137137
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
138-
&& !startsWith(github.head_ref, '7.2-'))
139-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
138+
&& !startsWith(github.head_ref, 'master-'))
139+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
140140
with:
141141
storage: firebird40
142142
build_config: Release

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on Firebird 5 tests triggered by '${{ github.event_name }}'. Run
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/firebird/do-firebird-5_0'
@@ -50,7 +50,7 @@ on:
5050

5151
pull_request:
5252
branches:
53-
- '7.2'
53+
- 'master'
5454
paths:
5555
# containers
5656
- 'Containers/firebird/do-firebird-5_0'
@@ -95,7 +95,7 @@ on:
9595

9696
pull_request_review:
9797
branches:
98-
- '7.2'
98+
- 'master'
9999
paths:
100100
# containers
101101
- 'Containers/firebird/do-firebird-5_0'
@@ -164,12 +164,12 @@ jobs:
164164
github.event_name == 'push'
165165
|| (github.event_name == 'pull_request_review'
166166
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
167-
&& startsWith(github.event.pull_request.base.ref, '7.2')
167+
&& startsWith(github.event.pull_request.base.ref, 'master')
168168
&& github.event.review.state == 'approved')
169169
|| (github.event_name == 'pull_request'
170170
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
171-
&& !startsWith(github.head_ref, '7.2-'))
172-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
171+
&& !startsWith(github.head_ref, 'master-'))
172+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
173173
with:
174174
storage: firebird50
175175
build_config: Release

‎.github/workflows/auto-mssql2017-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on MS SQL Server 2017 tests triggered by '${{ github.event_name
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/mssql/do-mssql-2017'
@@ -38,7 +38,7 @@ on:
3838
- 'TestFileForBuildServerTests.txt'
3939
pull_request:
4040
branches:
41-
- '7.2'
41+
- 'master'
4242
paths:
4343
# containers
4444
- 'Containers/mssql/do-mssql-2017'
@@ -72,7 +72,7 @@ on:
7272

7373
pull_request_review:
7474
branches:
75-
- '7.2'
75+
- 'master'
7676
paths:
7777
# containers
7878
- 'Containers/mssql/do-mssql-2017'
@@ -130,12 +130,12 @@ jobs:
130130
github.event_name == 'push'
131131
|| (github.event_name == 'pull_request_review'
132132
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
133-
&& startsWith(github.event.pull_request.base.ref, '7.2')
133+
&& startsWith(github.event.pull_request.base.ref, 'master')
134134
&& github.event.review.state == 'approved')
135135
|| (github.event_name == 'pull_request'
136136
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
137-
&& !startsWith(github.head_ref, '7.2-'))
138-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
137+
&& !startsWith(github.head_ref, 'master-'))
138+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
139139
with:
140140
storage: mssql2017
141141
build_config: Release

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on MS SQL Server 2019 tests triggered by '${{ github.event_name
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/mssql/do-mssql-2019'
@@ -47,7 +47,7 @@ on:
4747

4848
pull_request:
4949
branches:
50-
- '7.2'
50+
- 'master'
5151
paths:
5252
# containers
5353
- 'Containers/mssql/do-mssql-2019'
@@ -89,7 +89,7 @@ on:
8989

9090
pull_request_review:
9191
branches:
92-
- '7.2'
92+
- 'master'
9393
paths:
9494
# containers
9595
- 'Containers/mssql/do-mssql-2019'
@@ -144,7 +144,7 @@ jobs:
144144
name: Tests on MS SQL Server 2019
145145
strategy:
146146
matrix:
147-
net: [ 'net6.0', 'net8.0' ] # only LTS
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
@@ -155,12 +155,12 @@ jobs:
155155
github.event_name == 'push'
156156
|| (github.event_name == 'pull_request_review'
157157
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
158-
&& startsWith(github.event.pull_request.base.ref, '7.2')
158+
&& startsWith(github.event.pull_request.base.ref, 'master')
159159
&& github.event.review.state == 'approved')
160160
|| (github.event_name == 'pull_request'
161161
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
162-
&& !startsWith(github.head_ref, '7.2-'))
163-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
162+
&& !startsWith(github.head_ref, 'master-'))
163+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
164164
with:
165165
storage: mssql2019
166166
build_config: Release

‎.github/workflows/auto-mssql2022-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on MS SQL Server 2022 tests triggered by '${{ github.event_name
44
on:
55
push:
66
branches:
7-
- '7.2'
8-
- '7.2-*'
7+
- 'master'
8+
- 'master-*'
99
paths:
1010
# containers
1111
- 'Containers/mssql/do-mssql-2022'
@@ -38,7 +38,7 @@ on:
3838
- 'TestFileForBuildServerTests.txt'
3939
pull_request:
4040
branches:
41-
- '7.2'
41+
- 'master'
4242
paths:
4343
# containers
4444
- 'Containers/mssql/do-mssql-2022'
@@ -72,7 +72,7 @@ on:
7272

7373
pull_request_review:
7474
branches:
75-
- '7.2'
75+
- 'master'
7676
paths:
7777
# containers
7878
- 'Containers/mssql/do-mssql-2022'
@@ -130,12 +130,12 @@ jobs:
130130
github.event_name == 'push'
131131
|| (github.event_name == 'pull_request_review'
132132
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
133-
&& startsWith(github.event.pull_request.base.ref, '7.2')
133+
&& startsWith(github.event.pull_request.base.ref, 'master')
134134
&& github.event.review.state == 'approved')
135135
|| (github.event_name == 'pull_request'
136136
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
137-
&& !startsWith(github.head_ref, '7.2-'))
138-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.2
137+
&& !startsWith(github.head_ref, 'master-'))
138+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@master
139139
with:
140140
storage: mssql2022
141141
build_config: Release

0 commit comments

Comments
 (0)