Skip to content

Commit 5229164

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #276 from DataObjects-NET/master-conditional-package-refs
Framework-dependent package reference
2 parents d3b6ea9 + 72001c8 commit 5229164

File tree

7 files changed

+36
-7
lines changed

7 files changed

+36
-7
lines changed

‎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.Tests/Xtensive.Orm.Tests.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@
1212
<WarningLevel>2</WarningLevel>
1313
</PropertyGroup>
1414
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
15+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
16+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
17+
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
20+
</ItemGroup>
1521
<ItemGroup>
1622
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->
1723
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1824
<PackageReference Include="Npgsql" Version="4.1.3.1" />
1925
<PackageReference Include="NUnit" Version="3.13.2" />
2026
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
2127
<PackageReference Include="System.CodeDom" Version="4.4.0" />
22-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
2328
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
2429
<PackageReference Include="System.Spatial" Version="5.8.3" />
2530
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0.0" />

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,13 @@
4646
<Visible>false</Visible>
4747
</Content>
4848
</ItemGroup>
49-
<ItemGroup Label="Packages">
49+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
5050
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
51+
</ItemGroup>
52+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
53+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
54+
</ItemGroup>
55+
<ItemGroup Label="Packages">
5156
<PackageReference Include="BitFaster.Caching" Version="1.0.7" />
5257
</ItemGroup>
5358
<ItemGroup Label="T4 templates">

0 commit comments

Comments
 (0)