Skip to content

Commit daac062

Browse files
committed
Merge branch '6.0' into 7.0
# Conflicts: # Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj # Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj # Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj # Orm/Xtensive.Orm/Orm/Linq/ExpressionExtensions.cs # Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs # Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs # Version.props
2 parents 6209e63 + 144e36d commit daac062

19 files changed

+2988
-178
lines changed

ChangeLog/6.0.14_Z_Final.txt

+9
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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Content>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.2.0.1" />
27+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.7.0" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

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

+1-1
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.Oracle/Xtensive.Orm.Oracle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Content>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />
27+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.151" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Content>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
27+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Content>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
27+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

0 commit comments

Comments
 (0)