Azure
/
DotNetty
зеркало из https://github.com/Azure/DotNetty.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

- target net472 and netstandard2.0 

- microsoft.extensions.logging 5.0.0
- microsoft.extensions.configuration 5.0.0
This commit is contained in:
Andrey Ilnitsky 2021-06-11 16:25:37 -07:00 коммит произвёл Max Gortman
Родитель 47f5ec7303
Коммит 1cdaadbfaa
71 изменённых файлов: 193 добавлений и 278 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
DotNetty.sln.DotSettings
Просмотреть файл

@ -98,6 +98,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

5
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

4
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()

6
examples/Discard.Client/Discard.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Discard.Server/Discard.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Echo.Client/Echo.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Echo.Server/Echo.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
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 @@ namespace Examples.Common
{
get
{
#if NETSTANDARD1_3
#if NETSTANDARD2_0
return AppContext.BaseDirectory;
#else
return AppDomain.CurrentDomain.BaseDirectory;
@ -32,6 +32,6 @@ namespace Examples.Common
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());
}
}

12
examples/Examples.Common/Examples.Common.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DotNetty.Common\DotNetty.Common.csproj" />

6
examples/Factorial.Client/Factorial.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Factorial.Server/Factorial.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

4
examples/Factorial/Factorial.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>

6
examples/HttpServer/HttpServer.csproj
Просмотреть файл

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ServerGarbageCollection>true</ServerGarbageCollection>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/QuoteOfTheMoment.Client/QuoteOfTheMoment.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/QuoteOfTheMoment.Server/QuoteOfTheMoment.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/SecureChat.Client/SecureChat.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/SecureChat.Server/SecureChat.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Telnet.Client/Telnet.Client.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/Telnet.Server/Telnet.Server.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/WebSockets.Client/WebSockets.Client.csproj
Просмотреть файл

@ -2,11 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

6
examples/WebSockets.Server/WebSockets.Server.csproj
Просмотреть файл

@ -2,12 +2,12 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ServerGarbageCollection>true</ServerGarbageCollection>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>

15
src/DotNetty.Buffers/DotNetty.Buffers.csproj
Просмотреть файл

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<Description>Buffer management in DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: buffer management</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -22,22 +22,15 @@
<PackageLicenseUrl>https://github.com/Azure/DotNetty/blob/master/LICENSE.txt</PackageLicenseUrl>
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DotNetty.Common\DotNetty.Common.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

2
src/DotNetty.Buffers/UnsafeByteBufferUtil.cs
Просмотреть файл

@ -386,7 +386,7 @@ namespace DotNetty.Buffers
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);

15
src/DotNetty.Codecs.Http/DotNetty.Codecs.Http.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs.Http</PackageId>
<Description>Http codec for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: Http codec</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -24,13 +24,13 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DotNetty.Common\DotNetty.Common.csproj" />
@ -39,11 +39,4 @@
<ProjectReference Include="..\DotNetty.Handlers\DotNetty.Handlers.csproj" />
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

13
src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs.Mqtt</PackageId>
<Description>MQTT codec for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: MQTT codec</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -22,7 +22,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -33,11 +33,4 @@
<ProjectReference Include="..\DotNetty.Codecs\DotNetty.Codecs.csproj" />
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

13
src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs.Protobuf</PackageId>
<Description>Protobuf Proto3 codec for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: Protobuf Proto3 codec</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -22,7 +22,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -36,11 +36,4 @@
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.2.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

15
src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs.ProtocolBuffers</PackageId>
<Description>ProtocolBuffers Proto2 codec for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: ProtocolBuffers Proto2 codec</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -23,8 +23,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -38,12 +37,4 @@
<ItemGroup>
<PackageReference Include="Google.ProtocolBuffers" Version="2.4.1.555" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

13
src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs.Redis</PackageId>
<Description>Redis codec for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: Redis codec</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -22,7 +22,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -33,11 +33,4 @@
<ProjectReference Include="..\DotNetty.Codecs\DotNetty.Codecs.csproj" />
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

13
src/DotNetty.Codecs/DotNetty.Codecs.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Codecs</PackageId>
<Description>General purpose codecs for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: codecs</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -24,7 +24,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -37,11 +37,4 @@
<ProjectReference Include="..\DotNetty.Buffers\DotNetty.Buffers.csproj" />
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

19
src/DotNetty.Common/DotNetty.Common.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Common</PackageId>
<Description>DotNetty common routines</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: common routines</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -24,22 +24,13 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Runtime" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
</ItemGroup>
</Project>

15
src/DotNetty.Handlers/DotNetty.Handlers.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Handlers</PackageId>
<Description>Application handlers for DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: handlers</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -23,7 +23,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -34,13 +34,4 @@
<ProjectReference Include="..\DotNetty.Codecs\DotNetty.Codecs.csproj" />
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Globalization.Extensions" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

2
src/DotNetty.Handlers/Tls/SniHandler.cs
Просмотреть файл

@ -214,7 +214,7 @@ namespace DotNetty.Handlers.Tls
};
hostname = idn.GetAscii(hostname);
#if NETSTANDARD1_3
#if NETSTANDARD2_0
// TODO: netcore does not have culture sensitive tolower()
hostname = hostname.ToLowerInvariant();
#else

8
src/DotNetty.Handlers/Tls/TlsHandler.cs
Просмотреть файл

@ -674,7 +674,7 @@ namespace DotNetty.Handlers.Tls
int inputLength;
TaskCompletionSource<int> readCompletionSource;
ArraySegment<byte> sslOwnedBuffer;
#if NETSTANDARD1_3
#if NETSTANDARD2_0
int readByteCount;
#else
SynchronousAsyncResult<int> syncReadResult;
@ -718,7 +718,7 @@ namespace DotNetty.Handlers.Tls
}
this.sslOwnedBuffer = default(ArraySegment<byte>);
#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 @@ namespace DotNetty.Handlers.Tls
#endif
}
#if NETSTANDARD1_3
#if NETSTANDARD2_0
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
if (this.SourceReadableBytes > 0)
@ -817,7 +817,7 @@ namespace DotNetty.Handlers.Tls
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<Task, object> WriteCompleteCallback = HandleChannelWriteComplete;
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)

12
src/DotNetty.Transport.Libuv/DotNetty.Transport.Libuv.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Transport.Libuv</PackageId>
<Description>Libuv transport model in DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: libuv transport model Experimental</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -24,7 +24,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
@ -40,10 +40,4 @@
<ProjectReference Include="..\DotNetty.Transport\DotNetty.Transport.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
</ItemGroup>
</Project>

6
src/DotNetty.Transport.Libuv/Native/NativeMethods.cs
Просмотреть файл

@ -331,7 +331,7 @@ namespace DotNetty.Transport.Libuv.Native
{
Debug.Assert(handle != IntPtr.Zero);
#if NETSTANDARD1_3
#if NETSTANDARD2_0
int namelen = Marshal.SizeOf<sockaddr>();
#else
int namelen = Marshal.SizeOf(typeof(sockaddr));
@ -344,7 +344,7 @@ namespace DotNetty.Transport.Libuv.Native
{
Debug.Assert(handle != IntPtr.Zero);
#if NETSTANDARD1_3
#if NETSTANDARD2_0
int namelen = Marshal.SizeOf<sockaddr>();
#else
int namelen = Marshal.SizeOf(typeof(sockaddr));
@ -354,7 +354,7 @@ namespace DotNetty.Transport.Libuv.Native
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);

2
src/DotNetty.Transport.Libuv/Native/WindowsApi.cs
Просмотреть файл

@ -41,7 +41,7 @@ namespace DotNetty.Transport.Libuv.Native
IntPtr socket = IntPtr.Zero;
NativeMethods.uv_fileno(handle.Handle, ref socket);
#if NETSTANDARD1_3
#if NETSTANDARD2_0
uint len = (uint)Marshal.SizeOf<FILE_COMPLETION_INFORMATION>();
#else
uint len = (uint)Marshal.SizeOf(typeof(FILE_COMPLETION_INFORMATION));

2
src/DotNetty.Transport.Libuv/Native/WriteRequest.cs
Просмотреть файл

@ -26,7 +26,7 @@ namespace DotNetty.Transport.Libuv.Native
static WriteRequest()
{
#if NETSTANDARD1_3
#if NETSTANDARD2_0
BufferSize = Marshal.SizeOf<uv_buf_t>();
#else
BufferSize = Marshal.SizeOf(typeof(uv_buf_t));

4
src/DotNetty.Transport/Channels/Sockets/AbstractSocketByteChannel.cs
Просмотреть файл

@ -154,7 +154,7 @@ namespace DotNetty.Transport.Channels.Sockets
{
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 @@ namespace DotNetty.Transport.Channels.Sockets
this.SetState(StateFlags.WriteScheduled);
bool pending;
#if NETSTANDARD1_3
#if NETSTANDARD2_0
pending = this.Socket.SendAsync(operation);
#else
if (ExecutionContext.IsFlowSuppressed())

2
src/DotNetty.Transport/Channels/Sockets/SocketDatagramChannel.cs
Просмотреть файл

@ -115,7 +115,7 @@ namespace DotNetty.Transport.Channels.Sockets
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())

21
src/DotNetty.Transport/DotNetty.Transport.csproj
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="NuGet">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageId>DotNetty.Transport</PackageId>
<Description>Transport model in DotNetty</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>DotNetty: transport model</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>0.6.0</VersionPrefix>
<VersionPrefix>0.7.0</VersionPrefix>
<Authors>Microsoft</Authors>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -23,7 +23,7 @@
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Azure/DotNetty/</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
@ -32,19 +32,4 @@
<ProjectReference Include="..\DotNetty.Common\DotNetty.Common.csproj" />
<ProjectReference Include="..\DotNetty.Buffers\DotNetty.Buffers.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
</ItemGroup>
</Project>

4
src/shared/SharedAssemblyInfo.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.Reflection;
[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")]

4
test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Codecs.Http.Tests/DotNetty.Codecs.Http.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

4
test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

4
test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />

6
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

1
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;

11
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

13
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

12
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

4
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
{

12
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

4
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
{

1
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;

12
test/DotNetty.Microbench/DotNetty.Microbench.csproj
Просмотреть файл

@ -2,20 +2,18 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.13" />
<PackageReference Include="BenchmarkDotNet.Core" Version="0.10.13" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.10.13" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.61" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DotNetty.Codecs.Http\DotNetty.Codecs.Http.csproj" />

1
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;

4
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
{

1
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;

4
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
{

4
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
{

5
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
{

4
test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
@ -11,7 +11,7 @@
<EmbeddedResource Include="..\..\shared\contoso.com.pfx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

4
test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

6
test/DotNetty.Transport.Libuv.Tests/DotNetty.Transport.Libuv.Tests.csproj
Просмотреть файл

@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

4
test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj
Просмотреть файл

@ -4,14 +4,14 @@
</PropertyGroup>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net452</TargetFramework>
<TargetFramework>net472</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ApplicationIcon />
<OutputTypeEx>library</OutputTypeEx>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NBench" Version="1.0.4" />
<PackageReference Include="NBench" Version="2.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DotNetty.Common\DotNetty.Common.csproj" />

4
test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>../../DotNetty.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.3.1" />