diff --git a/DotNetty.sln.DotSettings b/DotNetty.sln.DotSettings index 5d7c8db35..b04f8d982 100644 --- a/DotNetty.sln.DotSettings +++ b/DotNetty.sln.DotSettings @@ -98,6 +98,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li True True True + True True True True diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6bb552172..fee9a0bf2 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +#### 0.7.0 June 11, 2021 +- target net472 and netstandard2.0 +- microsoft.extensions.logging 5.0.0 +- microsoft.extensions.configuration 5.0.0 + #### 0.6.0 October 9, 2018 - Clearly marks Unsafe Buffer management routines as `unsafe` - Changes defaults for Unpooled and Pooled buffer allocators to safe versions diff --git a/build.cake b/build.cake index bdf1417aa..acc9db369 100644 --- a/build.cake +++ b/build.cake @@ -173,7 +173,7 @@ Task("Benchmark") { StartProcess(nuget.ToString() + "/nuget.exe", "install NBench.Runner -OutputDirectory tools -ExcludeVersion -Version 1.0.0"); - var libraries = GetFiles("./test/**/bin/" + configuration + "/net452/*.Performance.dll"); + var libraries = GetFiles("./test/**/bin/" + configuration + "/net472/*.Performance.dll"); CreateDirectory(outputPerfResults); foreach (var lib in libraries) @@ -181,7 +181,7 @@ Task("Benchmark") Information("Using NBench.Runner: {0}", lib); // Make sure libuv.dll exists in performance test folder - CopyFiles("./test/DotNetty.Transport.Libuv.Tests/bin/" + configuration + "/net452/win-x64/libuv.dll", lib.GetDirectory(), false); + CopyFiles("./test/DotNetty.Transport.Libuv.Tests/bin/" + configuration + "/net472/win-x64/libuv.dll", lib.GetDirectory(), false); CopyFiles("./tools/NBench.Runner*/**/NBench.Runner.exe", lib.GetDirectory(), false); var nbenchArgs = new StringBuilder() diff --git a/examples/Discard.Client/Discard.Client.csproj b/examples/Discard.Client/Discard.Client.csproj index bcfafd5db..96c39faba 100644 --- a/examples/Discard.Client/Discard.Client.csproj +++ b/examples/Discard.Client/Discard.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Discard.Server/Discard.Server.csproj b/examples/Discard.Server/Discard.Server.csproj index bcfafd5db..96c39faba 100644 --- a/examples/Discard.Server/Discard.Server.csproj +++ b/examples/Discard.Server/Discard.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Echo.Client/Echo.Client.csproj b/examples/Echo.Client/Echo.Client.csproj index bcfafd5db..96c39faba 100644 --- a/examples/Echo.Client/Echo.Client.csproj +++ b/examples/Echo.Client/Echo.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Echo.Server/Echo.Server.csproj b/examples/Echo.Server/Echo.Server.csproj index d5133dab1..defec1f72 100644 --- a/examples/Echo.Server/Echo.Server.csproj +++ b/examples/Echo.Server/Echo.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Examples.Common/ExampleHelper.cs b/examples/Examples.Common/ExampleHelper.cs index 0ae7b20c6..535170274 100644 --- a/examples/Examples.Common/ExampleHelper.cs +++ b/examples/Examples.Common/ExampleHelper.cs @@ -6,7 +6,7 @@ namespace Examples.Common using System; using DotNetty.Common.Internal.Logging; using Microsoft.Extensions.Configuration; - using Microsoft.Extensions.Logging.Console; + using Microsoft.Extensions.Logging; public static class ExampleHelper { @@ -22,7 +22,7 @@ public static string ProcessDirectory { get { -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 return AppContext.BaseDirectory; #else return AppDomain.CurrentDomain.BaseDirectory; @@ -32,6 +32,6 @@ public static string ProcessDirectory public static IConfigurationRoot Configuration { get; } - public static void SetConsoleLogger() => InternalLoggerFactory.DefaultFactory.AddProvider(new ConsoleLoggerProvider((s, level) => true, false)); + public static void SetConsoleLogger() => InternalLoggerFactory.DefaultFactory = LoggerFactory.Create(builder => builder.AddConsole()); } } \ No newline at end of file diff --git a/examples/Examples.Common/Examples.Common.csproj b/examples/Examples.Common/Examples.Common.csproj index 6c6288b95..8e186c734 100644 --- a/examples/Examples.Common/Examples.Common.csproj +++ b/examples/Examples.Common/Examples.Common.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net451 - 1.6.1 + netstandard2.0;net472 + 2.0.3 false - - - - + + + + diff --git a/examples/Factorial.Client/Factorial.Client.csproj b/examples/Factorial.Client/Factorial.Client.csproj index c2c8a70ba..f5a342a29 100644 --- a/examples/Factorial.Client/Factorial.Client.csproj +++ b/examples/Factorial.Client/Factorial.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Factorial.Server/Factorial.Server.csproj b/examples/Factorial.Server/Factorial.Server.csproj index c2c8a70ba..f5a342a29 100644 --- a/examples/Factorial.Server/Factorial.Server.csproj +++ b/examples/Factorial.Server/Factorial.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Factorial/Factorial.csproj b/examples/Factorial/Factorial.csproj index 06ad6a0d6..d2ccbbd2f 100644 --- a/examples/Factorial/Factorial.csproj +++ b/examples/Factorial/Factorial.csproj @@ -1,7 +1,7 @@  - netstandard1.3;net451 - 1.6.1 + netstandard2.0;net472 + 2.0.3 false diff --git a/examples/HttpServer/HttpServer.csproj b/examples/HttpServer/HttpServer.csproj index d36ebb1f7..9e580ec6f 100644 --- a/examples/HttpServer/HttpServer.csproj +++ b/examples/HttpServer/HttpServer.csproj @@ -1,12 +1,12 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false true - + win-x64 diff --git a/examples/QuoteOfTheMoment.Client/QuoteOfTheMoment.Client.csproj b/examples/QuoteOfTheMoment.Client/QuoteOfTheMoment.Client.csproj index bcfafd5db..96c39faba 100644 --- a/examples/QuoteOfTheMoment.Client/QuoteOfTheMoment.Client.csproj +++ b/examples/QuoteOfTheMoment.Client/QuoteOfTheMoment.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/QuoteOfTheMoment.Server/QuoteOfTheMoment.Server.csproj b/examples/QuoteOfTheMoment.Server/QuoteOfTheMoment.Server.csproj index bcfafd5db..96c39faba 100644 --- a/examples/QuoteOfTheMoment.Server/QuoteOfTheMoment.Server.csproj +++ b/examples/QuoteOfTheMoment.Server/QuoteOfTheMoment.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/SecureChat.Client/SecureChat.Client.csproj b/examples/SecureChat.Client/SecureChat.Client.csproj index bcfafd5db..96c39faba 100644 --- a/examples/SecureChat.Client/SecureChat.Client.csproj +++ b/examples/SecureChat.Client/SecureChat.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/SecureChat.Server/SecureChat.Server.csproj b/examples/SecureChat.Server/SecureChat.Server.csproj index bcfafd5db..96c39faba 100644 --- a/examples/SecureChat.Server/SecureChat.Server.csproj +++ b/examples/SecureChat.Server/SecureChat.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Telnet.Client/Telnet.Client.csproj b/examples/Telnet.Client/Telnet.Client.csproj index bcfafd5db..96c39faba 100644 --- a/examples/Telnet.Client/Telnet.Client.csproj +++ b/examples/Telnet.Client/Telnet.Client.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/Telnet.Server/Telnet.Server.csproj b/examples/Telnet.Server/Telnet.Server.csproj index bcfafd5db..96c39faba 100644 --- a/examples/Telnet.Server/Telnet.Server.csproj +++ b/examples/Telnet.Server/Telnet.Server.csproj @@ -1,11 +1,11 @@  Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/WebSockets.Client/WebSockets.Client.csproj b/examples/WebSockets.Client/WebSockets.Client.csproj index 361196c21..1beb17f74 100644 --- a/examples/WebSockets.Client/WebSockets.Client.csproj +++ b/examples/WebSockets.Client/WebSockets.Client.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false - + win-x64 diff --git a/examples/WebSockets.Server/WebSockets.Server.csproj b/examples/WebSockets.Server/WebSockets.Server.csproj index 2c0d50ea0..86c509dbf 100644 --- a/examples/WebSockets.Server/WebSockets.Server.csproj +++ b/examples/WebSockets.Server/WebSockets.Server.csproj @@ -2,12 +2,12 @@ Exe - netcoreapp2.0;net451 - 1.6.1 + netcoreapp3.1;net472 + 2.0.3 false true - + win-x64 diff --git a/src/DotNetty.Buffers/DotNetty.Buffers.csproj b/src/DotNetty.Buffers/DotNetty.Buffers.csproj index 1d68f3c2a..a48ae7618 100644 --- a/src/DotNetty.Buffers/DotNetty.Buffers.csproj +++ b/src/DotNetty.Buffers/DotNetty.Buffers.csproj @@ -1,12 +1,12 @@  - netstandard1.3;net45 + netstandard2.0;net472 true Buffer management in DotNetty © Microsoft Corporation. All rights reserved. DotNetty: buffer management en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 True @@ -22,22 +22,15 @@ https://github.com/Azure/DotNetty/blob/master/LICENSE.txt true https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 - + - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Buffers/UnsafeByteBufferUtil.cs b/src/DotNetty.Buffers/UnsafeByteBufferUtil.cs index 5bcbbfa8b..61680802b 100644 --- a/src/DotNetty.Buffers/UnsafeByteBufferUtil.cs +++ b/src/DotNetty.Buffers/UnsafeByteBufferUtil.cs @@ -386,7 +386,7 @@ internal static void SetZero(byte* addr, int length) internal static string GetString(byte* src, int length, Encoding encoding) { -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 return encoding.GetString(src, length); #else int charCount = encoding.GetCharCount(src, length); diff --git a/src/DotNetty.Codecs.Http/DotNetty.Codecs.Http.csproj b/src/DotNetty.Codecs.Http/DotNetty.Codecs.Http.csproj index 50d94aa4c..c1833227d 100644 --- a/src/DotNetty.Codecs.Http/DotNetty.Codecs.Http.csproj +++ b/src/DotNetty.Codecs.Http/DotNetty.Codecs.Http.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs.Http Http codec for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: Http codec en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 true @@ -24,13 +24,13 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 - + @@ -39,11 +39,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj index e8fb2a9b1..e851eefec 100644 --- a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj +++ b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj @@ -1,13 +1,13 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs.Mqtt MQTT codec for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: MQTT codec en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -22,7 +22,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -33,11 +33,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj index 370b050d8..8e02867e9 100644 --- a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj +++ b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj @@ -1,13 +1,13 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs.Protobuf Protobuf Proto3 codec for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: Protobuf Proto3 codec en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -22,7 +22,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -36,11 +36,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj index 3ed09b9c8..3ff1a6e8d 100644 --- a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj +++ b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs.ProtocolBuffers ProtocolBuffers Proto2 codec for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: ProtocolBuffers Proto2 codec en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -23,8 +23,7 @@ true git https://github.com/Azure/DotNetty/ - $(PackageTargetFallback);portable-net45+win8 - 1.6.1 + 2.0.3 @@ -38,12 +37,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj index 2edf79522..203ca7100 100644 --- a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj +++ b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj @@ -1,13 +1,13 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs.Redis Redis codec for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: Redis codec en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -22,7 +22,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -33,11 +33,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Codecs/DotNetty.Codecs.csproj b/src/DotNetty.Codecs/DotNetty.Codecs.csproj index 12a113965..4a8a5b2d4 100644 --- a/src/DotNetty.Codecs/DotNetty.Codecs.csproj +++ b/src/DotNetty.Codecs/DotNetty.Codecs.csproj @@ -1,13 +1,13 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Codecs General purpose codecs for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: codecs en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 true @@ -24,7 +24,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -37,11 +37,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Common/DotNetty.Common.csproj b/src/DotNetty.Common/DotNetty.Common.csproj index c187ae363..0627ff11d 100644 --- a/src/DotNetty.Common/DotNetty.Common.csproj +++ b/src/DotNetty.Common/DotNetty.Common.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Common DotNetty common routines © Microsoft Corporation. All rights reserved. DotNetty: common routines en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 True @@ -24,22 +24,13 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 - - - - - - - - - - - + + \ No newline at end of file diff --git a/src/DotNetty.Handlers/DotNetty.Handlers.csproj b/src/DotNetty.Handlers/DotNetty.Handlers.csproj index d9afdf486..d755ec7c4 100644 --- a/src/DotNetty.Handlers/DotNetty.Handlers.csproj +++ b/src/DotNetty.Handlers/DotNetty.Handlers.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Handlers Application handlers for DotNetty © Microsoft Corporation. All rights reserved. DotNetty: handlers en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -23,7 +23,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -34,13 +34,4 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Handlers/Tls/SniHandler.cs b/src/DotNetty.Handlers/Tls/SniHandler.cs index 0e2bb8276..4f7b48827 100644 --- a/src/DotNetty.Handlers/Tls/SniHandler.cs +++ b/src/DotNetty.Handlers/Tls/SniHandler.cs @@ -214,7 +214,7 @@ protected override void Decode(IChannelHandlerContext context, IByteBuffer input }; hostname = idn.GetAscii(hostname); -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 // TODO: netcore does not have culture sensitive tolower() hostname = hostname.ToLowerInvariant(); #else diff --git a/src/DotNetty.Handlers/Tls/TlsHandler.cs b/src/DotNetty.Handlers/Tls/TlsHandler.cs index 063aa2db9..e46d8c32f 100644 --- a/src/DotNetty.Handlers/Tls/TlsHandler.cs +++ b/src/DotNetty.Handlers/Tls/TlsHandler.cs @@ -674,7 +674,7 @@ sealed class MediationStream : Stream int inputLength; TaskCompletionSource readCompletionSource; ArraySegment sslOwnedBuffer; -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 int readByteCount; #else SynchronousAsyncResult syncReadResult; @@ -718,7 +718,7 @@ public void ExpandSource(int count) } this.sslOwnedBuffer = default(ArraySegment); -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 this.readByteCount = this.ReadFromInput(sslBuffer.Array, sslBuffer.Offset, sslBuffer.Count); // hack: this tricks SslStream's continuation to run synchronously instead of dispatching to TP. Remove once Begin/EndRead are available. new Task( @@ -744,7 +744,7 @@ public void ExpandSource(int count) #endif } -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { if (this.SourceReadableBytes > 0) @@ -817,7 +817,7 @@ IAsyncResult PrepareSyncReadResult(int readBytes, object state) public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => this.owner.FinishWrapNonAppDataAsync(buffer, offset, count); -#if !NETSTANDARD1_3 +#if !NETSTANDARD2_0 static readonly Action WriteCompleteCallback = HandleChannelWriteComplete; public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) diff --git a/src/DotNetty.Transport.Libuv/DotNetty.Transport.Libuv.csproj b/src/DotNetty.Transport.Libuv/DotNetty.Transport.Libuv.csproj index 600591ca9..41fbf1426 100644 --- a/src/DotNetty.Transport.Libuv/DotNetty.Transport.Libuv.csproj +++ b/src/DotNetty.Transport.Libuv/DotNetty.Transport.Libuv.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Transport.Libuv Libuv transport model in DotNetty © Microsoft Corporation. All rights reserved. DotNetty: libuv transport model Experimental en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 True @@ -24,7 +24,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -39,11 +39,5 @@ - - - - - - \ No newline at end of file diff --git a/src/DotNetty.Transport.Libuv/Native/NativeMethods.cs b/src/DotNetty.Transport.Libuv/Native/NativeMethods.cs index 29311dc75..73d437b30 100644 --- a/src/DotNetty.Transport.Libuv/Native/NativeMethods.cs +++ b/src/DotNetty.Transport.Libuv/Native/NativeMethods.cs @@ -331,7 +331,7 @@ internal static IPEndPoint TcpGetSocketName(IntPtr handle) { Debug.Assert(handle != IntPtr.Zero); -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 int namelen = Marshal.SizeOf(); #else int namelen = Marshal.SizeOf(typeof(sockaddr)); @@ -344,7 +344,7 @@ internal static IPEndPoint TcpGetPeerName(IntPtr handle) { Debug.Assert(handle != IntPtr.Zero); -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 int namelen = Marshal.SizeOf(); #else int namelen = Marshal.SizeOf(typeof(sockaddr)); @@ -354,7 +354,7 @@ internal static IPEndPoint TcpGetPeerName(IntPtr handle) return sockaddr.GetIPEndPoint(); } -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 internal static IntPtr Allocate(int size) => Marshal.AllocCoTaskMem(size); internal static void FreeMemory(IntPtr ptr) => Marshal.FreeCoTaskMem(ptr); diff --git a/src/DotNetty.Transport.Libuv/Native/WindowsApi.cs b/src/DotNetty.Transport.Libuv/Native/WindowsApi.cs index 1526ab494..12b4307b9 100644 --- a/src/DotNetty.Transport.Libuv/Native/WindowsApi.cs +++ b/src/DotNetty.Transport.Libuv/Native/WindowsApi.cs @@ -41,7 +41,7 @@ public void DetachFromIOCP(NativeHandle handle) IntPtr socket = IntPtr.Zero; NativeMethods.uv_fileno(handle.Handle, ref socket); -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 uint len = (uint)Marshal.SizeOf(); #else uint len = (uint)Marshal.SizeOf(typeof(FILE_COMPLETION_INFORMATION)); diff --git a/src/DotNetty.Transport.Libuv/Native/WriteRequest.cs b/src/DotNetty.Transport.Libuv/Native/WriteRequest.cs index f0da3c1fc..169e68d65 100644 --- a/src/DotNetty.Transport.Libuv/Native/WriteRequest.cs +++ b/src/DotNetty.Transport.Libuv/Native/WriteRequest.cs @@ -26,7 +26,7 @@ sealed class WriteRequest : NativeRequest, ChannelOutboundBuffer.IMessageProcess static WriteRequest() { -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 BufferSize = Marshal.SizeOf(); #else BufferSize = Marshal.SizeOf(typeof(uv_buf_t)); diff --git a/src/DotNetty.Transport/Channels/Sockets/AbstractSocketByteChannel.cs b/src/DotNetty.Transport/Channels/Sockets/AbstractSocketByteChannel.cs index a6b7654ba..e297a8b08 100644 --- a/src/DotNetty.Transport/Channels/Sockets/AbstractSocketByteChannel.cs +++ b/src/DotNetty.Transport/Channels/Sockets/AbstractSocketByteChannel.cs @@ -154,7 +154,7 @@ protected override void ScheduleSocketRead() { SocketChannelAsyncOperation operation = this.ReadOperation; bool pending; -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 pending = this.Socket.ReceiveAsync(operation); #else if (ExecutionContext.IsFlowSuppressed()) @@ -308,7 +308,7 @@ protected bool IncompleteWrite(bool scheduleAsync, SocketChannelAsyncOperation o this.SetState(StateFlags.WriteScheduled); bool pending; -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 pending = this.Socket.SendAsync(operation); #else if (ExecutionContext.IsFlowSuppressed()) diff --git a/src/DotNetty.Transport/Channels/Sockets/SocketDatagramChannel.cs b/src/DotNetty.Transport/Channels/Sockets/SocketDatagramChannel.cs index 6431db8fe..4696a4ab2 100644 --- a/src/DotNetty.Transport/Channels/Sockets/SocketDatagramChannel.cs +++ b/src/DotNetty.Transport/Channels/Sockets/SocketDatagramChannel.cs @@ -115,7 +115,7 @@ protected override void ScheduleSocketRead() operation.SetBuffer(bytes.Array, bytes.Offset, bytes.Count); bool pending; -#if NETSTANDARD1_3 +#if NETSTANDARD2_0 pending = this.Socket.ReceiveFromAsync(operation); #else if (ExecutionContext.IsFlowSuppressed()) diff --git a/src/DotNetty.Transport/DotNetty.Transport.csproj b/src/DotNetty.Transport/DotNetty.Transport.csproj index 3cb33d768..e9b1687be 100644 --- a/src/DotNetty.Transport/DotNetty.Transport.csproj +++ b/src/DotNetty.Transport/DotNetty.Transport.csproj @@ -1,14 +1,14 @@  - netstandard1.3;net45 + netstandard2.0;net472 true DotNetty.Transport Transport model in DotNetty © Microsoft Corporation. All rights reserved. DotNetty: transport model en-US - 0.6.0 + 0.7.0 Microsoft $(NoWarn);CS1591 false @@ -23,7 +23,7 @@ true git https://github.com/Azure/DotNetty/ - 1.6.1 + 2.0.3 @@ -32,19 +32,4 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/shared/SharedAssemblyInfo.cs b/src/shared/SharedAssemblyInfo.cs index d26bd3b76..37003f66d 100644 --- a/src/shared/SharedAssemblyInfo.cs +++ b/src/shared/SharedAssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("DotNetty")] -[assembly: AssemblyVersion("0.6.0")] -[assembly: AssemblyFileVersion("0.6.0")] +[assembly: AssemblyVersion("0.7.0")] +[assembly: AssemblyFileVersion("0.7.0")] [assembly: AssemblyCopyright("(c) Microsoft 2015 - 2018")] diff --git a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj index d5cf91256..94e38d7a6 100644 --- a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj +++ b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Codecs.Http.Tests/DotNetty.Codecs.Http.Tests.csproj b/test/DotNetty.Codecs.Http.Tests/DotNetty.Codecs.Http.Tests.csproj index faf18d82c..82dcbc4d9 100644 --- a/test/DotNetty.Codecs.Http.Tests/DotNetty.Codecs.Http.Tests.csproj +++ b/test/DotNetty.Codecs.Http.Tests/DotNetty.Codecs.Http.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj b/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj index 9cdc23b6e..f14e1e5e7 100644 --- a/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj +++ b/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj b/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj index 5c50839cf..4a32e857b 100644 --- a/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj +++ b/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj b/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj index e83990edb..58d563787 100644 --- a/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj +++ b/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj @@ -1,11 +1,11 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false - + diff --git a/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj b/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj index 61258cda7..f42b68f15 100644 --- a/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj +++ b/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj index f69fb7b7d..ac979f577 100644 --- a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj +++ b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj index 3570fb1f7..b6cef6261 100644 --- a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj +++ b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj index b8b4e9a40..0a67729c2 100644 --- a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj +++ b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Microbench/Allocators/AbstractByteBufferAllocatorBenchmark.cs b/test/DotNetty.Microbench/Allocators/AbstractByteBufferAllocatorBenchmark.cs index b7acc058d..88dacb88d 100644 --- a/test/DotNetty.Microbench/Allocators/AbstractByteBufferAllocatorBenchmark.cs +++ b/test/DotNetty.Microbench/Allocators/AbstractByteBufferAllocatorBenchmark.cs @@ -5,11 +5,13 @@ namespace DotNetty.Microbench.Allocators { using System; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; + // using BenchmarkDotNet.Attributes.Jobs; using DotNetty.Buffers; using DotNetty.Common; - [CoreJob] + // [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("ByteBufferAllocator")] [MemoryDiagnoser] public abstract class AbstractByteBufferAllocatorBenchmark diff --git a/test/DotNetty.Microbench/Buffers/ByteBufUtilBenchmark.cs b/test/DotNetty.Microbench/Buffers/ByteBufUtilBenchmark.cs index ae612e74f..6bceb78fd 100644 --- a/test/DotNetty.Microbench/Buffers/ByteBufUtilBenchmark.cs +++ b/test/DotNetty.Microbench/Buffers/ByteBufUtilBenchmark.cs @@ -5,7 +5,6 @@ namespace DotNetty.Microbench.Buffers { using System.Text; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; using DotNetty.Buffers; using DotNetty.Common; diff --git a/test/DotNetty.Microbench/Buffers/ByteBufferBenchmark.cs b/test/DotNetty.Microbench/Buffers/ByteBufferBenchmark.cs index fc181a654..861c5f62e 100644 --- a/test/DotNetty.Microbench/Buffers/ByteBufferBenchmark.cs +++ b/test/DotNetty.Microbench/Buffers/ByteBufferBenchmark.cs @@ -5,18 +5,19 @@ namespace DotNetty.Microbench.Buffers { using System; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Diagnostics.Windows.Configs; + using BenchmarkDotNet.Jobs; using DotNetty.Buffers; using DotNetty.Common; #if NET46 using BenchmarkDotNet.Diagnostics.Windows.Configs; #endif -#if !NET46 - [CoreJob] +#if !NET472 + [SimpleJob(RuntimeMoniker.NetCoreApp31)] #else - [ClrJob] - [InliningDiagnoser] + [SimpleJob(RuntimeMoniker.Net472)] + [InliningDiagnoser(true, true)] #endif [BenchmarkCategory("ByteBuffer")] public class ByteBufferBenchmark diff --git a/test/DotNetty.Microbench/Buffers/PooledByteBufferBenchmark.cs b/test/DotNetty.Microbench/Buffers/PooledByteBufferBenchmark.cs index 5edecf7f8..9707d7908 100644 --- a/test/DotNetty.Microbench/Buffers/PooledByteBufferBenchmark.cs +++ b/test/DotNetty.Microbench/Buffers/PooledByteBufferBenchmark.cs @@ -4,18 +4,19 @@ namespace DotNetty.Microbench.Buffers { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Diagnostics.Windows.Configs; + using BenchmarkDotNet.Jobs; using DotNetty.Buffers; using DotNetty.Common; -#if NET46 +#if NET472 using BenchmarkDotNet.Diagnostics.Windows.Configs; #endif -#if !NET46 - [CoreJob] +#if !NET472 + [SimpleJob(RuntimeMoniker.NetCoreApp31)] #else - [ClrJob] - [InliningDiagnoser] + [SimpleJob(RuntimeMoniker.Net472)] + [InliningDiagnoser(true, true)] #endif [BenchmarkCategory("ByteBuffer")] public class PooledByteBufferBenchmark diff --git a/test/DotNetty.Microbench/Buffers/UnpooledByteBufferBenchmark.cs b/test/DotNetty.Microbench/Buffers/UnpooledByteBufferBenchmark.cs index 68d0f520e..dee347e17 100644 --- a/test/DotNetty.Microbench/Buffers/UnpooledByteBufferBenchmark.cs +++ b/test/DotNetty.Microbench/Buffers/UnpooledByteBufferBenchmark.cs @@ -4,18 +4,18 @@ namespace DotNetty.Microbench.Buffers { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Buffers; using DotNetty.Common; -#if NET46 +#if NET472 using BenchmarkDotNet.Diagnostics.Windows.Configs; #endif -#if !NET46 - [CoreJob] +#if !NET472 + [SimpleJob(RuntimeMoniker.NetCoreApp31)] #else - [ClrJob] - [InliningDiagnoser] + [SimpleJob(RuntimeMoniker.Net472)] + [InliningDiagnoser(true, true)] #endif [BenchmarkCategory("ByteBuffer")] public class UnpooledByteBufferBenchmark diff --git a/test/DotNetty.Microbench/Codecs/DateFormatterBenchmark.cs b/test/DotNetty.Microbench/Codecs/DateFormatterBenchmark.cs index 615e73c7e..c7ea47d0b 100644 --- a/test/DotNetty.Microbench/Codecs/DateFormatterBenchmark.cs +++ b/test/DotNetty.Microbench/Codecs/DateFormatterBenchmark.cs @@ -5,10 +5,10 @@ namespace DotNetty.Microbench.Codecs { using System; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Codecs; - [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Codecs")] public class DateFormatterBenchmark { diff --git a/test/DotNetty.Microbench/Common/AsciiStringBenchmark.cs b/test/DotNetty.Microbench/Common/AsciiStringBenchmark.cs index bad2dcf71..e84615f4b 100644 --- a/test/DotNetty.Microbench/Common/AsciiStringBenchmark.cs +++ b/test/DotNetty.Microbench/Common/AsciiStringBenchmark.cs @@ -6,18 +6,18 @@ namespace DotNetty.Microbench.Common using System; using System.Text; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Common.Internal; using DotNetty.Common.Utilities; -#if NET46 +#if NET472 using BenchmarkDotNet.Diagnostics.Windows.Configs; #endif -#if !NET46 - [CoreJob] +#if !NET472 + [SimpleJob(RuntimeMoniker.NetCoreApp31)] #else - [ClrJob] - [InliningDiagnoser] + [SimpleJob(RuntimeMoniker.Net472)] + [InliningDiagnoser(true, true)] #endif [BenchmarkCategory("Common")] public class AsciiStringBenchmark diff --git a/test/DotNetty.Microbench/Concurrency/FastThreadLocalBenchmark.cs b/test/DotNetty.Microbench/Concurrency/FastThreadLocalBenchmark.cs index a948486bd..870f6e142 100644 --- a/test/DotNetty.Microbench/Concurrency/FastThreadLocalBenchmark.cs +++ b/test/DotNetty.Microbench/Concurrency/FastThreadLocalBenchmark.cs @@ -4,10 +4,10 @@ namespace DotNetty.Microbench.Concurrency { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Common; - [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Concurrency")] public class FastThreadLocalBenchmark { diff --git a/test/DotNetty.Microbench/Concurrency/SingleThreadEventExecutorBenchmark.cs b/test/DotNetty.Microbench/Concurrency/SingleThreadEventExecutorBenchmark.cs index 0eef5e13f..8c6f0384e 100644 --- a/test/DotNetty.Microbench/Concurrency/SingleThreadEventExecutorBenchmark.cs +++ b/test/DotNetty.Microbench/Concurrency/SingleThreadEventExecutorBenchmark.cs @@ -6,7 +6,6 @@ namespace DotNetty.Microbench.Concurrency using System; using System.Threading; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; using BenchmarkDotNet.Engines; using DotNetty.Common.Concurrency; using DotNetty.Common.Internal; diff --git a/test/DotNetty.Microbench/DotNetty.Microbench.csproj b/test/DotNetty.Microbench/DotNetty.Microbench.csproj index 4f66aca53..8be7693c2 100644 --- a/test/DotNetty.Microbench/DotNetty.Microbench.csproj +++ b/test/DotNetty.Microbench/DotNetty.Microbench.csproj @@ -2,20 +2,18 @@ Exe true - netcoreapp2.0;net46 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + win-x64 - - - - - + + + diff --git a/test/DotNetty.Microbench/Headers/HeadersBenchmark.cs b/test/DotNetty.Microbench/Headers/HeadersBenchmark.cs index 305f96ba4..dd1b63307 100644 --- a/test/DotNetty.Microbench/Headers/HeadersBenchmark.cs +++ b/test/DotNetty.Microbench/Headers/HeadersBenchmark.cs @@ -5,7 +5,6 @@ namespace DotNetty.Microbench.Headers { using System.Collections.Generic; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; using BenchmarkDotNet.Engines; using DotNetty.Codecs; using DotNetty.Codecs.Http; diff --git a/test/DotNetty.Microbench/Http/ClientCookieDecoderBenchmark.cs b/test/DotNetty.Microbench/Http/ClientCookieDecoderBenchmark.cs index b7f1a9b8d..8573b80c8 100644 --- a/test/DotNetty.Microbench/Http/ClientCookieDecoderBenchmark.cs +++ b/test/DotNetty.Microbench/Http/ClientCookieDecoderBenchmark.cs @@ -4,11 +4,11 @@ namespace DotNetty.Microbench.Http { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Codecs.Http.Cookies; using DotNetty.Common; - [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Http")] public class ClientCookieDecoderBenchmark { diff --git a/test/DotNetty.Microbench/Http/HttpRequestDecoderBenchmark.cs b/test/DotNetty.Microbench/Http/HttpRequestDecoderBenchmark.cs index bc7096690..ad1cc3375 100644 --- a/test/DotNetty.Microbench/Http/HttpRequestDecoderBenchmark.cs +++ b/test/DotNetty.Microbench/Http/HttpRequestDecoderBenchmark.cs @@ -5,7 +5,6 @@ namespace DotNetty.Microbench.Http { using System.Text; using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; using BenchmarkDotNet.Engines; using DotNetty.Buffers; using DotNetty.Codecs.Http; diff --git a/test/DotNetty.Microbench/Http/HttpRequestEncoderInsertBenchmark.cs b/test/DotNetty.Microbench/Http/HttpRequestEncoderInsertBenchmark.cs index f428c8999..2b10889f9 100644 --- a/test/DotNetty.Microbench/Http/HttpRequestEncoderInsertBenchmark.cs +++ b/test/DotNetty.Microbench/Http/HttpRequestEncoderInsertBenchmark.cs @@ -4,12 +4,12 @@ namespace DotNetty.Microbench.Http { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Buffers; using DotNetty.Codecs.Http; using DotNetty.Common; - [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Http")] public class HttpRequestEncoderInsertBenchmark { diff --git a/test/DotNetty.Microbench/Http/WriteBytesVsShortOrMediumBenchmark.cs b/test/DotNetty.Microbench/Http/WriteBytesVsShortOrMediumBenchmark.cs index ddb5a9194..c7146f4ac 100644 --- a/test/DotNetty.Microbench/Http/WriteBytesVsShortOrMediumBenchmark.cs +++ b/test/DotNetty.Microbench/Http/WriteBytesVsShortOrMediumBenchmark.cs @@ -4,13 +4,13 @@ namespace DotNetty.Microbench.Http { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Buffers; using DotNetty.Codecs.Http; using DotNetty.Common; using DotNetty.Common.Utilities; - [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Http")] public class WriteBytesVsShortOrMediumBenchmark { diff --git a/test/DotNetty.Microbench/Internal/PlatformDependentBenchmark.cs b/test/DotNetty.Microbench/Internal/PlatformDependentBenchmark.cs index 51292afb7..67a64795f 100644 --- a/test/DotNetty.Microbench/Internal/PlatformDependentBenchmark.cs +++ b/test/DotNetty.Microbench/Internal/PlatformDependentBenchmark.cs @@ -4,10 +4,11 @@ namespace DotNetty.Microbench.Internal { using BenchmarkDotNet.Attributes; - using BenchmarkDotNet.Attributes.Jobs; + using BenchmarkDotNet.Jobs; using DotNetty.Common.Internal; - [CoreJob] + // [CoreJob] + [SimpleJob(RuntimeMoniker.NetCoreApp31)] [BenchmarkCategory("Internal")] public class PlatformDependentBenchmark { diff --git a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj index 9eb990247..946f21561 100644 --- a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj +++ b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj @@ -2,7 +2,7 @@ true false - netcoreapp2.0;net452 + netcoreapp3.1;net472 ../../DotNetty.snk true @@ -11,7 +11,7 @@ - + diff --git a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj index dad82b080..c1a9f7130 100644 --- a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj +++ b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + diff --git a/test/DotNetty.Transport.Libuv.Tests/DotNetty.Transport.Libuv.Tests.csproj b/test/DotNetty.Transport.Libuv.Tests/DotNetty.Transport.Libuv.Tests.csproj index 83ad08e13..1bad6c058 100644 --- a/test/DotNetty.Transport.Libuv.Tests/DotNetty.Transport.Libuv.Tests.csproj +++ b/test/DotNetty.Transport.Libuv.Tests/DotNetty.Transport.Libuv.Tests.csproj @@ -1,16 +1,16 @@ true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - + win-x64 - + diff --git a/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj b/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj index d0126f46c..72cb185f7 100644 --- a/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj +++ b/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj @@ -4,14 +4,14 @@ true - net452 + net472 false library - + diff --git a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj index 6151acd5a..b1909e485 100644 --- a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj +++ b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj @@ -1,13 +1,13 @@  true - netcoreapp2.0;net452 + netcoreapp3.1;net472 false ../../DotNetty.snk true - +