Skip to content

Commit 1cdaadb

Browse files
ailnnayato
ailn
authored and
nayato
committed
- target net472 and netstandard2.0
- microsoft.extensions.logging 5.0.0 - microsoft.extensions.configuration 5.0.0
1 parent 47f5ec7 commit 1cdaadb

File tree

71 files changed

+193
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+193
-278
lines changed

‎DotNetty.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
9898
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
9999
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
100100
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
101+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
101102
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
102103
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
103104
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

‎RELEASE_NOTES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 0.7.0 June 11, 2021
2+
- target net472 and netstandard2.0
3+
- microsoft.extensions.logging 5.0.0
4+
- microsoft.extensions.configuration 5.0.0
5+
16
#### 0.6.0 October 9, 2018
27
- Clearly marks Unsafe Buffer management routines as `unsafe`
38
- Changes defaults for Unpooled and Pooled buffer allocators to safe versions

‎build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ Task("Benchmark")
173173
{
174174
StartProcess(nuget.ToString() + "/nuget.exe", "install NBench.Runner -OutputDirectory tools -ExcludeVersion -Version 1.0.0");
175175

176-
var libraries = GetFiles("./test/**/bin/" + configuration + "/net452/*.Performance.dll");
176+
var libraries = GetFiles("./test/**/bin/" + configuration + "/net472/*.Performance.dll");
177177
CreateDirectory(outputPerfResults);
178178

179179
foreach (var lib in libraries)
180180
{
181181
Information("Using NBench.Runner: {0}", lib);
182182

183183
// Make sure libuv.dll exists in performance test folder
184-
CopyFiles("./test/DotNetty.Transport.Libuv.Tests/bin/" + configuration + "/net452/win-x64/libuv.dll", lib.GetDirectory(), false);
184+
CopyFiles("./test/DotNetty.Transport.Libuv.Tests/bin/" + configuration + "/net472/win-x64/libuv.dll", lib.GetDirectory(), false);
185185
CopyFiles("./tools/NBench.Runner*/**/NBench.Runner.exe", lib.GetDirectory(), false);
186186

187187
var nbenchArgs = new StringBuilder()

‎examples/Discard.Client/Discard.Client.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
4+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
5+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
</PropertyGroup>
1111
<ItemGroup>

‎examples/Discard.Server/Discard.Server.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
4+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
5+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
</PropertyGroup>
1111
<ItemGroup>

‎examples/Echo.Client/Echo.Client.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
4+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
5+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
</PropertyGroup>
1111
<ItemGroup>

‎examples/Echo.Server/Echo.Server.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
4+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
5+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
</PropertyGroup>
1111
<ItemGroup>

‎examples/Examples.Common/ExampleHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Examples.Common
66
using System;
77
using DotNetty.Common.Internal.Logging;
88
using Microsoft.Extensions.Configuration;
9-
using Microsoft.Extensions.Logging.Console;
9+
using Microsoft.Extensions.Logging;
1010

1111
public static class ExampleHelper
1212
{
@@ -22,7 +22,7 @@ public static string ProcessDirectory
2222
{
2323
get
2424
{
25-
#if NETSTANDARD1_3
25+
#if NETSTANDARD2_0
2626
return AppContext.BaseDirectory;
2727
#else
2828
return AppDomain.CurrentDomain.BaseDirectory;
@@ -32,6 +32,6 @@ public static string ProcessDirectory
3232

3333
public static IConfigurationRoot Configuration { get; }
3434

35-
public static void SetConsoleLogger() => InternalLoggerFactory.DefaultFactory.AddProvider(new ConsoleLoggerProvider((s, level) => true, false));
35+
public static void SetConsoleLogger() => InternalLoggerFactory.DefaultFactory = LoggerFactory.Create(builder => builder.AddConsole());
3636
}
3737
}

‎examples/Examples.Common/Examples.Common.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
4-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
3+
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
4+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.3</NetStandardImplicitPackageVersion>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
9-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
8+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\..\src\DotNetty.Common\DotNetty.Common.csproj" />

‎examples/Factorial.Client/Factorial.Client.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">1.6.1</NetStandardImplicitPackageVersion>
4+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
5+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">2.0.3</NetStandardImplicitPackageVersion>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
</PropertyGroup>
1111
<ItemGroup>

0 commit comments

Comments
 (0)