Skip to content

Commit 558683f

Browse files
alex-kulakovalex-kulakov
committed
One version of packages for net5 and net6
1 parent 6ba683f commit 558683f

8 files changed

Lines changed: 17 additions & 30 deletions

File tree

‎Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.Tests.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
99
<PackageReference Include="NUnit" Version="3.13.2" />
1010
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
1113
</ItemGroup>
1214
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1315
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="5.0.0" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2119
</ItemGroup>
2220
<ItemGroup>
2321
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
</ItemGroup>
3232
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
3333
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
3634
</ItemGroup>
3735
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
3836
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
37+
</ItemGroup>
38+
<ItemGroup>
3939
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
4040
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
4141
</ItemGroup>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
99
<PackageReference Include="NUnit" Version="3.13.2" />
1010
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
1113
</ItemGroup>
1214
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1315
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="5.0.0" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2119
</ItemGroup>
2220
<ItemGroup>
2321
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</PropertyGroup>
1818
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
1919
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2220
</ItemGroup>
2321
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
2422
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
23+
</ItemGroup>
24+
<ItemGroup>
2525
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2727
</ItemGroup>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
99
<PackageReference Include="NUnit" Version="3.13.2" />
1010
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
1113
</ItemGroup>
1214
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1315
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="5.0.0" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2119
</ItemGroup>
2220
<ItemGroup>
2321
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1919
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
2020
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2321
</ItemGroup>
2422
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
2523
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
24+
</ItemGroup>
25+
<ItemGroup>
2626
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
2727
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2828
</ItemGroup>

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,11 @@
1414
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1515
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2017
</ItemGroup>
2118
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
2219
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2620
</ItemGroup>
2721
<ItemGroup>
28-
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->
2922
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
3023
<PackageReference Include="Npgsql" Version="4.1.3.1" />
3124
<PackageReference Include="NUnit" Version="3.13.2" />
@@ -34,7 +27,9 @@
3427
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
3528
<PackageReference Include="System.Spatial" Version="5.8.3" />
3629
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0.0" />
37-
<!-- <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />-->
30+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
3833
</ItemGroup>
3934
<ItemGroup>
4035
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,14 @@
5151
</ItemGroup>
5252
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
5353
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
54-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
55-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
5654
</ItemGroup>
5755
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
5856
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
59-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
60-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
6157
</ItemGroup>
6258
<ItemGroup Label="Packages">
6359
<PackageReference Include="BitFaster.Caching" Version="2.3.3" />
60+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
61+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
6462
</ItemGroup>
6563
<ItemGroup Label="T4 templates">
6664
<None Include="Arithmetic\Internal\PrimitiveArithmetics.tt">

0 commit comments

Comments
 (0)