Skip to content

Commit dc80d6a

Browse files
lukebakkenlukebakken
committed
Update target framework to net6.0
Update packages to latest versions Fixes #1172
1 parent 08d4417 commit dc80d6a

File tree

7 files changed

+26
-36
lines changed

7 files changed

+26
-36
lines changed

‎.github/workflows/main.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
submodules: true
2424
- name: Cache installers
25-
uses: actions/cache@v2
25+
uses: actions/cache@v3
2626
with:
2727
# Note: the cache path is relative to the workspace directory
2828
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
@@ -66,11 +66,11 @@ jobs:
6666
with:
6767
submodules: true
6868
- name: Setup .NET
69-
uses: actions/setup-dotnet@v1
69+
uses: actions/setup-dotnet@v2
7070
with:
71-
dotnet-version: 3.1.x
71+
dotnet-version: 6.0.x
7272
- name: Cache NuGet packages
73-
uses: actions/cache@v2
73+
uses: actions/cache@v3
7474
with:
7575
path: |
7676
~/.nuget/packages
@@ -83,6 +83,6 @@ jobs:
8383
- name: Build
8484
run: dotnet build --no-restore --verbosity=normal
8585
- name: Test
86-
run: dotnet test --no-restore --no-build --logger "console;verbosity=detailed" --framework "netcoreapp3.1"
86+
run: dotnet test --no-restore --no-build --logger "console;verbosity=detailed"
8787
env:
8888
RABBITMQ_RABBITMQCTL_PATH: DOCKER:${{job.services.rabbitmq.id}}

‎projects/Benchmarks/Benchmarks.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
7-
<TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
8-
<ReleaseVersion>8.0</ReleaseVersion>
7+
<TargetFrameworks>net6.0</TargetFrameworks>
98
</PropertyGroup>
109

1110
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
13-
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12+
<PackageReference Include="Ductus.FluentDocker" Version="2.10.45" />
1413
</ItemGroup>
1514

1615
<ItemGroup>
1716
<ProjectReference Include="..\RabbitMQ.Client\RabbitMQ.Client.csproj" />
18-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
17+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
1918
</ItemGroup>
2019

2120
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
@@ -36,11 +36,6 @@
3636
<Deterministic>true</Deterministic>
3737
</PropertyGroup>
3838

39-
<!-- disable nullable warnings for .NET Standard 2.0 -->
40-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
41-
<NoWarn>$(NoWarn);nullable</NoWarn>
42-
</PropertyGroup>
43-
4439
<Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''">
4540
<PropertyGroup>
4641
<PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)-pr.$(CONCOURSE_PULL_REQUEST_NUMBER)</PackageVersion>
@@ -62,15 +57,11 @@
6257
</ItemGroup>
6358

6459
<ItemGroup>
65-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
66-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
67-
<PackageReference Include="MinVer" Version="2.4.0" PrivateAssets="All" />
68-
<PackageReference Include="System.Threading.Channels" Version="5.0.0" />
69-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />
70-
</ItemGroup>
71-
72-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
73-
<PackageReference Include="System.Memory" Version="4.5.4" />
60+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
61+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
62+
<PackageReference Include="MinVer" Version="3.1.0" PrivateAssets="All" />
63+
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
64+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
7465
</ItemGroup>
7566

7667
</Project>

‎projects/TestApplications/CreateChannel/CreateChannel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎projects/TestApplications/MassPublish/MassPublish.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎projects/Unit/Unit.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
<LangVersion>latest</LangVersion>
@@ -13,15 +13,15 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
17-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
18-
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
17+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
18+
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
1919
<PackageReference Include="xunit" Version="2.4.1" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Verify.Xunit" Version="11.18.2" />
24+
<PackageReference Include="Verify.Xunit" Version="16.5.4" />
2525
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
2626
</ItemGroup>
2727

‎run-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ fi
1313

1414
cd "$script_dir"
1515

16-
dotnet test --no-build --logger 'console;verbosity=detailed' --framework 'netcoreapp3.1' ./RabbitMQDotNetClient.sln < /dev/null
16+
dotnet test --no-build --logger 'console;verbosity=detailed' ./RabbitMQDotNetClient.sln < /dev/null

0 commit comments

Comments
 (0)