Skip to content

Commit 7099f7d

Browse files
alex-kulakovalex-kulakov
committed
Merge branch '6.0' into 7.0
# Conflicts: # .github/workflows/auto-pgsql92-tests.yml # Version.props
2 parents fce61f5 + ee08d04 commit 7099f7d

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
1818
- 'Orm/Xtensive.Orm/Sql/**'
1919
# provider
20-
- 'Orm/Xtensive.Orm.MySql/**'
21-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
22-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
20+
- 'Orm/Xtensive.Orm.PostgreSql/**'
21+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
22+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
2323
# main test project - any code change
2424
- 'Orm/Xtensive.Orm.Tests/Issues/**'
2525
- 'Orm/Xtensive.Orm.Tests/Storage/**'
@@ -51,9 +51,9 @@ on:
5151
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
5252
- 'Orm/Xtensive.Orm/Sql/**'
5353
# provider
54-
- 'Orm/Xtensive.Orm.MySql/**'
55-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
56-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
54+
- 'Orm/Xtensive.Orm.PostgreSql/**'
55+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
56+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
5757
# main test project - any code change
5858
- 'Orm/Xtensive.Orm.Tests/Issues/**'
5959
- 'Orm/Xtensive.Orm.Tests/Storage/**'
@@ -85,9 +85,9 @@ on:
8585
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
8686
- 'Orm/Xtensive.Orm/Sql/**'
8787
# provider
88-
- 'Orm/Xtensive.Orm.MySql/**'
89-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
90-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
88+
- 'Orm/Xtensive.Orm.PostgreSql/**'
89+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
90+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
9191
# main test project - any code change
9292
- 'Orm/Xtensive.Orm.Tests/Issues/**'
9393
- 'Orm/Xtensive.Orm.Tests/Storage/**'

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
1818
- 'Orm/Xtensive.Orm/Sql/**'
1919
# provider
20-
- 'Orm/Xtensive.Orm.MySql/**'
21-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
22-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
20+
- 'Orm/Xtensive.Orm.PostgreSql/**'
21+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
22+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
2323
# main test project - any code change
2424
- 'Orm/Xtensive.Orm.Tests/Issues/**'
2525
- 'Orm/Xtensive.Orm.Tests/Storage/**'
@@ -50,9 +50,9 @@ on:
5050
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
5151
- 'Orm/Xtensive.Orm/Sql/**'
5252
# provider
53-
- 'Orm/Xtensive.Orm.MySql/**'
54-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
55-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
53+
- 'Orm/Xtensive.Orm.PostgreSql/**'
54+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
55+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
5656
# main test project - any code change
5757
- 'Orm/Xtensive.Orm.Tests/Issues/**'
5858
- 'Orm/Xtensive.Orm.Tests/Storage/**'
@@ -84,9 +84,9 @@ on:
8484
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
8585
- 'Orm/Xtensive.Orm/Sql/**'
8686
# provider
87-
- 'Orm/Xtensive.Orm.MySql/**'
88-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
89-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
87+
- 'Orm/Xtensive.Orm.PostgreSql/**'
88+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
89+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
9090
# main test project - any code change
9191
- 'Orm/Xtensive.Orm.Tests/Issues/**'
9292
- 'Orm/Xtensive.Orm.Tests/Storage/**'

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ on:
1717
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
1818
- 'Orm/Xtensive.Orm/Sql/**'
1919
# provider
20-
- 'Orm/Xtensive.Orm.MySql/**'
21-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
22-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
23-
# main test project - any code change
20+
- 'Orm/Xtensive.Orm.PostgreSql/**'
21+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
22+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
23+
# main test project - only most significant parts
2424
- 'Orm/Xtensive.Orm.Tests/Issues/**'
2525
- 'Orm/Xtensive.Orm.Tests/Storage/**'
2626
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'
@@ -57,10 +57,10 @@ on:
5757
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
5858
- 'Orm/Xtensive.Orm/Sql/**'
5959
# provider
60-
- 'Orm/Xtensive.Orm.MySql/**'
61-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
62-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
63-
# main test project - any code change
60+
- 'Orm/Xtensive.Orm.PostgreSql/**'
61+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
62+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
63+
# main test project - only most significant parts
6464
- 'Orm/Xtensive.Orm.Tests/Issues/**'
6565
- 'Orm/Xtensive.Orm.Tests/Storage/**'
6666
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'
@@ -91,10 +91,10 @@ on:
9191
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
9292
- 'Orm/Xtensive.Orm/Sql/**'
9393
# provider
94-
- 'Orm/Xtensive.Orm.MySql/**'
95-
- '!Orm/Xtensive.Orm.MySql/**.csproj'
96-
- '!Orm/Xtensive.Orm.MySql/NuGetContent/**'
97-
# main test project - any code change
94+
- 'Orm/Xtensive.Orm.PostgreSql/**'
95+
- '!Orm/Xtensive.Orm.PostgreSql/**.csproj'
96+
- '!Orm/Xtensive.Orm.PostgreSql/NuGetContent/**'
97+
# main test project - only most significant parts
9898
- 'Orm/Xtensive.Orm.Tests/Issues/**'
9999
- 'Orm/Xtensive.Orm.Tests/Storage/**'
100100
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'

0 commit comments

Comments
 (0)