Skip to content

Commit 6f8191b

Browse files
thompson-tomothompson-tomo
authored
Upgrade test dependencies. Downgrade System.Threading.Channels, System.IO.Pipelines, System.Text.Json and System.Net.Http.Json to minimum versions necessary (#1481)
Bump Erlang version, add comment
1 parent 0866269 commit 6f8191b

File tree

8 files changed

+34
-23
lines changed

8 files changed

+34
-23
lines changed

‎.ci/windows/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"erlang": "26.2.2",
2+
"erlang": "26.2.3",
33
"rabbitmq": "3.13.0"
44
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<ItemGroup>
5151
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
5252
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
53-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
54-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
55-
<PackageReference Include="System.Text.Json" Version="8.0.1" />
53+
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
54+
</ItemGroup>
55+
56+
<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" />
5659
</ItemGroup>
5760

5861
<ItemGroup>

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,21 @@
6161
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
6262
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
6363
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
64-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
65-
<PackageReference Include="System.Memory" Version="4.5.5" />
66-
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
67-
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
64+
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
65+
<!--
66+
Note: do NOT upgrade this dependency unless necessary
67+
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
68+
-->
69+
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
6870
</ItemGroup>
6971

7072
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
73+
<!--
74+
Note: do NOT upgrade these dependencies unless necessary
75+
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
76+
-->
7177
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
78+
<PackageReference Include="System.Memory" Version="4.5.5" />
79+
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
7280
</ItemGroup>
7381
</Project>

‎projects/Test/Common/Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="xunit" Version="2.6.6" />
25+
<PackageReference Include="xunit" Version="2.7.0" />
2626
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
2727
</ItemGroup>
2828

‎projects/Test/Integration/Integration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
-->
3636

3737
<ItemGroup>
38-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
3939
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
40-
<PackageReference Include="xunit" Version="2.6.6" />
41-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
40+
<PackageReference Include="xunit" Version="2.7.0" />
41+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
4242
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
4343
</ItemGroup>
4444

‎projects/Test/OAuth2/OAuth2.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2525
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
26-
<PackageReference Include="xunit" Version="2.6.6" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
26+
<PackageReference Include="xunit" Version="2.7.0" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
2828
<PackageReference Include="System.Net.Http" Version="4.3.4" />
29-
<PackageReference Include="System.Text.Json" Version="8.0.1" />
30-
<PackageReference Include="WireMock.Net" Version="1.5.46" />
29+
<PackageReference Include="System.Text.Json" Version="8.0.3" />
30+
<PackageReference Include="WireMock.Net" Version="1.5.49" />
3131
</ItemGroup>
3232

3333
</Project>

‎projects/Test/SequentialIntegration/SequentialIntegration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
3838
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
39-
<PackageReference Include="xunit" Version="2.6.6" />
40-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
39+
<PackageReference Include="xunit" Version="2.7.0" />
40+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
4141
</ItemGroup>
4242

4343
</Project>

‎projects/Test/Unit/Unit.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2424
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
25-
<PackageReference Include="xunit" Version="2.6.6" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
25+
<PackageReference Include="xunit" Version="2.7.0" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
2727
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
2828
</ItemGroup>
2929

0 commit comments

Comments
 (0)