From 7983924871376bb768781aff1e8a523ff14e9bb0 Mon Sep 17 00:00:00 2001
From: Isaac Levin <isaac.r.levin@gmail.com>
Date: Thu, 6 Jun 2019 10:42:09 -0400
Subject: [PATCH 01/12] Added ILogger and cleanup

---
 .../GrpcService-CSharp/Services/GreeterService.cs      |  6 ++++++
 .../content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs |  7 +++++++
 .../content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs |  7 +++++++
 .../RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs       |  7 +++++++
 .../RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml   |  7 +++++--
 .../Pages/Shared/_ValidationScriptsPartial.cshtml      |  2 +-
 .../StarterWeb-CSharp/Controllers/HomeController.cs    |  7 +++++++
 .../StarterWeb-CSharp/Views/Shared/_Layout.cshtml      |  7 +++++--
 .../StarterWeb-FSharp/Controllers/HomeController.fs    |  4 +++-
 .../StarterWeb-FSharp/Views/Shared/_Layout.cshtml      |  7 +++++--
 .../WebApi-CSharp/Controllers/WeatherController.cs     |  7 +++++++
 .../WebApi-FSharp/Controllers/WeatherController.fs     |  4 +++-
 .../Controllers/OidcConfigurationController.cs         |  6 +++++-
 .../Angular-CSharp/Controllers/SampleDataController.cs |  7 +++++++
 .../content/Angular-CSharp/Pages/Error.cshtml.cs       |  7 +++++++
 .../Controllers/OidcConfigurationController.cs         |  5 ++++-
 .../React-CSharp/Controllers/SampleDataController.cs   | 10 ++++++++--
 .../content/React-CSharp/Pages/Error.cshtml.cs         |  6 ++++++
 .../Controllers/SampleDataController.cs                |  6 ++++++
 .../content/ReactRedux-CSharp/Pages/Error.cshtml.cs    |  6 ++++++
 20 files changed, 112 insertions(+), 13 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
index 0277296bba..b10d62ad78 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
@@ -3,11 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Grpc.Core;
+using Microsoft.Extensions.Logging;
 
 namespace GrpcService_CSharp
 {
     public class GreeterService : Greeter.GreeterBase
     {
+        private readonly ILogger<GreeterService> logger;
+        public GreeterService(ILogger<GreeterService> _logger)
+        {
+            logger = _logger;
+        }
         public override Task<HelloReply> SayHello(HelloRequest request, ServerCallContext context)
         {
             return Task.FromResult(new HelloReply
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
index 9cb1d63663..dc4b9b8028 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {
@@ -15,6 +16,12 @@ namespace Company.WebApplication1.Pages
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
+        private readonly ILogger<ErrorModel> logger;
+
+        public ErrorModel(ILogger<ErrorModel> _logger)
+        {
+            logger = _logger;
+        }
         public void OnGet()
         {
             RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
index 1c86e8c152..0bbd03961a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
@@ -4,11 +4,18 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {
     public class IndexModel : PageModel
     {
+        private readonly ILogger<IndexModel> logger;
+
+        public ErrorModel(ILogger<IndexModel> _logger)
+        {
+            logger = _logger;
+        }
         public void OnGet()
         {
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
index 4d01da1849..251c45db77 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
@@ -4,11 +4,18 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {
     public class PrivacyModel : PageModel
     {
+        private readonly ILogger<PrivacyModel> logger;
+
+        public ErrorModel(ILogger<PrivacyModel> _logger)
+        {
+            logger = _logger;
+        }
         public void OnGet()
         {
         }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
index 198a48ef80..03faa34a5d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
@@ -34,9 +34,12 @@
             </div>
         </nav>
     </header>
-    <main role="main" class="pb-3">
+    <div class="container">
+        <main role="main" class="pb-3">
             @RenderBody()
-    </main>
+        </main>
+    </div>
+
     <footer class="border-top footer text-muted">
         <div class="container">
             &copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-page="/Privacy">Privacy</a>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
index 754029c03a..21638b6044 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
 <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
\ No newline at end of file
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
index 45b94e8a22..e90b06bf1f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authorization;
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Company.WebApplication1.Models;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {
@@ -16,6 +17,12 @@ namespace Company.WebApplication1.Controllers
 #endif
     public class HomeController : Controller
     {
+        private readonly ILogger<HomeController> logger;
+
+        public HomeController(ILogger<HomeController> _logger)
+        {
+            logger = _logger;
+        }
         public IActionResult Index()
         {
             return View();
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
index 5ae18ac630..d8d08c1a35 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@@ -34,9 +34,12 @@
             </div>
         </nav>
     </header>
-    <main role="main" class="pb-3">
+    <div class="container">
+        <main role="main" class="pb-3">
             @RenderBody()
-    </main>
+        </main>
+    </div>
+
     <footer class="border-top footer text-muted">
         <div class="container">
             &copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Controllers/HomeController.fs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Controllers/HomeController.fs
index 65650b2e82..2ee1330225 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Controllers/HomeController.fs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Controllers/HomeController.fs
@@ -5,9 +5,11 @@ open System.Collections.Generic
 open System.Linq
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Mvc
+open Microsoft.Extensions.Logging
 
-type HomeController () =
+type HomeController (_logger : ILogger<HomeController>) =
     inherit Controller()
+    let mutable logger = _logger
 
     member this.Index () =
         this.View()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
index 6f62720a1f..e4a016e02e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
@@ -30,9 +30,12 @@
             </div>
         </nav>
     </header>
-    <main role="main" class="pb-3">
+    <div class="container">
+        <main role="main" class="pb-3">
             @RenderBody()
-    </main>
+        </main>
+    </div>
+
     <footer class="border-top footer text-muted">
         <div class="container">
             &copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherController.cs
index f562613ea4..05931f13ef 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherController.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherController.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 #endif
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {
@@ -17,6 +18,12 @@ namespace Company.WebApplication1.Controllers
     [ApiController]
     public class WeatherController : ControllerBase
     {
+        private readonly ILogger<WeatherController> logger;
+
+        public WeatherController(ILogger<WeatherController> _logger)
+        {
+            logger = _logger;
+        }
         [HttpGet]
         public ActionResult<WeatherResult> GetWeatherForecasts(string location, TemperatureUnit unit)
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Controllers/WeatherController.fs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Controllers/WeatherController.fs
index 29ac8c9365..4b9629f24a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Controllers/WeatherController.fs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Controllers/WeatherController.fs
@@ -5,6 +5,7 @@ open System.Collections.Generic
 open System.Linq
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Mvc
+open Microsoft.Extensions.Logging
 
 type public TemperatureUnit =
    | Celsius=0
@@ -18,8 +19,9 @@ type WeatherResult = {
 
 [<Route("api/SampleData/[controller]")>]
 [<ApiController>]
-type WeatherController () =
+type WeatherController (_logger : ILogger<WeatherController>) =
     inherit ControllerBase()
+    let mutable logger = _logger
 
     [<HttpGet>]
     member this.Get(location:string, unit: TemperatureUnit) =
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
index ac373bc067..f85da4cac4 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
@@ -1,13 +1,17 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {
     public class OidcConfigurationController : Controller
     {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+        private readonly ILogger<SampleDataController> logger;
+
+        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
         {
             ClientRequestParametersProvider = clientRequestParametersProvider;
+            logger = _logger;
         }
 
         public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs
index db61bf34b9..bf4e077dd2 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 #if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Authorization;
 #endif
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {
@@ -15,6 +16,12 @@ namespace Company.WebApplication1.Controllers
     [Route("api/[controller]")]
     public class SampleDataController : Controller
     {
+        private readonly ILogger<SampleDataController> logger;
+
+        public SampleDataController(ILogger<SampleDataController> _logger)
+        {
+            logger = _logger;
+        }
         private static string[] Summaries = new[]
         {
             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs
index 9cb1d63663..0b31293ed8 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs
@@ -5,12 +5,19 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
     {
+        private readonly ILogger<ErrorModel> logger;
+
+        public ErrorModel(ILogger<ErrorModel> _logger)
+        {
+            logger = _logger;
+        }
         public string RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
index ac373bc067..7dbc9995da 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
@@ -5,9 +5,12 @@ namespace Company.WebApplication1.Controllers
 {
     public class OidcConfigurationController : Controller
     {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+        private readonly ILogger<SampleDataController> logger;
+
+        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
         {
             ClientRequestParametersProvider = clientRequestParametersProvider;
+            logger = _logger;
         }
 
         public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
index 258aad9c69..d76a63941c 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
@@ -9,12 +9,18 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace Company.WebApplication1.Controllers
 {
-    #if (IndividualLocalAuth)
+#if (IndividualLocalAuth)
     [Authorize]
-    #endif
+#endif
     [Route("api/[controller]")]
     public class SampleDataController : Controller
     {
+        private readonly ILogger<SampleDataController> logger;
+
+        public SampleDataController(ILogger<SampleDataController> _logger)
+        {
+            logger = _logger;
+        }
         private static string[] Summaries = new[]
         {
             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
index 9cb1d63663..43f819681a 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
@@ -11,6 +11,12 @@ namespace Company.WebApplication1.Pages
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
     {
+        private readonly ILogger<ErrorModel> logger;
+
+        public ErrorModel(ILogger<ErrorModel> _logger)
+        {
+            logger = _logger;
+        }
         public string RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
index 4167f03915..f2a5625adc 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
@@ -9,6 +9,12 @@ namespace Company.WebApplication1.Controllers
     [Route("api/[controller]")]
     public class SampleDataController : Controller
     {
+        private readonly ILogger<SampleDataController> logger;
+
+        public SampleDataController(ILogger<SampleDataController> _logger)
+        {
+            logger = _logger;
+        }
         private static string[] Summaries = new[]
         {
             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
index 9cb1d63663..43f819681a 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
@@ -11,6 +11,12 @@ namespace Company.WebApplication1.Pages
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
     {
+        private readonly ILogger<ErrorModel> logger;
+
+        public ErrorModel(ILogger<ErrorModel> _logger)
+        {
+            logger = _logger;
+        }
         public string RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);

From 9468e2dfed44271bd0a9895c3926a176d3b840cf Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Thu, 6 Jun 2019 10:54:10 -0400
Subject: [PATCH 02/12] Update _ValidationScriptsPartial.cshtml

---
 .../Pages/Shared/_ValidationScriptsPartial.cshtml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
index 21638b6044..a9026155c3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
 <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>

From 8c5800a94cb6ea52251539c809d476365b3277d0 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Thu, 6 Jun 2019 10:55:02 -0400
Subject: [PATCH 03/12] Update Index.cshtml.cs

---
 .../content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
index 0bbd03961a..293b9fa78b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
@@ -12,7 +12,7 @@ namespace Company.WebApplication1.Pages
     {
         private readonly ILogger<IndexModel> logger;
 
-        public ErrorModel(ILogger<IndexModel> _logger)
+        public IndexModel(ILogger<IndexModel> _logger)
         {
             logger = _logger;
         }

From 018800ed41e3a37876b306792239405599fddac2 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Thu, 6 Jun 2019 10:55:26 -0400
Subject: [PATCH 04/12] Update Privacy.cshtml.cs

---
 .../content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
index 251c45db77..6262f55647 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
@@ -12,7 +12,7 @@ namespace Company.WebApplication1.Pages
     {
         private readonly ILogger<PrivacyModel> logger;
 
-        public ErrorModel(ILogger<PrivacyModel> _logger)
+        public PrivacyModel(ILogger<PrivacyModel> _logger)
         {
             logger = _logger;
         }

From 6410d4e761f6bbd68bcfae0fb6b78604db1c8814 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Thu, 6 Jun 2019 10:56:28 -0400
Subject: [PATCH 05/12] Update OidcConfigurationController.cs

---
 .../Angular-CSharp/Controllers/OidcConfigurationController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
index f85da4cac4..75e26da4e9 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/OidcConfigurationController.cs
@@ -6,9 +6,9 @@ namespace Company.WebApplication1.Controllers
 {
     public class OidcConfigurationController : Controller
     {
-        private readonly ILogger<SampleDataController> logger;
+        private readonly ILogger<OidcConfigurationController> logger;
 
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
+        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<OidcConfigurationController> _logger)
         {
             ClientRequestParametersProvider = clientRequestParametersProvider;
             logger = _logger;

From ea55f8db711a621e5f0710f650bc45fbeb4b8b49 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Thu, 6 Jun 2019 10:57:03 -0400
Subject: [PATCH 06/12] Update OidcConfigurationController.cs

---
 .../React-CSharp/Controllers/OidcConfigurationController.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
index 7dbc9995da..4fcb4e26fb 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
@@ -5,9 +5,9 @@ namespace Company.WebApplication1.Controllers
 {
     public class OidcConfigurationController : Controller
     {
-        private readonly ILogger<SampleDataController> logger;
+        private readonly ILogger<OidcConfigurationController> logger;
 
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
+        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<OidcConfigurationController> _logger)
         {
             ClientRequestParametersProvider = clientRequestParametersProvider;
             logger = _logger;

From 6c0dcf3e6f8f829cb2ef3d413fc80e2279d06406 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:22:06 -0400
Subject: [PATCH 08/12] Update OidcConfigurationController.cs

---
 .../React-CSharp/Controllers/OidcConfigurationController.cs      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
index 4fcb4e26fb..75e26da4e9 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/OidcConfigurationController.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {

From 01d10ab08ef0fa887271abd4ed109801e1d2c2b5 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:22:26 -0400
Subject: [PATCH 09/12] Update SampleDataController.cs

---
 .../ReactRedux-CSharp/Controllers/SampleDataController.cs        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
index f2a5625adc..3b182badaf 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Controllers/SampleDataController.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {

From 7b8d34243aa5e5af4fcdf6963765f7ed75f3126f Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:22:41 -0400
Subject: [PATCH 10/12] Update Error.cshtml.cs

---
 .../content/ReactRedux-CSharp/Pages/Error.cshtml.cs              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
index 43f819681a..0b31293ed8 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/Error.cshtml.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {

From 86dde596b8b4c84f55b1e203db11344f585a3058 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:22:59 -0400
Subject: [PATCH 11/12] Update Error.cshtml.cs

---
 .../content/React-CSharp/Pages/Error.cshtml.cs                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
index 43f819681a..0b31293ed8 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Pages
 {

From af5c1eed67db378e373d02f30bef58b914642949 Mon Sep 17 00:00:00 2001
From: Isaac Levin <8878502+isaac2004@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:23:20 -0400
Subject: [PATCH 12/12] Update SampleDataController.cs

---
 .../content/React-CSharp/Controllers/SampleDataController.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
index d76a63941c..a4f2e22d56 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Controllers/SampleDataController.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 #endif
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace Company.WebApplication1.Controllers
 {