Skip to content

Commit b396403

Browse files
committed
Merge branch '7.0' into 7.1
# Conflicts: # Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/DriverFactory.cs # Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/Extractor.cs # Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/Translator.cs # Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/TypeMapper.cs # Orm/Xtensive.Orm.Tests.Framework/Orm.config # Orm/Xtensive.Orm.Tests/Issues/IssueJira0208_IncorrectUpgradeSequence/UpgradeTest.cs
2 parents b3195ed + bf5991a commit b396403

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/Translator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2021-2022 Xtensive LLC.
1+
// Copyright (C) 2025 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

Orm/Xtensive.Orm.Tests.Sql/DriverFactoryTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ namespace Xtensive.Orm.Tests.Sql
8383
[TestFixture]
8484
public class DriverFactoryTest
8585
{
86-
private string provider = TestConnectionInfoProvider.GetProvider();
87-
private string url = TestConnectionInfoProvider.GetConnectionUrl();
88-
private string connectionString = TestConnectionInfoProvider.GetConnectionString();
86+
private readonly string provider = TestConnectionInfoProvider.GetProvider();
87+
private readonly string url = TestConnectionInfoProvider.GetConnectionUrl();
88+
private readonly string connectionString = TestConnectionInfoProvider.GetConnectionString();
8989

9090
[Test]
9191
public void ConnectionUrlTest()

0 commit comments

Comments
 (0)