Align project namespaces across example projects

NLog · Jan 9, 2021 · 1b30822 · 1b30822
1 parent 067fab4
commit 1b30822
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 44 deletions.
diff --git 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/.../ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj b/.../ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <TargetLatestAspNetCoreRuntimePatch>true</TargetLatestAspNetCoreRuntimePatch>
     <RuntimeFrameworkVersion>2.1.*</RuntimeFrameworkVersion>
-    <AssemblyName>NLog.Web.AspNetCore2.Example</AssemblyName>
-    <RootNamespace>NLog.Web.AspNetCore2.Example</RootNamespace>
+    <AssemblyName>ASP.NetCore2_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore2_NLog_Web_Example</RootNamespace>
     <FileVersion>1.0.0.1</FileVersion>
     <InformationalVersion>1.0.0.2</InformationalVersion>
   </PropertyGroup>

diff --git a/...s/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs b/...s/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RootNamespace>ASP.NET_Core_3___VS2019</RootNamespace>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyName>ASP.NetCore3_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore3_NLog_Web_Example</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,15 +3,15 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - ASP.NET_Core_3___VS2019</title>
+    <title>@ViewData["Title"] - ASP.NetCore3_NLog_Web_Example</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NET_Core_3___VS2019</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NetCore3_NLog_Web_Example</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -37,7 +37,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2019 - ASP.NET_Core_3___VS2019 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2019 - ASP.NetCore3_NLog_Web_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using ASP.NET_Core_3___VS2019
-@using ASP.NET_Core_3___VS2019.Models
+@using ASP.NetCore3_NLog_Web_Example
+@using ASP.NetCore3_NLog_Web_Example.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>ASP.NET_Core_5_NLog_Example</RootNamespace>
+    <AssemblyName>ASP.NetCore5_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore5_NLog_Web_Example</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
-    <PackageReference Include="NLog" Version="4.7.6" />
+    <ProjectReference Include="..\..\..\src\NLog.Web.AspNetCore\NLog.Web.AspNetCore.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs
@@ -1,4 +1,4 @@
-using ASP.NET_Core_5_NLog_Example.Models;
+using ASP.NetCore5_NLog_Web_Example.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ASP.NET_Core_5_NLog_Example.Controllers
+namespace ASP.NetCore5_NLog_Web_Example.Controllers
 {
     public class HomeController : Controller
     {

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ASP.NET_Core_5_NLog_Example.Models
+namespace ASP.NetCore5_NLog_Web_Example.Models
 {
     public class ErrorViewModel
     {

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs
@@ -4,7 +4,7 @@
 using System;
 using NLog.Web;
 
-namespace ASP.NET_Core_5_NLog_Example
+namespace ASP.NetCore5_NLog_Web_Example
 {
     public class Program
     {

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "ASP.NET_Core_5_NLog_Example": {
+    "ASP.NetCore5_NLog_Web_Example": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ASP.NET_Core_5_NLog_Example
+namespace ASP.NetCore5_NLog_Web_Example
 {
     public class Startup
     {

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml
@@ -3,15 +3,15 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - ASP.NET_Core_5_NLog_Example</title>
+    <title>@ViewData["Title"] - ASP.NetCore5_NLog_Web_Example</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NET_Core_5_NLog_Example</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NetCore5_NLog_Web_Example</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -37,7 +37,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2020 - ASP.NET_Core_5_NLog_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2020 - ASP.NetCore5_NLog_Web_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using ASP.NET_Core_5_NLog_Example
-@using ASP.NET_Core_5_NLog_Example.Models
+@using ASP.NetCore5_NLog_Web_Example
+@using ASP.NetCore5_NLog_Web_Example.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers