Skip to content

Commit fc38bca

Browse files
SergeiPavlovSergeiPavlov
authored
Merge branch 'master' into upstream/update_sql
2 parents b6b449b + 5229164 commit fc38bca

40 files changed

+715
-719
lines changed

‎Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@
6161
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net6.0;net5.0</TargetFrameworks> <!-- fallback to default -->
6262
</PropertyGroup>
6363

64+
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
65+
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
66+
<DebugSymbols>true</DebugSymbols>
67+
<DebugType>portable</DebugType>
68+
</PropertyGroup>
69+
70+
<PropertyGroup Condition = "$(Configuration.Contains('Release')) == 'true'">
71+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
72+
</PropertyGroup>
73+
6474
<PropertyGroup>
6575
<NoLogo>true</NoLogo>
6676
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@
88
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
99
</PropertyGroup>
1010
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
11+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
12+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
13+
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
15+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
16+
</ItemGroup>
1117
<ItemGroup>
1218
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1319
<PackageReference Include="NUnit" Version="3.13.2" />
1420
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
15-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1621
</ItemGroup>
1722
<ItemGroup>
1823
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
<SignAssembly>true</SignAssembly>
1313
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
15-
<ItemGroup>
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1717
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
20+
</ItemGroup>
1821
<ItemGroup>
1922
<None Include="Readme.txt" />
2023
</ItemGroup>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
1515
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
16-
<ItemGroup>
16+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1818
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
21+
</ItemGroup>
1922
<ItemGroup>
2023
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2124
</ItemGroup>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
<SignAssembly>true</SignAssembly>
1313
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
15-
<ItemGroup>
15+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1717
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
20+
</ItemGroup>
1821
<ItemGroup>
1922
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
2023
</ItemGroup>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515
<ItemGroup>
1616
<None Include="Readme.txt" />
1717
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
20+
</ItemGroup>
21+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
22+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
23+
</ItemGroup>
1824
<ItemGroup>
1925
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
2026
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
2127
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
2228
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
23-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
2429
</ItemGroup>
2530
<ItemGroup>
2631
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Orm/Xtensive.Orm.Manual/Xtensive.Orm.Manual.csproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,6 @@
1212
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1313
<WarningLevel>2</WarningLevel>
1414
</PropertyGroup>
15-
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
16-
<DefineConstants>TRACE;DEBUG</DefineConstants>
17-
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET6'">
19-
<DefineConstants>TRACE;DEBUG</DefineConstants>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET5'">
22-
<DefineConstants>TRACE;DEBUG</DefineConstants>
23-
</PropertyGroup>
24-
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
25-
<DefineConstants>TRACE</DefineConstants>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET5'">
28-
<DefineConstants>TRACE</DefineConstants>
29-
</PropertyGroup>
30-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET6'">
31-
<DefineConstants>TRACE</DefineConstants>
32-
</PropertyGroup>
3315
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
3416
<ItemGroup>
3517
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,6 @@
1515
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1616
<WarningLevel>2</WarningLevel>
1717
</PropertyGroup>
18-
<PropertyGroup Label="Debug" Condition="'$(Configuration)'=='Debug'">
19-
<DefineConstants>TRACE;DEBUG</DefineConstants>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET6'" Label="Debug">
22-
<DefineConstants>TRACE;DEBUG</DefineConstants>
23-
</PropertyGroup>
24-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET5'" Label="Debug">
25-
<DefineConstants>TRACE;DEBUG</DefineConstants>
26-
</PropertyGroup>
27-
<PropertyGroup Label="Release" Condition="'$(Configuration)'=='Release'">
28-
<DefineConstants>TRACE</DefineConstants>
29-
</PropertyGroup>
30-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET5'" Label="Release">
31-
<DefineConstants>TRACE</DefineConstants>
32-
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET6'" Label="Release">
34-
<DefineConstants>TRACE</DefineConstants>
35-
</PropertyGroup>
3618
<ItemGroup>
3719
<PackageReference Include="Npgsql" Version="4.1.3.1" />
3820
</ItemGroup>

‎Orm/Xtensive.Orm.Tests.Core/Xtensive.Orm.Tests.Core.csproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,6 @@
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1212
<WarningLevel>2</WarningLevel>
1313
</PropertyGroup>
14-
<PropertyGroup Label="Debug" Condition="'$(Configuration)'=='Debug'">
15-
<DefineConstants>TRACE;DEBUG</DefineConstants>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET6'" Label="Debug">
18-
<DefineConstants>TRACE;DEBUG</DefineConstants>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(Configuration)'=='Debug-NET5'" Label="Debug">
21-
<DefineConstants>TRACE;DEBUG</DefineConstants>
22-
</PropertyGroup>
23-
<PropertyGroup Label="Release" Condition="'$(Configuration)'=='Release'">
24-
<DefineConstants>TRACE</DefineConstants>
25-
</PropertyGroup>
26-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET5'" Label="Release">
27-
<DefineConstants>TRACE</DefineConstants>
28-
</PropertyGroup>
29-
<PropertyGroup Condition="'$(Configuration)'=='Release-NET6'" Label="Release">
30-
<DefineConstants>TRACE</DefineConstants>
31-
</PropertyGroup>
3214
<ItemGroup>
3315
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />
3416
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Orm/Xtensive.Orm.Tests.Framework/DomainModelExtensions.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static void Dump(this TypeInfoCollection target)
8181

8282
public static void DumpAncestor(this TypeInfo target, int indent)
8383
{
84-
TypeInfo ancestor = target.GetAncestor();
84+
TypeInfo ancestor = target.Ancestor;
8585
if (ancestor!=null)
8686
WriteLine(indent + 1, "Ancestor: " + ancestor.Name);
8787
else {
@@ -92,8 +92,8 @@ public static void DumpAncestor(this TypeInfo target, int indent)
9292
public static void DumpDescendants(this TypeInfo target, int indent)
9393
{
9494
WriteLine(indent, "Descendants:");
95-
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetDescendants());
96-
foreach (TypeInfo descendant in target.GetDescendants(true)) {
95+
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectDescendants);
96+
foreach (TypeInfo descendant in target.AllDescendants) {
9797
if (direct.Contains(descendant))
9898
WriteLine(indent + 1, descendant.Name + " (direct)");
9999
else
@@ -104,8 +104,8 @@ public static void DumpDescendants(this TypeInfo target, int indent)
104104
public static void DumpInterfaces(this TypeInfo target, int indent)
105105
{
106106
WriteLine(indent, "Interfaces:");
107-
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetInterfaces());
108-
foreach (TypeInfo @interface in target.GetInterfaces(true)) {
107+
var direct = target.DirectInterfaces;
108+
foreach (TypeInfo @interface in target.AllInterfaces) {
109109
if (direct.Contains(@interface))
110110
WriteLine(indent + 1, @interface.Name + " (direct)");
111111
else
@@ -116,8 +116,8 @@ public static void DumpInterfaces(this TypeInfo target, int indent)
116116
public static void DumpImplementors(this TypeInfo target, int indent)
117117
{
118118
WriteLine(indent, "Implementors:");
119-
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetImplementors());
120-
foreach (TypeInfo implementor in target.GetImplementors(true)) {
119+
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectImplementors);
120+
foreach (TypeInfo implementor in target.AllImplementors) {
121121
if (direct.Contains(implementor))
122122
WriteLine(indent + 1, implementor.Name + " (direct)");
123123
else
@@ -163,10 +163,10 @@ public static void Dump(this TypeInfo target, int indent)
163163
if (target.IsEntity) {
164164
WriteLine(indent, "Hierarchy: " + target.Hierarchy.Root.Name);
165165
if (target.Hierarchy.Root!=target)
166-
WriteLine(indent, "Ancestor: " + target.GetAncestor().Name);
166+
WriteLine(indent, "Ancestor: " + target.Ancestor.Name);
167167
}
168168
else if (target.IsInterface) {
169-
WriteLine(indent, "Implementors: " + target.GetImplementors().Select(t => t.Name).ToCommaDelimitedString());
169+
WriteLine(indent, "Implementors: " + target.DirectImplementors.Select(t => t.Name).ToCommaDelimitedString());
170170
}
171171

172172
target.DumpMappingName(indent);

0 commit comments

Comments
 (0)