Skip to content

Commit 5331920

Browse files
committed
Update dev branch to track ASP.NET's dev
1 parent 386e5aa commit 5331920

File tree

12 files changed

+2179
-3236
lines changed

12 files changed

+2179
-3236
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ Two things:
6262
* You need to set `MinimumLevel` on **both** the Serilog `LoggerConfiguration` and the `ILoggerFactory`
6363
* Serilog and ASP.NET assign different priorities to the `Debug` and `Trace` levels; Serilog's `Debug` is ASP.NET's `Trace`, and vice-versa
6464

65+
### Building from source
66+
67+
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.
68+
6569
### Credits
6670

6771
This package evolved from an earlier package _Microsoft.Framework.Logging.Serilog_ [provided by the ASP.NET team](https://github.com/aspnet/Logging/pull/182).

samples/MvcSample/Startup.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
4242

4343
if (env.IsEnvironment("Development"))
4444
{
45-
app.UseBrowserLink();
4645
app.UseErrorPage(ErrorPageOptions.ShowAll);
4746
}
4847
else

samples/MvcSample/project.json

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
"version": "1.0.0-*",
44

55
"dependencies": {
6-
"Microsoft.AspNet.Diagnostics": "1.0.0-beta4",
7-
"Microsoft.AspNet.Mvc": "6.0.0-beta4",
8-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta4",
9-
"Microsoft.AspNet.Server.IIS": "1.0.0-beta4",
10-
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta4",
11-
"Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
12-
"Microsoft.AspNet.Tooling.Razor": "1.0.0-beta4",
13-
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
14-
"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta4",
15-
"Microsoft.Framework.Logging": "1.0.0-beta4",
16-
"Microsoft.Framework.Logging.Console": "1.0.0-beta4",
17-
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta4",
6+
"Microsoft.AspNet.Diagnostics": "1.0.0-beta5-13065",
7+
"Microsoft.AspNet.Mvc": "6.0.0-beta5-13890",
8+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta5-13890",
9+
"Microsoft.AspNet.Server.IIS": "1.0.0-beta5-11775",
10+
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta5-12160",
11+
"Microsoft.AspNet.StaticFiles": "1.0.0-beta5-11935",
12+
"Microsoft.AspNet.Tooling.Razor": "1.0.0-beta5-13375",
13+
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta5-11337",
14+
"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta5-12298",
15+
"Microsoft.Framework.Logging": "1.0.0-beta5-11361",
16+
"Microsoft.Framework.Logging.Console": "1.0.0-beta5-11361",
1817
"Serilog.Framework.Logging": "1.0.0-*"
1918
},
2019

@@ -28,20 +27,20 @@
2827
"dnxcore50": { }
2928
},
3029

31-
"exclude": [
32-
"wwwroot",
33-
"node_modules",
34-
"bower_components"
35-
],
36-
"publishExclude": [
37-
"node_modules",
38-
"bower_components",
39-
"**.xproj",
40-
"**.user",
41-
"**.vspscc"
42-
],
43-
"scripts": {
44-
"postrestore": [ "npm install", "bower install" ],
45-
"prepare": [ "gulp copy" ]
46-
}
30+
"exclude": [
31+
"wwwroot",
32+
"node_modules",
33+
"bower_components"
34+
],
35+
"publishExclude": [
36+
"node_modules",
37+
"bower_components",
38+
"**.xproj",
39+
"**.user",
40+
"**.vspscc"
41+
],
42+
"scripts": {
43+
"postrestore": [ "npm install", "bower install" ],
44+
"prepare": [ "gulp copy" ]
45+
}
4746
}

0 commit comments

Comments
 (0)