Skip to content

Commit 073f84c

Browse files
committed
#1479 Rework conditional packages in v6 branch
Have added net 6 as a TFM and implement conditional packages
1 parent 55010ab commit 073f84c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AssemblyTitle>RabbitMQ OAuth2 Client Library for .NET</AssemblyTitle>
@@ -59,6 +59,9 @@
5959
<ItemGroup>
6060
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6161
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
62+
</ItemGroup>
63+
64+
<ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0'">
6265
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
6366
<PackageReference Include="System.Text.Json" Version="7.0.2" />
6467
</ItemGroup>

projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
55
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -62,10 +62,10 @@
6262
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6363

6464
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
65-
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
6665
</ItemGroup>
6766

68-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
67+
<ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0'">
68+
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
6969
<PackageReference Include="System.Memory" Version="4.5.5" />
7070
</ItemGroup>
7171

0 commit comments

Comments
 (0)