Skip to content

Commit 299ccda

Browse files
lukebakkenlukebakken
authored
Merge pull request #1599 from WeihanLi/cpm-support
nuget CPM support
2 parents bf15067 + 56b0a0d commit 299ccda

File tree

12 files changed

+86
-54
lines changed

12 files changed

+86
-54
lines changed

‎projects/Benchmarks/Benchmarks.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
23-
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
22+
<PackageReference Include="BenchmarkDotNet" />
23+
<PackageReference Include="Ductus.FluentDocker" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<ProjectReference Include="../RabbitMQ.Client/RabbitMQ.Client.csproj" />
28-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
2928
</ItemGroup>
3029

3130
</Project>

‎projects/Directory.Packages.props

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
7+
<PackageVersion Include="Ductus.FluentDocker" Version="2.10.59" />
8+
<PackageVersion Include="EasyNetQ.Management.Client" Version="2.0.0" />
9+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
10+
<PackageVersion Include="OpenTelemetry.Api" Version="1.7.0" />
11+
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.8.0" />
12+
<!--
13+
Note: do NOT upgrade the System.IO.Pipelines dependency unless necessary
14+
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
15+
-->
16+
<PackageVersion Include="System.IO.Pipelines" Version="6.0.0" />
17+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
18+
<PackageVersion Include="WireMock.Net" Version="1.5.49" />
19+
<PackageVersion Include="xunit" Version="2.7.0" />
20+
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
21+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
22+
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
23+
</ItemGroup>
24+
<ItemGroup Condition="$(TargetFramework)=='netstandard2.0'">
25+
<!--
26+
Note: do NOT upgrade these dependencies unless necessary
27+
See:
28+
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
29+
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1594
30+
-->
31+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
32+
<PackageVersion Include="System.Memory" Version="4.5.5" />
33+
<PackageVersion Include="System.Threading.Channels" Version="6.0.0" />
34+
<PackageVersion Include="System.Text.Json" Version="6.0.0" />
35+
<PackageVersion Include="System.Net.Http.Json" Version="6.0.0" />
36+
</ItemGroup>
37+
<ItemGroup Condition="$(TargetFramework)=='net472'">
38+
<PackageVersion Include="System.Text.Json" Version="6.0.0" />
39+
</ItemGroup>
40+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
41+
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
42+
</ItemGroup>
43+
<ItemGroup Condition="'$(IsPackable)'=='true'">
44+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
45+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
46+
<GlobalPackageReference Include="MinVer" Version="5.0.0" />
47+
</ItemGroup>
48+
</Project>

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2222
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2323
<SignAssembly>true</SignAssembly>
24+
<IsPackable>true</IsPackable>
2425
<MinVerTagPrefix>oauth2-</MinVerTagPrefix>
2526
<MinVerVerbosity>minimal</MinVerVerbosity>
2627
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -47,15 +48,9 @@
4748
<InternalsVisibleTo Include="Benchmarks" />
4849
</ItemGroup>
4950

50-
<ItemGroup>
51-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
52-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
53-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
54-
</ItemGroup>
55-
5651
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
57-
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
58-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
52+
<PackageReference Include="System.Net.Http.Json" />
53+
<PackageReference Include="System.Text.Json" />
5954
</ItemGroup>
6055

6156
<ItemGroup>

‎projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2222
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2323
<SignAssembly>true</SignAssembly>
24+
<IsPackable>true</IsPackable>
2425
<MinVerTagPrefix>otel-</MinVerTagPrefix>
2526
<MinVerVerbosity>minimal</MinVerVerbosity>
2627
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -48,10 +49,7 @@
4849
</ItemGroup>
4950

5051
<ItemGroup>
51-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
52-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
53-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
54-
<PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
52+
<PackageReference Include="OpenTelemetry.Api" />
5553
</ItemGroup>
5654

5755
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">

‎projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2323
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2424
<SignAssembly>true</SignAssembly>
25+
<IsPackable>true</IsPackable>
2526
<MinVerTagPrefix>v</MinVerTagPrefix>
2627
<MinVerVerbosity>minimal</MinVerVerbosity>
2728
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -58,15 +59,11 @@
5859
</ItemGroup>
5960

6061
<ItemGroup>
61-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
62-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
63-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
64-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
6562
<!--
6663
Note: do NOT upgrade this dependency unless necessary
6764
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
6865
-->
69-
<PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
66+
<PackageReference Include="System.IO.Pipelines" />
7067
</ItemGroup>
7168

7269
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
@@ -76,8 +73,8 @@
7673
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
7774
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1594
7875
-->
79-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
80-
<PackageReference Include="System.Memory" Version="4.5.5" />
81-
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
76+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
77+
<PackageReference Include="System.Memory" />
78+
<PackageReference Include="System.Threading.Channels" />
8279
</ItemGroup>
8380
</Project>

‎projects/Test/AsyncIntegration/AsyncIntegration.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@
3838
-->
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
42-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
43-
<PackageReference Include="xunit" Version="2.6.6" />
44-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
42+
<PackageReference Include="xunit" />
43+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
4544
</ItemGroup>
4645

4746
</Project>

‎projects/Test/Common/Common.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="EasyNetQ.Management.Client" Version="2.0.0" />
30-
<PackageReference Include="xunit" Version="2.7.0" />
31-
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
29+
<PackageReference Include="EasyNetQ.Management.Client" />
30+
<PackageReference Include="xunit" />
31+
<PackageReference Include="xunit.abstractions" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎projects/Test/Integration/Integration.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@
3939
-->
4040

4141
<ItemGroup>
42-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
43-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
44-
<PackageReference Include="xunit" Version="2.7.0" />
45-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
46-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
42+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
43+
<PackageReference Include="xunit" />
44+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
45+
<PackageReference Include="Xunit.SkippableFact" />
4746
</ItemGroup>
4847

4948
</Project>

‎projects/Test/OAuth2/OAuth2.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
29-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
30-
<PackageReference Include="xunit" Version="2.7.0" />
31-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
32-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
33-
<PackageReference Include="System.Text.Json" Version="8.0.3" />
34-
<PackageReference Include="WireMock.Net" Version="1.5.49" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
29+
<PackageReference Include="xunit" />
30+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
31+
<PackageReference Include="System.Net.Http" />
32+
<PackageReference Condition="'$(TargetFramework)'=='net472'" Include="System.Text.Json" />
33+
<PackageReference Include="WireMock.Net" />
3534
</ItemGroup>
3635

3736
</Project>

‎projects/Test/SequentialIntegration/SequentialIntegration.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
42-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
43-
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.8.0" />
44-
<PackageReference Include="xunit" Version="2.7.0" />
45-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
46-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
42+
<PackageReference Include="OpenTelemetry.Exporter.InMemory" />
43+
<PackageReference Include="xunit" />
44+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
45+
<PackageReference Include="Xunit.SkippableFact" />
4746
</ItemGroup>
4847

4948
</Project>

0 commit comments

Comments
 (0)