Commit 2b71090
committed
Merge branch '6.0' into 7.0
# Conflicts:
# Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Azure/Extractor.cs
# Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v11/Extractor.cs
# Orm/Xtensive.Orm/Orm/Building/Builders/PartialIndexFilterBuilder.cs
# Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/SimpleCommandProcessor.cs
# Orm/Xtensive.Orm/Orm/Providers/Interfaces/IProviderExecutor.cs
# Orm/Xtensive.Orm/Orm/Providers/SqlSessionHandler.IProviderExecutor.cs
# Orm/Xtensive.Orm/Orm/Providers/SqlSessionHandler.cs
# Orm/Xtensive.Orm/Orm/Providers/SqlStoreProvider.cs
# Orm/Xtensive.Orm/Orm/Providers/SqlTemporaryDataProvider.cs
# Orm/Xtensive.Orm/Orm/Providers/StorageDriver.Operations.cs
# Orm/Xtensive.Orm/Orm/Rse/Providers/Executable/ExecutableRawProvider.cs
# Orm/Xtensive.Orm/Orm/Rse/Providers/ExecutableProvider.cs
# Orm/Xtensive.Orm/Orm/Rse/RecordSet.cs
# Version.propsFile tree
21 files changed
+1975
-324
lines changed- ChangeLog
- Orm
- Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer
- Azure
- v11
- Xtensive.Orm.Tests.Sql/SqlServer
- Xtensive.Orm.Tests
- Linq
- Storage
- Upgrade
- Xtensive.Orm/Orm
- Building/Builders
- Linq
- Providers
- Interfaces
- Rse
- Providers
- Executable
21 files changed
+1975
-324
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 2 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | 7 | | |
11 | 8 | | |
12 | 9 | | |
13 | 10 | | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | 11 | | |
22 | 12 | | |
23 | 13 | | |
24 | 14 | | |
25 | 15 | | |
26 | 16 | | |
27 | 17 | | |
28 | | - | |
| 18 | + | |
Lines changed: 24 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
| |||
57 | 60 | | |
58 | 61 | | |
59 | 62 | | |
| 63 | + | |
60 | 64 | | |
61 | 65 | | |
62 | 66 | | |
| |||
74 | 78 | | |
75 | 79 | | |
76 | 80 | | |
| 81 | + | |
77 | 82 | | |
78 | | - | |
| 83 | + | |
| 84 | + | |
79 | 85 | | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
86 | 97 | | |
87 | 98 | | |
88 | 99 | | |
| |||
95 | 106 | | |
96 | 107 | | |
97 | 108 | | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
98 | 114 | | |
99 | 115 | | |
100 | | - | |
| 116 | + | |
0 commit comments