Skip to content

Commit a945ff6

Browse files
committed
Merge branch '7.0' into 7.1
# Conflicts: # Orm/Xtensive.Orm.Firebird/Xtensive.Orm.Firebird.csproj # Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj # Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj # Orm/Xtensive.Orm.Tests/Storage/SessionEventsTest.cs # Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj # Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs # Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs # Orm/Xtensive.Orm/Orm/Rse/RecordSetHeader.cs # Version.props
2 parents 11ff59c + 10f1d4c commit a945ff6

21 files changed

+2991
-182
lines changed

ChangeLog/6.0.14_Z_Final.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[main] Addressed issue of not visiting grouping expression correctly which appeared in previous version
2+
[main] Addressed certain issues of incorrect query optimization when it contains multiple In() calls
3+
[main] In addition to previous version, more cases of incorrect join type usage addressed
4+
[firebird] Updated client library package to version 6.7.0
5+
[mysql] Updated client library package to version 6.10.9
6+
[oracle] Updated client library package to version 2.18.151
7+
[postgresql] Updated Npgsql package to version 4.0.17 which patches some vulnerablity issues
8+
[sqlserver] Updated client library package to version 4.8.6
9+
[sqlite] Updated client library package to version 1.0.119

ChangeLog/7.0.6_Z_Final.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[main] Addressed issue of not visiting grouping expression correctly which appeared in previous version
2+
[mysql] Updated client library package to version 8.0.31
3+
[postgresql] Updated client library package to version 4.1.14

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class DomainAndSessionSample : HasConfigurationAccessTest
4646
public const string OracleUrl1 = @"oracle://user:password@localhost/MyDatabase";
4747
public const string OracleUrl2 = @"oracle://user:password@dbServer:5511/MyDatabase";
4848
public const string PostrgeSqlUrl1 = @"postgresql://user:[email protected]:8032/MyDatabase?Encoding=Unicode";
49-
public const string PostrgeSqlUrl2 = @"postgresql://user:password@dbServer/MyDatabase?Pooling=on&MinPoolSize=1&MaxPoolSize=5";
49+
public const string PostrgeSqlUrl2 = @"postgresql://user:password@dbServer/MyDatabase?Pooling=True&MinPoolSize=1&MaxPoolSize=5";
5050
public const string InMemoryUrl = @"memory://localhost/MyDatabase";
5151

5252
#endregion

Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj

Lines changed: 2 additions & 3 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
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -39,8 +39,7 @@
3939
</EmbeddedResource>
4040
</ItemGroup>
4141
<ItemGroup>
42-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
43-
<PackageReference Include="MySql.Data" Version="8.0.30" />
42+
<PackageReference Include="MySql.Data" Version="8.0.31" />
4443
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
4544
</ItemGroup>
4645
<ItemGroup>

Orm/Xtensive.Orm.Oracle/Xtensive.Orm.Oracle.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</Content>
2626
</ItemGroup>
2727
<ItemGroup>
28-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />
28+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.151" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</Content>
2626
</ItemGroup>
2727
<ItemGroup>
28-
<PackageReference Include="Npgsql" Version="4.1.3.1" />
28+
<PackageReference Include="Npgsql" Version="4.1.14" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

Orm/Xtensive.Orm.Sqlite/Xtensive.Orm.Sqlite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</Content>
2626
</ItemGroup>
2727
<ItemGroup>
28-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
28+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

0 commit comments

Comments
 (0)