Skip to content

Commit 0901e6c

Browse files
committed
Merge branch 'master' into master-remove-obsoletes
2 parents 2e4af97 + 5001b57 commit 0901e6c

File tree

30 files changed

+387
-90
lines changed

30 files changed

+387
-90
lines changed

ChangeLog/7.1.5_Z_Final.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[main] Addressed certain cases of overlaping server-side error by new one when temporary tables are used in query
2+
[postgresql] Improved .Milliseconds translation for types which have this part
3+
[postgresql] Improved TimeSpan.TotalMilliseconds translation
4+
[sqlserver] Database schema objects which are "microsoft shipped", e.g. created for replication mechanisms, are excluded from extraction

Extensions/Xtensive.Orm.BulkOperations/Xtensive.Orm.BulkOperations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
1818
</PropertyGroup>
1919
<ItemGroup Label="Nuget content">
20-
<Content Include="$(ProjectDir)NuGetContent\**">
20+
<Content Include="$(ProjectDir)NugetContent\**">
2121
<PackagePath>.</PackagePath>
2222
</Content>
2323
</ItemGroup>

Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2121
</ItemGroup>
2222
<ItemGroup Label="Nuget content">
23-
<Content Include="$(ProjectDir)NuGetContent\**">
23+
<Content Include="$(ProjectDir)NugetContent\**">
2424
<PackagePath>.</PackagePath>
2525
</Content>
2626
</ItemGroup>

Extensions/Xtensive.Orm.Logging.NLog/Xtensive.Orm.Logging.NLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2323
</ItemGroup>
2424
<ItemGroup Label="Nuget content">
25-
<Content Include="$(ProjectDir)NuGetContent\**">
25+
<Content Include="$(ProjectDir)NugetContent\**">
2626
<PackagePath>.</PackagePath>
2727
</Content>
2828
</ItemGroup>

Extensions/Xtensive.Orm.Logging.log4net/Xtensive.Orm.Logging.log4net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2323
</ItemGroup>
2424
<ItemGroup Label="Nuget content">
25-
<Content Include="$(ProjectDir)NuGetContent\**">
25+
<Content Include="$(ProjectDir)NugetContent\**">
2626
<PackagePath>.</PackagePath>
2727
</Content>
2828
</ItemGroup>

Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2727
</ItemGroup>
2828
<ItemGroup Label="Nuget content">
29-
<Content Include="$(ProjectDir)NuGetContent\**">
29+
<Content Include="$(ProjectDir)NugetContent\**">
3030
<PackagePath>.</PackagePath>
3131
</Content>
3232
</ItemGroup>

Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
3131
</ItemGroup>
3232
<ItemGroup Label="Nuget content">
33-
<Content Include="$(ProjectDir)NuGetContent\**">
33+
<Content Include="$(ProjectDir)NugetContent\**">
3434
<PackagePath>.</PackagePath>
3535
</Content>
3636
</ItemGroup>

Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2626
</ItemGroup>
2727
<ItemGroup Label="Nuget content">
28-
<Content Include="$(ProjectDir)NuGetContent\**">
28+
<Content Include="$(ProjectDir)NugetContent\**">
2929
<PackagePath>.</PackagePath>
3030
</Content>
3131
</ItemGroup>

Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
1717
</PropertyGroup>
1818
<ItemGroup Label="Nuget content">
19-
<Content Include="$(ProjectDir)NuGetContent\**">
19+
<Content Include="$(ProjectDir)NugetContent\**">
2020
<PackagePath>.</PackagePath>
2121
</Content>
2222
</ItemGroup>

Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/DomainHandler.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class DomainHandler : Providers.DomainHandler
2222
protected override ICompiler CreateCompiler(CompilerConfiguration configuration) =>
2323
new SqlCompiler(Handlers, configuration);
2424

25+
/// <inheritdoc/>
2526
protected override IPreCompiler CreatePreCompiler(CompilerConfiguration configuration)
2627
{
2728
var decimalAggregateCorrector = new AggregateOverDecimalColumnCorrector(Handlers.Domain.Model);

0 commit comments

Comments
 (0)