Skip to content

Commit f405882

Browse files
danielmarbachdanielmarbach
committed
Upgrade NET6.0 to NET8.0 since NET6.0 is EOL
1 parent 7f512d7 commit f405882

File tree

17 files changed

+27
-27
lines changed

17 files changed

+27
-27
lines changed

‎.github/workflows/build-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
- name: Setup .NET
219219
uses: actions/setup-dotnet@v4
220220
with:
221-
dotnet-version: 6.x
221+
dotnet-version: 8.x
222222
- name: Download Build (Debug)
223223
uses: actions/download-artifact@v4
224224
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/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj

Lines changed: 1 addition & 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>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>

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

Lines changed: 1 addition & 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>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>

‎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: 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
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
@@ -33,7 +33,7 @@
3333
https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
3434
https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
3535
-->
36-
<LangVersion>9.0</LangVersion>
36+
<LangVersion>12.0</LangVersion>
3737
<Nullable>enable</Nullable>
3838
</PropertyGroup>
3939

‎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: 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/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: 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/Test/Applications/PublisherConfirms/PublisherConfirms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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>

‎projects/Test/Common/Common.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/Test/Integration/Integration.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/Test/OAuth2/OAuth2.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/Test/SequentialIntegration/SequentialIntegration.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/Test/Unit/Unit.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>

0 commit comments

Comments
 (0)