diff --git a/NLog.Web.sln b/NLog.Web.sln index 75b5ea0a6..ea0112e1c 100644 --- a/NLog.Web.sln +++ b/NLog.Web.sln @@ -22,7 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{A9 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASP.NET 4.6.1 - VS2017", "examples\ASP.NET 4.6.1\Visual Studio 2017\ASP.NET 4.6.1 - VS2017\ASP.NET 4.6.1 - VS2017.csproj", "{0BF1FB4E-D5AE-46DE-9E80-E2DD40235552}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASP.NET Core 3 - VS2019", "examples\ASP.NET Core 3\ASP.NET Core 3 - VS2019\ASP.NET Core 3 - VS2019.csproj", "{A0DF49D3-74E1-4FD2-8197-017A824B9AED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASP.NET Core 3 - VS2019", "examples\ASP.NET Core 3\ASP.NET Core 3 - VS2019\ASP.NET Core 3 - VS2019.csproj", "{A0DF49D3-74E1-4FD2-8197-017A824B9AED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj index d0cf6f416..28239042d 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj @@ -4,8 +4,8 @@ netcoreapp2.1 true 2.1.* - NLog.Web.AspNetCore2.Example - NLog.Web.AspNetCore2.Example + ASP.NetCore2_NLog_Web_Example + ASP.NetCore2_NLog_Web_Example 1.0.0.1 1.0.0.2 diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs index 24b56e071..c7ca1db31 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs @@ -4,10 +4,10 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using NLog.Web.AspNetCore2.Example.Models; +using ASP.NetCore2_NLog_Web_Example.Models; using NLog.Web.LayoutRenderers; -namespace NLog.Web.AspNetCore2.Example.Controllers +namespace ASP.NetCore2_NLog_Web_Example.Controllers { public class HomeController : Controller { diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs index b09db2c59..2c99bc0d5 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace NLog.Web.AspNetCore2.Example.Models +namespace ASP.NetCore2_NLog_Web_Example.Models { public class ErrorViewModel { diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs index a9ff052a8..4438347df 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; -namespace NLog.Web.AspNetCore2.Example.Models +namespace ASP.NetCore2_NLog_Web_Example.Models { public class MessageModel { diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs index 1f1b4ec6d..2f374fc20 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs @@ -6,7 +6,7 @@ using NLog.Extensions.Logging; using NLog.Web; -namespace NLog.Web.AspNetCore2.Example +namespace ASP.NetCore2_NLog_Web_Example { public static class Program { diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs index fbfcae92c..a0aa3b629 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace NLog.Web.AspNetCore2.Example +namespace ASP.NetCore2_NLog_Web_Example { public class Startup { diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml index 26773bcfa..5bdae3981 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml @@ -1,4 +1,4 @@ -@model NLog.Web.AspNetCore2.Example.Models.MessageModel +@model ASP.NetCore2_NLog_Web_Example.Models.MessageModel @{ ViewData["Title"] = "Contact"; diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml index 381f7f037..693811a2d 100644 --- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml +++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml @@ -1,5 +1,5 @@ -@using NLog.Web.AspNetCore2.Example.Models -@model NLog.Web.AspNetCore2.Example.Models.ErrorViewModel +@using ASP.NetCore2_NLog_Web_Example.Models +@model ASP.NetCore2_NLog_Web_Example.Models.ErrorViewModel @{ ViewData["Title"] = "Error"; } diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj index b11080498..6199d8f5b 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj @@ -1,8 +1,9 @@ - + - netcoreapp3.0 - ASP.NET_Core_3___VS2019 + netcoreapp3.1 + ASP.NetCore3_NLog_Web_Example + ASP.NetCore3_NLog_Web_Example diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs index 1239dc554..9dd55bb7c 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace ASP.NET_Core_3___VS2019.Controllers +namespace ASP.NetCore3_NLog_Web_Example.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs index 4c67555e0..bbea4b7e0 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using ASP.NET_Core_3___VS2019.Models; +using ASP.NetCore3_NLog_Web_Example.Models; -namespace ASP.NET_Core_3___VS2019.Controllers +namespace ASP.NetCore3_NLog_Web_Example.Controllers { public class HomeController : Controller { diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs index 7211ceea0..d7d73a82c 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace ASP.NET_Core_3___VS2019.Models +namespace ASP.NetCore3_NLog_Web_Example.Models { public class ErrorViewModel { diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs index 763e9a6a9..f41a3d381 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs @@ -3,12 +3,11 @@ using System.Linq; using System.Threading.Tasks; -namespace ASP.NET_Core_3___VS2019.Models +namespace ASP.NetCore3_NLog_Web_Example.Models { public class ItemModel { public string Name { get; set; } public string Value { get; set; } - } } diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs index 5059b7998..d588bc79e 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs @@ -9,7 +9,7 @@ using NLog; using NLog.Web; -namespace ASP.NET_Core_3___VS2019 +namespace ASP.NetCore3_NLog_Web_Example { public class Program { diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json index 1d95d9d32..fa6a663ee 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ASP.NET_Core_3___VS2019": { + "ASP.NetCore3_NLog_Web_Example": { "commandName": "Project", "launchBrowser": true, "applicationUrl": "https://localhost:5001;http://localhost:5000", diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs index 448b36bb1..ead12a89b 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace ASP.NET_Core_3___VS2019 +namespace ASP.NetCore3_NLog_Web_Example { public class Startup { diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml index ecf7548cd..af19b6502 100644 --- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml +++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - ASP.NET_Core_3___VS2019 + @ViewData["Title"] - ASP.NetCore3_NLog_Web_Example @@ -11,7 +11,7 @@