Commit a945ff6
committed
Merge branch '7.0' into 7.1
# Conflicts:
# Orm/Xtensive.Orm.Firebird/Xtensive.Orm.Firebird.csproj
# Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj
# Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj
# Orm/Xtensive.Orm.Tests/Storage/SessionEventsTest.cs
# Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj
# Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs
# Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs
# Orm/Xtensive.Orm/Orm/Rse/RecordSetHeader.cs
# Version.propsFile tree
21 files changed
+2991
-182
lines changed- ChangeLog
- Orm
- Xtensive.Orm.Manual/DomainAndSession
- Xtensive.Orm.MySql
- Xtensive.Orm.Oracle
- Xtensive.Orm.PostgreSql
- Xtensive.Orm.Sqlite
- Xtensive.Orm.Tests
- Issues
- Xtensive.Orm/Orm
- Linq
- Expressions
- Rse
- Providers/Compilable
- Transformation
21 files changed
+2991
-182
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
43 | | - | |
| 42 | + | |
44 | 43 | | |
45 | 44 | | |
46 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
0 commit comments