Skip to content

Commit 17d674b

Browse files
committed
Merge branch '6.0-5.0-changes-port' into 6.0
2 parents b90e97d + 15192a2 commit 17d674b

File tree

133 files changed

+23500
-1528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+23500
-1528
lines changed

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/ServerInfoProvider.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2011-2020 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Csaba Beer
55
// Created: 2011.01.10
66

@@ -179,6 +179,7 @@ public override QueryInfo GetQueryInfo()
179179
queryInfo.ParameterPrefix = "@";
180180
queryInfo.MaxLength = MaxCharLength;
181181
queryInfo.MaxComparisonOperations = DoNotKnow;
182+
queryInfo.MaxQueryParameterCount = DoNotKnow;
182183
queryInfo.Features =
183184
QueryFeatures.NamedParameters |
184185
QueryFeatures.ParameterPrefix |

Orm/Xtensive.Orm.Firebird/Xtensive.Orm.Firebird.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
@@ -22,5 +22,11 @@
2222
<ItemGroup>
2323
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />
2424
</ItemGroup>
25-
25+
<ItemGroup>
26+
<Compile Update="Sql.Drivers.Firebird\Resources\Strings.Designer.cs">
27+
<DesignTime>True</DesignTime>
28+
<AutoGen>True</AutoGen>
29+
<DependentUpon>Strings.resx</DependentUpon>
30+
</Compile>
31+
</ItemGroup>
2632
</Project>

Orm/Xtensive.Orm.Manual/DomainAndSession/DomainAndSessionSample.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2009-2020 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Alex Kofman
55
// Created: 2009.06.17
66

Orm/Xtensive.Orm.Manual/ModellingDomain/AuditAndOpenGenericsTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2009-2020 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Alex Kofman
55
// Created: 2009.06.17
66

@@ -236,7 +236,7 @@ public void OnBuilt(Domain domain)
236236
Domain = domain;
237237
domain.SessionOpen += (source, args) => {
238238
args.Session.Events.TransactionOpened += TransactionOpened;
239-
args.Session.Events.TransactionCommitting += TransactionCommitting;
239+
args.Session.Events.TransactionPrecommitting += TransactionPrecommitting;
240240
args.Session.Events.EntityCreated += (sender, e) => EntityEvent(sender, e, true);
241241
args.Session.Events.EntityRemoveCompleted += (sender, e) => EntityEvent(sender, e, false);
242242
args.Session.Events.EntityFieldValueSetCompleted += (sender, e) => EntityEvent(sender, e, false);
@@ -257,7 +257,7 @@ private void TransactionOpened(object sender, TransactionEventArgs e)
257257
session.Extensions.Set(info);
258258
}
259259

260-
private void TransactionCommitting(object sender, TransactionEventArgs e)
260+
private void TransactionPrecommitting(object sender, TransactionEventArgs e)
261261
{
262262
var transaction = e.Transaction;
263263
if (transaction.IsNested)

0 commit comments

Comments
 (0)