Skip to content

Commit c0cd276

Browse files
nblumhardtnblumhardt
committed
Merge branch 'dev'
2 parents c6b2cc6 + 8e6e271 commit c0cd276

File tree

6 files changed

+212
-15
lines changed

6 files changed

+212
-15
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![Build status](https://ci.appveyor.com/api/projects/status/865nohxfiq1rnby0/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-framework-logging/branch/master) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Framework.Logging.svg?style=flat)](https://www.nuget.org/packages/Serilog.Framework.Logging/)
33

44

5-
A serilog provider for [Microsoft.Framework.Logging](https://www.nuget.org/packages/Microsoft.Framework.Logging), the logging subsystem used by ASP.NET 5.
5+
A serilog provider for [Microsoft.Extensions.Logging](https://www.nuget.org/packages/Microsoft.Extensions.Logging), the logging subsystem used by ASP.NET 5. (Previously known as [Microsoft.Framework.Logging](https://github.com/aspnet/Logging/issues/257)).
66

77
This package routes ASP.NET log messages through Serilog, so you can get information about ASP.NET's internal operations logged to the same Serilog sinks as your application events.
88

@@ -68,7 +68,7 @@ Two things:
6868

6969
### Building from source
7070

71-
To build the `dev` branch, which tracks the `dev` branch of _Microsoft.Framework.Logging_, you must add https://www.myget.org/F/aspnetvnext/ to your package sources.
71+
To build the `dev` branch, which tracks the `dev` branch of _Microsoft.Extensions.Logging_, you must add https://www.myget.org/F/aspnetvnext/ to your package sources.
7272
7373
### Credits
7474

‎samples/Sample/project.lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,7 +1921,7 @@
19211921
},
19221922
"Serilog/1.5.11": {
19231923
"type": "package",
1924-
"sha512": "XNMHuP9eRWk7ffNtEAtACoBqqrSGfioQnEbeK/boi/qtamh3ZgYXvUwH9/PytJdg3LGOIT0quyTiCNaqYlJUuQ==",
1924+
"sha512": "n+U19G0/9oZ+6pxnk9URbgrd+dk3hTyTzTo0lkEPRzmzXfU+Je8hmKqRSB9cLDZUF79jxZZNfA9Sp1YmKAZu4g==",
19251925
"files": [
19261926
"lib/net40/Serilog.dll",
19271927
"lib/net40/Serilog.FullNetFx.dll",
@@ -2582,7 +2582,7 @@
25822582
"System.Reflection/4.1.0-beta-23225": {
25832583
"type": "package",
25842584
"serviceable": true,
2585-
"sha512": "nlguo6AocBKGccv4CFSMCOR2/vU+93u/yvzFKO6ViNJ/SBz2VEZ1nOeW93vqKKpOMJkt3YtTvMWmS+kUGz/1bA==",
2585+
"sha512": "WbLtaCxoe5XdqEyZuGpemSQ8YBJ8cj11zx+yxOxJfHbNrmu7oMQ29+J50swaqg3soUc3BVBMqfIhb/7gocDHQA==",
25862586
"files": [
25872587
"lib/DNXCore50/System.Reflection.dll",
25882588
"lib/MonoAndroid10/_._",

‎src/Serilog.Framework.Logging/SerilogLoggerProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
#if NET45 || DNX451
5+
#if NET451 || DNX451
66
using System.Runtime.Remoting;
77
using System.Runtime.Remoting.Messaging;
88
#else

‎src/Serilog.Framework.Logging/project.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,24 @@
1212
},
1313

1414
"frameworks": {
15+
"net451": {
16+
"frameworkAssemblies": {
17+
"System.Runtime": ""
18+
}
19+
},
1520
"dnx451": {
1621
"frameworkAssemblies": {
1722
"System.Runtime": ""
1823
}
1924
},
2025
"dnxcore50": {
21-
"dependencies": {
22-
"System.Console": "4.0.0-beta-23516",
23-
"System.Collections": "4.0.10-beta-23516",
24-
"System.Linq": "4.0.0",
25-
"System.Threading": "4.0.10-beta-23516",
26-
"Microsoft.CSharp": "4.0.0"
27-
}
26+
"dependencies": {
27+
"System.Console": "4.0.0-beta-23516",
28+
"System.Collections": "4.0.10-beta-23516",
29+
"System.Linq": "4.0.0",
30+
"System.Threading": "4.0.10-beta-23516",
31+
"Microsoft.CSharp": "4.0.0"
32+
}
2833
}
2934
}
3035
}

‎src/Serilog.Framework.Logging/project.lock.json

Lines changed: 194 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,69 @@
22
"locked": false,
33
"version": 2,
44
"targets": {
5+
".NETFramework,Version=v4.5.1": {
6+
"Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final": {
7+
"type": "package",
8+
"frameworkAssemblies": [
9+
"Microsoft.CSharp",
10+
"mscorlib",
11+
"System",
12+
"System.Core"
13+
],
14+
"compile": {
15+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
16+
},
17+
"runtime": {
18+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
19+
}
20+
},
21+
"Microsoft.Extensions.Logging/1.0.0-rc1-final": {
22+
"type": "package",
23+
"dependencies": {
24+
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
25+
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-final"
26+
},
27+
"frameworkAssemblies": [
28+
"Microsoft.CSharp",
29+
"mscorlib",
30+
"System",
31+
"System.Collections.Concurrent",
32+
"System.Core"
33+
],
34+
"compile": {
35+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
36+
},
37+
"runtime": {
38+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
39+
}
40+
},
41+
"Microsoft.Extensions.Logging.Abstractions/1.0.0-rc1-final": {
42+
"type": "package",
43+
"frameworkAssemblies": [
44+
"Microsoft.CSharp",
45+
"mscorlib",
46+
"System",
47+
"System.Core"
48+
],
49+
"compile": {
50+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
51+
},
52+
"runtime": {
53+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
54+
}
55+
},
56+
"Serilog/1.5.11": {
57+
"type": "package",
58+
"compile": {
59+
"lib/net45/Serilog.dll": {},
60+
"lib/net45/Serilog.FullNetFx.dll": {}
61+
},
62+
"runtime": {
63+
"lib/net45/Serilog.dll": {},
64+
"lib/net45/Serilog.FullNetFx.dll": {}
65+
}
66+
}
67+
},
568
"DNX,Version=v4.5.1": {
669
"Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final": {
770
"type": "package",
@@ -465,6 +528,132 @@
465528
}
466529
}
467530
},
531+
".NETFramework,Version=v4.5.1/win7-x86": {
532+
"Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final": {
533+
"type": "package",
534+
"frameworkAssemblies": [
535+
"Microsoft.CSharp",
536+
"mscorlib",
537+
"System",
538+
"System.Core"
539+
],
540+
"compile": {
541+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
542+
},
543+
"runtime": {
544+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
545+
}
546+
},
547+
"Microsoft.Extensions.Logging/1.0.0-rc1-final": {
548+
"type": "package",
549+
"dependencies": {
550+
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
551+
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-final"
552+
},
553+
"frameworkAssemblies": [
554+
"Microsoft.CSharp",
555+
"mscorlib",
556+
"System",
557+
"System.Collections.Concurrent",
558+
"System.Core"
559+
],
560+
"compile": {
561+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
562+
},
563+
"runtime": {
564+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
565+
}
566+
},
567+
"Microsoft.Extensions.Logging.Abstractions/1.0.0-rc1-final": {
568+
"type": "package",
569+
"frameworkAssemblies": [
570+
"Microsoft.CSharp",
571+
"mscorlib",
572+
"System",
573+
"System.Core"
574+
],
575+
"compile": {
576+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
577+
},
578+
"runtime": {
579+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
580+
}
581+
},
582+
"Serilog/1.5.11": {
583+
"type": "package",
584+
"compile": {
585+
"lib/net45/Serilog.dll": {},
586+
"lib/net45/Serilog.FullNetFx.dll": {}
587+
},
588+
"runtime": {
589+
"lib/net45/Serilog.dll": {},
590+
"lib/net45/Serilog.FullNetFx.dll": {}
591+
}
592+
}
593+
},
594+
".NETFramework,Version=v4.5.1/win7-x64": {
595+
"Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final": {
596+
"type": "package",
597+
"frameworkAssemblies": [
598+
"Microsoft.CSharp",
599+
"mscorlib",
600+
"System",
601+
"System.Core"
602+
],
603+
"compile": {
604+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
605+
},
606+
"runtime": {
607+
"lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
608+
}
609+
},
610+
"Microsoft.Extensions.Logging/1.0.0-rc1-final": {
611+
"type": "package",
612+
"dependencies": {
613+
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
614+
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-final"
615+
},
616+
"frameworkAssemblies": [
617+
"Microsoft.CSharp",
618+
"mscorlib",
619+
"System",
620+
"System.Collections.Concurrent",
621+
"System.Core"
622+
],
623+
"compile": {
624+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
625+
},
626+
"runtime": {
627+
"lib/net451/Microsoft.Extensions.Logging.dll": {}
628+
}
629+
},
630+
"Microsoft.Extensions.Logging.Abstractions/1.0.0-rc1-final": {
631+
"type": "package",
632+
"frameworkAssemblies": [
633+
"Microsoft.CSharp",
634+
"mscorlib",
635+
"System",
636+
"System.Core"
637+
],
638+
"compile": {
639+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
640+
},
641+
"runtime": {
642+
"lib/net451/Microsoft.Extensions.Logging.Abstractions.dll": {}
643+
}
644+
},
645+
"Serilog/1.5.11": {
646+
"type": "package",
647+
"compile": {
648+
"lib/net45/Serilog.dll": {},
649+
"lib/net45/Serilog.FullNetFx.dll": {}
650+
},
651+
"runtime": {
652+
"lib/net45/Serilog.dll": {},
653+
"lib/net45/Serilog.FullNetFx.dll": {}
654+
}
655+
}
656+
},
468657
"DNX,Version=v4.5.1/win7-x86": {
469658
"Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final": {
470659
"type": "package",
@@ -1863,7 +2052,7 @@
18632052
},
18642053
"Serilog/1.5.11": {
18652054
"type": "package",
1866-
"sha512": "XNMHuP9eRWk7ffNtEAtACoBqqrSGfioQnEbeK/boi/qtamh3ZgYXvUwH9/PytJdg3LGOIT0quyTiCNaqYlJUuQ==",
2055+
"sha512": "n+U19G0/9oZ+6pxnk9URbgrd+dk3hTyTzTo0lkEPRzmzXfU+Je8hmKqRSB9cLDZUF79jxZZNfA9Sp1YmKAZu4g==",
18672056
"files": [
18682057
"lib/net40/Serilog.dll",
18692058
"lib/net40/Serilog.FullNetFx.dll",
@@ -2510,7 +2699,7 @@
25102699
"System.Reflection/4.1.0-beta-23225": {
25112700
"type": "package",
25122701
"serviceable": true,
2513-
"sha512": "nlguo6AocBKGccv4CFSMCOR2/vU+93u/yvzFKO6ViNJ/SBz2VEZ1nOeW93vqKKpOMJkt3YtTvMWmS+kUGz/1bA==",
2702+
"sha512": "WbLtaCxoe5XdqEyZuGpemSQ8YBJ8cj11zx+yxOxJfHbNrmu7oMQ29+J50swaqg3soUc3BVBMqfIhb/7gocDHQA==",
25142703
"files": [
25152704
"lib/DNXCore50/System.Reflection.dll",
25162705
"lib/MonoAndroid10/_._",
@@ -3182,6 +3371,9 @@
31823371
"Serilog >= 1.5.11",
31833372
"Microsoft.Extensions.Logging >= 1.0.0-rc1-final"
31843373
],
3374+
".NETFramework,Version=v4.5.1": [
3375+
"fx/System.Runtime "
3376+
],
31853377
"DNX,Version=v4.5.1": [
31863378
"fx/System.Runtime "
31873379
],

‎test/Serilog.Framework.Logging.Tests/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
},
348348
"Serilog/1.5.11": {
349349
"type": "package",
350-
"sha512": "XNMHuP9eRWk7ffNtEAtACoBqqrSGfioQnEbeK/boi/qtamh3ZgYXvUwH9/PytJdg3LGOIT0quyTiCNaqYlJUuQ==",
350+
"sha512": "n+U19G0/9oZ+6pxnk9URbgrd+dk3hTyTzTo0lkEPRzmzXfU+Je8hmKqRSB9cLDZUF79jxZZNfA9Sp1YmKAZu4g==",
351351
"files": [
352352
"lib/net40/Serilog.dll",
353353
"lib/net40/Serilog.FullNetFx.dll",

0 commit comments

Comments
 (0)