Skip to content

Commit 5be3cb1

Browse files
304NotModified304NotModified
authored
Merge pull request #171 from snakefoot/master
Implement .NET standard 2 features for .NET 4.6.1 + update dependencies + messagetemplates
2 parents c8165fa + 98c6202 commit 5be3cb1

6 files changed

Lines changed: 23 additions & 32 deletions

File tree

‎examples/NetCore2/ConsoleExample/ConsoleExample.csproj‎

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

33
<PropertyGroup>
4+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
5+
46
<OutputType>Exe</OutputType>
57
<TargetFramework>netcoreapp2.0</TargetFramework>
68
</PropertyGroup>
79

810
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
1012
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
11-
<PackageReference Include="NLog" Version="4.5.0-beta07" />
1213
</ItemGroup>
1314

1415
<ItemGroup>

‎src/NLog.Extensions.Logging/ConfigureExtensions.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory, NLogProviderOp
4040
return factory;
4141
}
4242

43-
#if NETSTANDARD2_0
44-
43+
#if !NETCORE1_0
4544
/// <summary>
4645
/// Enable NLog as logging provider in .NET Core.
4746
/// </summary>
@@ -75,6 +74,9 @@ private static void ConfigureHiddenAssemblies()
7574
try
7675
{
7776
//ignore these assemblies for ${callsite}
77+
#if !NETCORE1_0
78+
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.ILoggingBuilder).GetTypeInfo().Assembly); //Microsoft.Logging
79+
#endif
7880
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.LoggerFactoryExtensions).GetTypeInfo().Assembly); //Microsoft.Extensions.Logging
7981
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.ILogger).GetTypeInfo().Assembly); // Microsoft.Extensions.Logging.Abstractions
8082
LogManager.AddHiddenAssembly(typeof(NLog.Extensions.Logging.ConfigureExtensions).GetTypeInfo().Assembly); //NLog.Extensions.Logging
@@ -106,8 +108,7 @@ private static void ConfigureHiddenAssemblies()
106108
/// <returns>Current configuration for chaining.</returns>
107109
public static LoggingConfiguration ConfigureNLog(this ILoggerFactory loggerFactory, string configFileRelativePath)
108110
{
109-
110-
#if NETCORE
111+
#if NETCORE1_0 && !NET451
111112
var rootPath = System.AppContext.BaseDirectory;
112113
#else
113114
var rootPath = AppDomain.CurrentDomain.BaseDirectory;

‎src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ rc2 (see https://github.com/NLog/NLog.Extensions.Logging/milestone/9?closed=1)
3636
</PropertyGroup>
3737

3838
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
39-
<PackageReference Include="NLog" Version="[4.4.12,5)" />
39+
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
4040
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
4141
<Reference Include="System.Xml" />
4242
<Reference Include="System.Runtime" />
@@ -45,16 +45,16 @@ rc2 (see https://github.com/NLog/NLog.Extensions.Logging/milestone/9?closed=1)
4545
<Reference Include="Microsoft.CSharp" />
4646
</ItemGroup>
4747
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
48-
<PackageReference Include="NLog" Version="[4.4.12,5)" />
48+
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
4949
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
5050
<Reference Include="System.Xml" />
5151
<Reference Include="System.Runtime" />
5252
<Reference Include="System.Xml.Serialization" />
5353
<Reference Include="System" />
5454
<Reference Include="Microsoft.CSharp" />
5555
</ItemGroup>
56-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'netstandard2.0'">
57-
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
56+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'net451'">
57+
<DefineConstants>$(DefineConstants);NETCORE1_0</DefineConstants>
5858
</PropertyGroup>
5959
<PropertyGroup>
6060
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NLog.Extensions.Logging.xml</DocumentationFile>
@@ -66,12 +66,11 @@ rc2 (see https://github.com/NLog/NLog.Extensions.Logging/milestone/9?closed=1)
6666
</ItemGroup>
6767
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
6868
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
69-
<PackageReference Include="NLog" Version="[4.5.0-beta07,5)" />
69+
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
7070
<PackageReference Include="System.AppContext" Version="4.3.0" />
7171
</ItemGroup>
7272
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
7373
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
74-
<PackageReference Include="NLog" Version="[4.5.0-beta07,5)" />
75-
<PackageReference Include="System.AppContext" Version="4.3.0" />
74+
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
7675
</ItemGroup>
7776
</Project>

‎src/NLog.Extensions.Logging/NLogLogger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private LogEventInfo CreateLogEventInfo(LogLevel nLogLogLevel, string message, I
6060
{
6161
if (firstParameterName.Length != 1 || !char.IsDigit(firstParameterName[0]))
6262
{
63-
#if NETSTANDARD2_0
63+
#if !NETSTANDARD1_3
6464
var originalFormat = parameterList[parameterList.Count - 1];
6565
string originalMessage = null;
6666
if (originalFormat.Key == OriginalFormatPropertyName)

‎src/NLog.Extensions.Logging/NLogMessageParameterList.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace NLog.Extensions.Logging
99
{
10-
#if NETSTANDARD2_0
10+
#if !NETSTANDARD1_3
1111
/// <summary>
1212
/// Converts Microsoft Extension Logging ParameterList into NLog MessageTemplate ParameterList
1313
/// </summary>

‎test/NLog.Extensions.Logging.Tests.csproj‎

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

3-
<PropertyGroup>
3+
<PropertyGroup>
4+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
5+
46
<TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net461</TargetFrameworks>
57
</PropertyGroup>
68

79
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9-
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
11+
<PackageReference Include="xunit" Version="2.3.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1113
</ItemGroup>
1214

13-
14-
15-
1615
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
1716
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
1817
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
19-
<PackageReference Include="NLog" Version="4.5.0-beta07" />
20-
<PackageReference Include="System.AppContext" Version="4.3.0" />
2118
</ItemGroup>
19+
2220
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
2321
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
2422
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
25-
<PackageReference Include="NLog" Version="4.5.0-beta07" />
26-
<PackageReference Include="System.AppContext" Version="4.3.0" />
2723
</ItemGroup>
2824

2925
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
30-
<PackageReference Include="NLog" Version="4.4.12" />
3126
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
3227
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
33-
<Reference Include="System.Xml" />
34-
<Reference Include="System.Runtime" />
35-
<Reference Include="System.Xml.Serialization" />
36-
<Reference Include="System" />
37-
<Reference Include="Microsoft.CSharp" />
3828
</ItemGroup>
3929

4030
<ItemGroup>

0 commit comments

Comments
 (0)