Skip to content

Commit b751d92

Browse files
lukebakkenlukebakken
authored
Merge pull request #1707 from danielmarbach/tfm-upgrade
Upgrade NET6.0 to NET8.0 since NET6.0 is soon EOL
2 parents 7f512d7 + 690e110 commit b751d92

File tree

18 files changed

+46
-57
lines changed

18 files changed

+46
-57
lines changed

‎.github/workflows/build-test.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ jobs:
136136
uses: actions/checkout@v4
137137
with:
138138
submodules: true
139-
- name: Setup .NET
140-
uses: actions/setup-dotnet@v4
141-
with:
142-
dotnet-version: 6.x
143139
- name: Cache NuGet packages
144140
uses: actions/cache@v4
145141
with:
@@ -174,10 +170,6 @@ jobs:
174170
uses: actions/checkout@v4
175171
with:
176172
submodules: true
177-
- name: Setup .NET
178-
uses: actions/setup-dotnet@v4
179-
with:
180-
dotnet-version: 6.x
181173
- name: Download Build (Debug)
182174
uses: actions/download-artifact@v4
183175
with:
@@ -215,10 +207,6 @@ jobs:
215207
uses: actions/checkout@v4
216208
with:
217209
submodules: true
218-
- name: Setup .NET
219-
uses: actions/setup-dotnet@v4
220-
with:
221-
dotnet-version: 6.x
222210
- name: Download Build (Debug)
223211
uses: actions/download-artifact@v4
224212
with:

‎.github/workflows/oauth2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
submodules: true
2020
- uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: 6.x
22+
dotnet-version: 8.x
2323
- uses: actions/cache@v4
2424
with:
2525
path: |

‎projects/Benchmarks/Benchmarks.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>

‎projects/Directory.Packages.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Note: do NOT upgrade the System.IO.Pipelines dependency unless necessary
1515
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
1616
-->
17-
<PackageVersion Include="System.IO.Pipelines" Version="6.0.0" />
17+
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
1818
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
1919
<PackageVersion Include="WireMock.Net" Version="1.5.62" />
2020
<PackageVersion Include="xunit" Version="2.9.0" />
@@ -29,15 +29,15 @@
2929
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
3030
* https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1594
3131
-->
32-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
32+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
3333
<PackageVersion Include="System.Memory" Version="4.5.5" />
34-
<PackageVersion Include="System.Threading.Channels" Version="6.0.0" />
35-
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
36-
<PackageVersion Include="System.Net.Http.Json" Version="6.0.0" />
37-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
34+
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
35+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
36+
<PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
37+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
3838
</ItemGroup>
3939
<ItemGroup Condition="$(TargetFramework)=='net472'">
40-
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
40+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
4141
</ItemGroup>
4242
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
4343
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AssemblyTitle>RabbitMQ OAuth2 Client Library for .NET</AssemblyTitle>
@@ -31,7 +31,7 @@
3131
https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
3232
https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
3333
-->
34-
<LangVersion>9.0</LangVersion>
34+
<LangVersion>12.0</LangVersion>
3535
<Nullable>enable</Nullable>
3636
</PropertyGroup>
3737

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AssemblyTitle>RabbitMQ OpenTelemetry Integration Package for .NET</AssemblyTitle>
@@ -27,7 +27,7 @@
2727
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2828
<PackageOutputPath>../../packages</PackageOutputPath>
2929
<PackageReadmeFile>README.md</PackageReadmeFile>
30-
<LangVersion>9.0</LangVersion>
30+
<LangVersion>12.0</LangVersion>
3131
</PropertyGroup>
3232

3333
<PropertyGroup Condition="'$(Configuration)' == 'Release' And '$(CI)' == 'true'">

‎projects/RabbitMQ.Client/Impl/SessionBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public virtual ValueTask TransmitAsync<T>(in T cmd, CancellationToken cancellati
128128
ThrowAlreadyClosedException();
129129
}
130130

131-
RentedMemory bytes = Framing.SerializeToFrames(ref Unsafe.AsRef(cmd), ChannelNumber);
131+
RentedMemory bytes = Framing.SerializeToFrames(ref Unsafe.AsRef(in cmd), ChannelNumber);
132132
RabbitMQActivitySource.PopulateMessageEnvelopeSize(Activity.Current, bytes.Size);
133133
return Connection.WriteAsync(bytes, cancellationToken);
134134
}
@@ -142,7 +142,7 @@ public ValueTask TransmitAsync<TMethod, THeader>(in TMethod cmd, in THeader head
142142
ThrowAlreadyClosedException();
143143
}
144144

145-
RentedMemory bytes = Framing.SerializeToFrames(ref Unsafe.AsRef(cmd), ref Unsafe.AsRef(header), body, ChannelNumber, Connection.MaxPayloadSize);
145+
RentedMemory bytes = Framing.SerializeToFrames(ref Unsafe.AsRef(in cmd), ref Unsafe.AsRef(in header), body, ChannelNumber, Connection.MaxPayloadSize);
146146
RabbitMQActivitySource.PopulateMessageEnvelopeSize(Activity.Current, bytes.Size);
147147
return Connection.WriteAsync(bytes, cancellationToken);
148148
}

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
6+
<!-- Apply IsTrimmable and EnableTrimAnalyzer only for .NET 8.0 -->
7+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsTrimmable>
8+
<EnableTrimAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</EnableTrimAnalyzer>
89
<AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
910
<Authors>Broadcom</Authors>
1011
<Company>Broadcom, Inc. or its subsidiaries.</Company>
@@ -33,7 +34,7 @@
3334
https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
3435
https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
3536
-->
36-
<LangVersion>9.0</LangVersion>
37+
<LangVersion>12.0</LangVersion>
3738
<Nullable>enable</Nullable>
3839
</PropertyGroup>
3940

‎projects/RabbitMQ.Client/TypeExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static ref byte GetStart(this ReadOnlySpan<byte> span)
4646
[MethodImpl(MethodImplOptions.AggressiveInlining)]
4747
public static ref byte GetStart(this byte[] array)
4848
{
49-
return ref Unsafe.AsRef(array[0]);
49+
return ref Unsafe.AsRef(in array[0]);
5050
}
5151

5252
[MethodImpl(MethodImplOptions.AggressiveInlining)]

‎projects/Test/Applications/CreateChannel/CreateChannel.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<OutputType>Exe</OutputType>
17-
<LangVersion>9.0</LangVersion>
17+
<LangVersion>12.0</LangVersion>
1818
</PropertyGroup>
1919

2020
<ItemGroup>

‎projects/Test/Applications/GH-1647/GH-1647.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>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<RootNamespace>GH_1647</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>

‎projects/Test/Applications/MassPublish/MassPublish.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<OutputType>Exe</OutputType>
17-
<LangVersion>9.0</LangVersion>
17+
<LangVersion>12.0</LangVersion>
1818
</PropertyGroup>
1919

2020
<ItemGroup>

‎projects/Test/Applications/PublisherConfirms/PublisherConfirms.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup>
1010
<OutputType>Exe</OutputType>
1111
<Nullable>enable</Nullable>
12-
<LangVersion>9.0</LangVersion>
12+
<LangVersion>12.0</LangVersion>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

‎projects/Test/Common/Common.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<AssemblyOriginatorKeyFile>../../rabbit.snk</AssemblyOriginatorKeyFile>
1717
<SignAssembly>true</SignAssembly>
1818
<IsTestProject>false</IsTestProject>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>12.0</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

‎projects/Test/Integration/Integration.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<AssemblyOriginatorKeyFile>../../rabbit.snk</AssemblyOriginatorKeyFile>
1717
<SignAssembly>true</SignAssembly>
1818
<IsTestProject>true</IsTestProject>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>12.0</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

‎projects/Test/OAuth2/OAuth2.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<AssemblyOriginatorKeyFile>../../rabbit.snk</AssemblyOriginatorKeyFile>
1717
<SignAssembly>true</SignAssembly>
1818
<IsTestProject>true</IsTestProject>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>12.0</LangVersion>
2020
<Nullable>enable</Nullable>
2121
</PropertyGroup>
2222

‎projects/Test/SequentialIntegration/SequentialIntegration.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<AssemblyOriginatorKeyFile>../../rabbit.snk</AssemblyOriginatorKeyFile>
1717
<SignAssembly>true</SignAssembly>
1818
<IsTestProject>true</IsTestProject>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>12.0</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

‎projects/Test/Unit/Unit.csproj

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
4-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2007</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CA2007</NoWarn>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<AssemblyOriginatorKeyFile>../../rabbit.snk</AssemblyOriginatorKeyFile>
1717
<SignAssembly>true</SignAssembly>
1818
<IsTestProject>true</IsTestProject>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>12.0</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)