Commit 34bc893
committed
Merge branch '6.0' into master
# Conflicts:
# Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj
# Orm/Xtensive.Orm.Tests/Issues/IssueGitHub0110_SimpleCommandProcessorOverridesOriginalException.cs
# Orm/Xtensive.Orm.Tests/Issues/IssueJira0546_IncorrectCachingOfQueries.cs
# Orm/Xtensive.Orm/Orm/EntitySetBase.cs
# Orm/Xtensive.Orm/Orm/Internals/EntitySetState.cs
# Orm/Xtensive.Orm/Orm/Internals/Prefetch/EntitySetTask.cs
# Orm/Xtensive.Orm/Orm/Internals/Prefetch/Fetcher.cs
# Orm/Xtensive.Orm/Orm/Internals/Prefetch/PrefetchManager.cs
# Orm/Xtensive.Orm/Orm/Internals/Prefetch/PrefetchQueryEnumerable.cs
# Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/BatchingCommandProcessor.cs
# Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/SimpleCommandProcessor.cs
# Version.propsFile tree
15 files changed
+2460
-795
lines changed- ChangeLog
- Orm
- Xtensive.Orm.Tests
- Issues
- Storage
- Xtensive.Orm/Orm
- Internals
- Prefetch
- Rse/Transformation
15 files changed
+2460
-795
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
284 | 284 | | |
285 | 285 | | |
286 | 286 | | |
287 | | - | |
| 287 | + | |
288 | 288 | | |
289 | 289 | | |
290 | 290 | | |
| |||
299 | 299 | | |
300 | 300 | | |
301 | 301 | | |
302 | | - | |
| 302 | + | |
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
| |||
0 commit comments