Skip to content

Commit ace167e

Browse files
authored
Merge branch 'master' into upstream/buildDomains
2 parents 1f0ba1d + 0afc1c1 commit ace167e

155 files changed

Lines changed: 722 additions & 1604 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.

ChangeLog/7.1.0-Beta-2-dev.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
[main] Obsolete CatalogHelper class has been removed
2+
[main] Obsolete ReacreateTableHint has been removed
3+
[main] Obsolete Session.SelectStorageNode() method is removed
4+
[main] Obsolete methods from ArrayExtensions, EnumerableExtensions and QueryableExtensions have been removed
5+
[main] Obsolete DeleteDataHint.PostCopy property has been removed
6+
[main] Obsolete QueryEndpoint's members have been removed
7+
[main] Obsolete Query's members have been removed
8+
[main] Obsolete members of DelayedScalarQuery<T> have been removed
9+
[main] Obsolete FieldInfo.IsDynalicallyDefined property's been removed (FieldInfo.IsDynamicallyDefined is still there)
110
[main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
211
[main] DbCommandEventArgs became read-only structure
312
[main] BitFaster.Caching package reference is updated to 1.0.7
413
[main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
514
[reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure
615
[reprocessing] ExecuteErrorEventArgs (not sealed) became read-only structure
7-
[tracking] TrackingCompletedEventArgs (sealed) became read-only structure
16+
[tracking] TrackingCompletedEventArgs (sealed) became read-only structure
17+
[Web] Removed Obsolete SessionManager and StartupConfigurationExtension

Extensions/Xtensive.Orm.Logging.NLog/Log.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2013-2020 Xtensive LLC.
1+
// Copyright (C) 2013-2020 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Dmitri Maximov
@@ -40,7 +40,7 @@ public override bool IsLogged(LogLevel level)
4040
}
4141

4242
/// <inheritdoc/>
43-
public override void Write(LogEventInfo info)
43+
public override void Write(in LogEventInfo info)
4444
{
4545
if (info.Exception!=null)
4646
target.Log(ConvertLevel(info.Level), info.Exception, info.FormattedMessage);

Extensions/Xtensive.Orm.Logging.log4net/Log.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2014-2020 Xtensive LLC.
1+
// Copyright (C) 2014-2020 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Alexey Kulakov
@@ -43,7 +43,7 @@ public override bool IsLogged(LogLevel level)
4343
}
4444

4545
/// <inheritdoc />
46-
public override void Write(LogEventInfo info)
46+
public override void Write(in LogEventInfo info)
4747
{
4848
target.Logger.Log(target.Logger.GetType(), ConvertLevel(info.Level), info.FormattedMessage, info.Exception);
4949
}

Extensions/Xtensive.Orm.Web/SessionManager.cs

Lines changed: 0 additions & 229 deletions
This file was deleted.

Extensions/Xtensive.Orm.Web/StartupConfigurationExtensions.cs

Lines changed: 0 additions & 54 deletions
This file was deleted.

Orm/Xtensive.Orm.Tests.Core/DotNetFramework/NewTupleLogicTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private void Test(int count)
150150
TestTupleAccess(new NonBoxingTuple(), count);
151151
}
152152
else {
153-
using (TestLog.InfoRegion("With boxing")) {
153+
using(TestLog.InfoRegion("With boxing")) {
154154
TestTupleAccess(new BoxingTuple(), count);
155155
}
156156
using (TestLog.InfoRegion("Without boxing")) {

Orm/Xtensive.Orm.Tests.Core/DotNetFramework/ThreadingTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,13 @@ private void LockTest(double speedFactor, int threadCount)
220220

221221
TestHelper.CollectGarbage();
222222
if (warmup) {
223-
ThreadedTest(target, passCountBase, target.ExecuteLock);
224-
ThreadedTest(target, passCountBase, target.ExecuteReadLock);
225-
ThreadedTest(target, passCountBase, target.ExecuteWriteLock);
226-
if (threadCount>1) {
227-
ThreadedTest(target, passCountBase / 200, target.ExecuteWaitLock);
228-
ThreadedTest(target, passCountBase / 400, target.ExecuteSleepLock);
229-
}
223+
ThreadedTest(target, passCountBase, target.ExecuteLock);
224+
ThreadedTest(target, passCountBase, target.ExecuteReadLock);
225+
ThreadedTest(target, passCountBase, target.ExecuteWriteLock);
226+
if (threadCount>1) {
227+
ThreadedTest(target, passCountBase / 200, target.ExecuteWaitLock);
228+
ThreadedTest(target, passCountBase / 400, target.ExecuteSleepLock);
229+
}
230230
}
231231
else {
232232
using (TestLog.InfoRegion(string.Format("{0} threads", threadCount))) {

0 commit comments

Comments
 (0)