Skip to content

Commit 06a20bf

Browse files
authored
Merge pull request #59 from stackify/feature/netcore20
RT-538: NetStandard 2.0
2 parents 335b8f6 + 620de95 commit 06a20bf

32 files changed

+157
-192
lines changed
Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
<AssemblyName>CoreConsoleApp</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>CoreConsoleApp</PackageId>
88
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
9-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
9+
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
1110
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1211
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1312
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1413
</PropertyGroup>
1514

1615
<ItemGroup>
16+
<ProjectReference Include="..\StackifyLib.log4net\StackifyLib.log4net.csproj" />
1717
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
1818
<ProjectReference Include="..\NLog.Targets.Stackify\NLog.Targets.Stackify.csproj" />
19-
<ProjectReference Include="..\StackifyLib.log4net\StackifyLib.log4net.csproj" />
2019
</ItemGroup>
2120

2221
<ItemGroup>
23-
<PackageReference Include="log4net" Version="2.0.7" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2425
<PackageReference Include="NLog" Version="4.5.0-rc02" />
2526
<PackageReference Include="Serilog" Version="2.4.0" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
27+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
28+
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
2929
</ItemGroup>
30+
31+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
32+
<DefineConstants>NETCORE</DefineConstants>
33+
</PropertyGroup>
34+
35+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' ">
36+
<DefineConstants>NETFULL</DefineConstants>
37+
</PropertyGroup>
3038

3139
</Project>

Src/CoreConsoleApp/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ static void Main(string[] args)
2424
{
2525
var builder = new ConfigurationBuilder()
2626
.SetBasePath(Directory.GetCurrentDirectory())
27-
.AddJsonFile("appsettings.json", optional: true,
28-
reloadOnChange: true);
27+
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
2928

3029
var config = builder.Build();
3130
config.ConfigureStackifyLogging();

Src/CoreWebApp/CoreWebApp.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>CoreWebApp</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>CoreWebApp</PackageId>
9-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
9+
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
@@ -25,22 +24,26 @@
2524
</ItemGroup>
2625

2726
<ItemGroup>
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
29-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.0.3" />
30-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
31-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
37-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
38-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
27+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
28+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
29+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
30+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
3934
<PackageReference Include="NLog" Version="4.5.0-rc02" />
4035
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc4" />
4136
<PackageReference Include="Serilog" Version="2.4.0" />
4237
<PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
4338
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.0" />
4439
</ItemGroup>
40+
41+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
42+
<DefineConstants>NETCORE</DefineConstants>
43+
</PropertyGroup>
44+
45+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' ">
46+
<DefineConstants>NETFULL</DefineConstants>
47+
</PropertyGroup>
4548

4649
</Project>

Src/NLog.Targets.Stackify/NLog.Targets.Stackify.csproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyTitle>NLog.Targets.Stackify</AssemblyTitle>
55
<VersionPrefix>2.0.0</VersionPrefix>
6-
<TargetFrameworks>netstandard1.5;net40;net45</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net40;net45;net451;net452;net46</TargetFrameworks>
77
<AssemblyName>NLog.Targets.Stackify</AssemblyName>
88
<PackageId>NLog.Targets.Stackify</PackageId>
99
<PackageTags>stackify;errors;logs</PackageTags>
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
1616
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1717
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
18-
<Version>2.0.2</Version>
18+
<Version>2.1.0</Version>
1919
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
2020
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
2121
<PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
@@ -26,21 +26,19 @@
2626
<ItemGroup>
2727
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
2828
</ItemGroup>
29+
30+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
31+
<DefineConstants>NETCORE</DefineConstants>
32+
</PropertyGroup>
2933

30-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
34+
<ItemGroup>
3135
<PackageReference Include="NLog" Version="4.5.0-rc02" />
32-
</ItemGroup>
3336

34-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
35-
<PackageReference Include="NLog" Version="4.3.11" />
36-
<Reference Include="System" />
3737
<Reference Include="Microsoft.CSharp" />
3838
</ItemGroup>
3939

40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
41-
<PackageReference Include="NLog" Version="4.3.11" />
42-
<Reference Include="System" />
43-
<Reference Include="Microsoft.CSharp" />
44-
</ItemGroup>
40+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' ">
41+
<DefineConstants>NETFULL</DefineConstants>
42+
</PropertyGroup>
4543

4644
</Project>

Src/NLog.Targets.Stackify/StackifyTarget.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Globalization;
55
using System.Linq;
66
using System.Reflection;
7-
#if NET45 || NET40
7+
#if NETFULL
88
using System.Runtime.Remoting.Messaging;
99
#endif
1010
using StackifyLib;
@@ -145,7 +145,7 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
145145
}
146146
}
147147

148-
#if NET45 || NET40
148+
#if NETFULL
149149

150150
foreach (string key in _CallContextKeys)
151151
{

Src/StackifyLib.AspNetCore/StackifyLib.AspNetCore.csproj

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
<PropertyGroup>
44
<AssemblyTitle>StackifyLib for AspNetCore</AssemblyTitle>
55
<VersionPrefix>2.0.0</VersionPrefix>
6-
<TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>StackifyLib.AspNetCore</AssemblyName>
88
<PackageId>StackifyLib.AspNetCore</PackageId>
99
<PackageTags>stackify;metrics;errors;logs</PackageTags>
10-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
11-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1210
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1311
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1412
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15-
<Version>2.0.1</Version>
13+
<Version>2.1.0</Version>
1614
<Description>StackifyLib.AspNetCore</Description>
1715
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
1816
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
@@ -25,25 +23,14 @@
2523
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
2624
</ItemGroup>
2725

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
30-
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
31-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.0.2" />
32-
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.0.2" />
33-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
34-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.0.2" />
35-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.0.3" />
36-
</ItemGroup>
37-
38-
39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
40-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
4128
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
42-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.0.2" />
43-
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.0.2" />
44-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
45-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.0.2" />
46-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.0.3" />
29+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
30+
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" />
31+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.1" />
32+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" />
33+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.1" />
4734
</ItemGroup>
4835

4936
</Project>

Src/StackifyLib.CoreLogger/StackifyLib.CoreLogger.csproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
<PropertyGroup>
44
<AssemblyTitle>Stackify .NET Core LoggerFactory</AssemblyTitle>
55
<VersionPrefix>2.0.0</VersionPrefix>
6-
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>StackifyLib.CoreLogger</AssemblyName>
88
<PackageId>StackifyLib.CoreLogger</PackageId>
99
<PackageTags>stackify;metrics;errors;logs</PackageTags>
10-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
11-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1210
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1311
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1412
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -18,22 +16,16 @@
1816
<RepositoryType>git</RepositoryType>
1917
<PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
2018
<Description>StackifyLib.CoreLogger</Description>
21-
<Version>2.0.2</Version>
19+
<Version>2.1.0</Version>
2220
</PropertyGroup>
2321

2422
<ItemGroup>
2523
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
2624
</ItemGroup>
2725

2826

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
31-
</ItemGroup>
32-
33-
34-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
27+
<ItemGroup>
3528
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
3629
</ItemGroup>
3730

38-
39-
</Project>
31+
</Project>

Src/StackifyLib.StackifyTraceListener/StackifyLib.StackifyTraceListener.csproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
<PropertyGroup>
44
<VersionPrefix>2.0.0</VersionPrefix>
5-
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net40;net45;net451;net452;net46</TargetFrameworks>
66
<AssemblyName>StackifyLib.StackifyTraceListener</AssemblyName>
77
<PackageId>StackifyLib.StackifyTraceListener</PackageId>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
98
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
109
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1110
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12-
<Version>2.0.1</Version>
11+
<Version>2.1.0</Version>
1312
<Description>StackifyLib.StackifyTraceListener</Description>
1413
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
1514
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
@@ -22,12 +21,7 @@
2221
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
2322
</ItemGroup>
2423

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
26-
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
30-
<Reference Include="System" />
24+
<ItemGroup>
3125
<Reference Include="Microsoft.CSharp" />
3226
</ItemGroup>
3327

Src/StackifyLib.log4net/StackifyAppender.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
using Apache_log4net = log4net;
88
using log4net.Appender;
99
using log4net.Core;
10-
using log4netOffical = log4net;
11-
1210

1311
namespace StackifyLib.log4net
1412
{
@@ -323,7 +321,7 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
323321
}
324322
}
325323
}
326-
#if NET45
324+
#if NETFULL
327325
foreach (string mdcKey in _LogicalThreadContextKeys)
328326
{
329327
object mdcValue = Apache_log4net.LogicalThreadContext.Properties[mdcKey];

Src/StackifyLib.log4net/StackifyLib.log4net.csproj

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyTitle>Stackify Log4Net Appender</AssemblyTitle>
55
<VersionPrefix>2.0.0</VersionPrefix>
6-
<TargetFrameworks>netstandard1.3;net40;net45</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net40;net45</TargetFrameworks>
77
<AssemblyName>StackifyLib.log4net</AssemblyName>
88
<PackageId>StackifyLib.log4net</PackageId>
99
<PackageTags>stackify;metrics;errors;logs</PackageTags>
@@ -13,7 +13,7 @@
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1515
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16-
<Version>2.0.1</Version>
16+
<Version>2.1.0</Version>
1717
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
1818
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
1919
<RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>
@@ -25,20 +25,17 @@
2525
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
29-
<PackageReference Include="log4net" Version="2.0.7" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
33-
<PackageReference Include="log4net" Version="2.0.5" />
34-
<Reference Include="System" />
35-
<Reference Include="Microsoft.CSharp" />
36-
</ItemGroup>
37-
38-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
39-
<PackageReference Include="log4net" Version="2.0.5" />
40-
<Reference Include="System" />
28+
<ItemGroup>
29+
<PackageReference Include="log4net" Version="2.0.8" />
4130
<Reference Include="Microsoft.CSharp" />
4231
</ItemGroup>
32+
33+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
34+
<DefineConstants>NETCORE</DefineConstants>
35+
</PropertyGroup>
36+
37+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' ">
38+
<DefineConstants>NETFULL</DefineConstants>
39+
</PropertyGroup>
4340

4441
</Project>

0 commit comments

Comments
 (0)