-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #501 from NLog/release/4.9
Version 4.9
- Loading branch information
Showing
87 changed files
with
40,570 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <s:Boolean x:Key="/Default/UserDictionary/Words/=Renderers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.0</TargetFramework> | ||
| <RootNamespace>ASP.NET_Core_3___VS2019</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\NLog.Web.AspNetCore\NLog.Web.AspNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Update="NLog.config"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
40 changes: 40 additions & 0 deletions
40
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.Extensions.Logging; | ||
| using ASP.NET_Core_3___VS2019.Models; | ||
|
|
||
| namespace ASP.NET_Core_3___VS2019.Controllers | ||
| { | ||
| public class HomeController : Controller | ||
| { | ||
| private readonly ILogger<HomeController> _logger; | ||
|
|
||
| public HomeController(ILogger<HomeController> logger) | ||
| { | ||
| _logger = logger; | ||
| _logger.LogDebug(1, "NLog injected into HomeController"); | ||
| } | ||
|
|
||
| public IActionResult Index() | ||
| { | ||
| _logger.LogInformation("Hello, this is the index!"); | ||
| return View(); | ||
| } | ||
|
|
||
| public IActionResult Privacy() | ||
| { | ||
| _logger.LogInformation("Hello, this is the Privacy page!"); | ||
| return View(); | ||
| } | ||
|
|
||
| [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] | ||
| public IActionResult Error() | ||
| { | ||
| return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); | ||
| } | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| using System; | ||
|
|
||
| namespace ASP.NET_Core_3___VS2019.Models | ||
| { | ||
| public class ErrorViewModel | ||
| { | ||
| public string RequestId { get; set; } | ||
|
|
||
| public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| autoReload="true" | ||
| throwConfigExceptions="true" | ||
| internalLogLevel="info" | ||
| internalLogFile="c:\temp\internal-nlog-AspNetCore3.txt"> | ||
|
|
||
| <!-- enable asp.net core layout renderers --> | ||
| <extensions> | ||
| <add assembly="NLog.Web.AspNetCore"/> | ||
| </extensions> | ||
|
|
||
| <!-- the targets to write to --> | ||
| <targets> | ||
| <!-- write logs to file --> | ||
| <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore3-all-${shortdate}.log" | ||
| layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" /> | ||
|
|
||
| <!-- another file log, only own logs. Uses some ASP.NET core renderers --> | ||
| <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore3-own-${shortdate}.log" | ||
| layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" /> | ||
| </targets> | ||
|
|
||
| <!-- rules to map from logger name to target --> | ||
| <rules> | ||
| <!--All logs, including from Microsoft--> | ||
| <logger name="*" minlevel="Trace" writeTo="allfile" /> | ||
|
|
||
| <!--Skip non-critical Microsoft logs and so log only own logs--> | ||
| <logger name="Microsoft.*" maxlevel="Info" final="true" /> <!-- BlackHole --> | ||
|
|
||
| <logger name="*" minlevel="Trace" writeTo="ownFile-web" /> | ||
| </rules> | ||
| </nlog> |
50 changes: 50 additions & 0 deletions
50
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
| using NLog.Web; | ||
|
|
||
| namespace ASP.NET_Core_3___VS2019 | ||
| { | ||
| public class Program | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger(); | ||
| try | ||
| { | ||
| logger.Debug("init main"); | ||
| CreateHostBuilder(args).Build().Run(); | ||
| } | ||
| catch (Exception exception) | ||
| { | ||
| //NLog: catch setup errors | ||
| logger.Error(exception, "Stopped program because of exception"); | ||
| throw; | ||
| } | ||
| finally | ||
| { | ||
| // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux) | ||
| NLog.LogManager.Shutdown(); | ||
| } | ||
| } | ||
|
|
||
| public static IHostBuilder CreateHostBuilder(string[] args) => | ||
| Host.CreateDefaultBuilder(args) | ||
| .ConfigureWebHostDefaults(webBuilder => | ||
| { | ||
| webBuilder.UseStartup<Startup>(); | ||
| }) | ||
| .ConfigureLogging(logging => | ||
| { | ||
| logging.ClearProviders(); | ||
| logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); | ||
| }) | ||
| .UseNLog(); // NLog: Setup NLog for Dependency injection | ||
|
|
||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:50708", | ||
| "sslPort": 44318 | ||
| } | ||
| }, | ||
| "profiles": { | ||
| "IIS Express": { | ||
| "commandName": "IISExpress", | ||
| "launchBrowser": true, | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| }, | ||
| "ASP.NET_Core_3___VS2019": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "applicationUrl": "https://localhost:5001;http://localhost:5000", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.