Update SPA templates for C#10 (#1)

- Implicit usings
- File-scoped namespace declarations

src/content/Angular-CSharp/Controllers/OidcConfigurationController.cs

@@ -1,26 +1,26 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Controllers
+namespace Company.WebApplication1.Controllers;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
+    private readonly ILogger<OidcConfigurationController> _logger;
+
+    public OidcConfigurationController(
+        IClientRequestParametersProvider clientRequestParametersProvider,
+        ILogger<OidcConfigurationController> logger)
     {
-        private readonly ILogger<OidcConfigurationController> _logger;
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+        _logger = logger;
+    }
 
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<OidcConfigurationController> logger)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-            _logger = logger;
-        }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
-
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute]string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
     }
 }

src/content/Angular-CSharp/Controllers/WeatherForecastController.cs

@@ -1,44 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-#if (!NoAuth)
+#if (!NoAuth)
 using Microsoft.AspNetCore.Authorization;
 #endif
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Controllers
-{
+namespace Company.WebApplication1.Controllers;
+
 #if (!NoAuth)
-    [Authorize]
+[Authorize]
 #endif
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
+[ApiController]
+[Route("[controller]")]
+public class WeatherForecastController : ControllerBase
+{
+    private static readonly string[] Summaries = new[]
     {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    };
 
-        private readonly ILogger<WeatherForecastController> _logger;
+    private readonly ILogger<WeatherForecastController> _logger;
 
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
+    public WeatherForecastController(ILogger<WeatherForecastController> logger)
+    {
+        _logger = logger;
+    }
 
-        [HttpGet]
-        public IEnumerable<WeatherForecast> Get()
+    [HttpGet]
+    public IEnumerable<WeatherForecast> Get()
+    {
+        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
         {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateTime.Now.AddDays(index),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
+            Date = DateTime.Now.AddDays(index),
+            TemperatureC = Random.Shared.Next(-20, 55),
+            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
+        })
+        .ToArray();
     }
 }

src/content/Angular-CSharp/Data/ApplicationDbContext.cs

@@ -1,21 +1,16 @@
-using Company.WebApplication1.Models;
-using IdentityServer4.EntityFramework.Options;
-using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using IdentityServer4.EntityFramework.Options;
+using Company.WebApplication1.Models;
 
-namespace Company.WebApplication1.Data
+namespace Company.WebApplication1.Data;
+
+public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser>
 {
-    public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser>
+    public ApplicationDbContext(DbContextOptions options, IOptions<OperationalStoreOptions> operationalStoreOptions)
+        : base(options, operationalStoreOptions)
     {
-        public ApplicationDbContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+        
     }
 }

src/content/Angular-CSharp/Models/ApplicationUser.cs

@@ -1,12 +1,8 @@
 using Microsoft.AspNetCore.Identity;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Company.WebApplication1.Models
+namespace Company.WebApplication1.Models;
+
+public class ApplicationUser : IdentityUser
 {
-    public class ApplicationUser : IdentityUser
-    {
-    }
+    
 }

src/content/Angular-CSharp/Pages/Error.cshtml.cs

@@ -1,31 +1,25 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Pages
+namespace Company.WebApplication1.Pages;
+
+[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+public class ErrorModel : PageModel
 {
-    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    public class ErrorModel : PageModel
+    private readonly ILogger<ErrorModel> _logger;
+
+    public ErrorModel(ILogger<ErrorModel> logger)
     {
-        private readonly ILogger<ErrorModel> _logger;
+        _logger = logger;
+    }
 
-        public ErrorModel(ILogger<ErrorModel> logger)
-        {
-            _logger = logger;
-        }
+    public string? RequestId { get; set; }
 
-        public string? RequestId { get; set; }
+    public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-
-        public void OnGet()
-        {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-        }
+    public void OnGet()
+    {
+        RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
     }
 }

src/content/Angular-CSharp/Program.cs

@@ -1,20 +1,8 @@
-using System;
 #if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Authentication;
-#endif
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-#if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI;
-#endif
-#if (IndividualLocalAuth)
 using Microsoft.EntityFrameworkCore;
-#endif
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-#if (IndividualLocalAuth)
 using Company.WebApplication1.Data;
 using Company.WebApplication1.Models;
 #endif

src/content/Angular-CSharp/WeatherForecast.cs

@@ -1,15 +1,12 @@
-using System;
+namespace Company.WebApplication1;
 
-namespace Company.WebApplication1
+public class WeatherForecast
 {
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
+    public DateTime Date { get; set; }
 
-        public int TemperatureC { get; set; }
+    public int TemperatureC { get; set; }
 
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 
-        public string? Summary { get; set; }
-    }
+    public string? Summary { get; set; }
 }

src/content/React-CSharp/Controllers/OidcConfigurationController.cs

@@ -1,26 +1,26 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Controllers
+namespace Company.WebApplication1.Controllers;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
+    private readonly ILogger<OidcConfigurationController> _logger;
+
+    public OidcConfigurationController(
+        IClientRequestParametersProvider clientRequestParametersProvider,
+        ILogger<OidcConfigurationController> logger)
     {
-        private readonly ILogger<OidcConfigurationController> _logger;
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+        _logger = logger;
+    }
 
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<OidcConfigurationController> logger)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-            _logger = logger;
-        }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
-
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute]string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
     }
 }

src/content/React-CSharp/Controllers/WeatherForecastController.cs

@@ -1,44 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-#if (!NoAuth)
+#if (!NoAuth)
 using Microsoft.AspNetCore.Authorization;
 #endif
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Controllers
-{
+namespace Company.WebApplication1.Controllers;
+
 #if (!NoAuth)
-    [Authorize]
+[Authorize]
 #endif
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
+[ApiController]
+[Route("[controller]")]
+public class WeatherForecastController : ControllerBase
+{
+    private static readonly string[] Summaries = new[]
     {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    };
 
-        private readonly ILogger<WeatherForecastController> _logger;
+    private readonly ILogger<WeatherForecastController> _logger;
 
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
+    public WeatherForecastController(ILogger<WeatherForecastController> logger)
+    {
+        _logger = logger;
+    }
 
-        [HttpGet]
-        public IEnumerable<WeatherForecast> Get()
+    [HttpGet]
+    public IEnumerable<WeatherForecast> Get()
+    {
+        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
         {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateTime.Now.AddDays(index),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
+            Date = DateTime.Now.AddDays(index),
+            TemperatureC = Random.Shared.Next(-20, 55),
+            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
+        })
+        .ToArray();
     }
 }

src/content/React-CSharp/Data/ApplicationDbContext.cs

@@ -1,21 +1,16 @@
-using Company.WebApplication1.Models;
-using IdentityServer4.EntityFramework.Options;
-using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using IdentityServer4.EntityFramework.Options;
+using Company.WebApplication1.Models;
 
-namespace Company.WebApplication1.Data
+namespace Company.WebApplication1.Data;
+
+public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser>
 {
-    public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser>
+    public ApplicationDbContext(DbContextOptions options, IOptions<OperationalStoreOptions> operationalStoreOptions)
+        : base(options, operationalStoreOptions)
     {
-        public ApplicationDbContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+
     }
 }

src/content/React-CSharp/Models/ApplicationUser.cs

@@ -1,12 +1,7 @@
 using Microsoft.AspNetCore.Identity;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Company.WebApplication1.Models
+namespace Company.WebApplication1.Models;
+
+public class ApplicationUser : IdentityUser
 {
-    public class ApplicationUser : IdentityUser
-    {
-    }
 }

src/content/React-CSharp/Pages/Error.cshtml.cs

@@ -1,31 +1,25 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
 
-namespace Company.WebApplication1.Pages
+namespace Company.WebApplication1.Pages;
+
+[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+public class ErrorModel : PageModel
 {
-    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    public class ErrorModel : PageModel
+    private readonly ILogger<ErrorModel> _logger;
+
+    public ErrorModel(ILogger<ErrorModel> logger)
     {
-        private readonly ILogger<ErrorModel> _logger;
+        _logger = logger;
+    }
 
-        public ErrorModel(ILogger<ErrorModel> logger)
-        {
-            _logger = logger;
-        }
+    public string? RequestId { get; set; }
 
-        public string? RequestId { get; set; }
+    public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-
-        public void OnGet()
-        {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-        }
+    public void OnGet()
+    {
+        RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
     }
 }

src/content/React-CSharp/Program.cs

@@ -1,20 +1,8 @@
-using System;
 #if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Authentication;
-#endif
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-#if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI;
-#endif
-#if (IndividualLocalAuth)
 using Microsoft.EntityFrameworkCore;
-#endif
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-#if (IndividualLocalAuth)
 using Company.WebApplication1.Data;
 using Company.WebApplication1.Models;
 #endif

src/content/React-CSharp/WeatherForecast.cs

@@ -1,15 +1,12 @@
-using System;
+namespace Company.WebApplication1;
 
-namespace Company.WebApplication1
+public class WeatherForecast
 {
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
+    public DateTime Date { get; set; }
 
-        public int TemperatureC { get; set; }
+    public int TemperatureC { get; set; }
 
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 
-        public string? Summary { get; set; }
-    }
+    public string? Summary { get; set; }
 }