Merge pull request #116390 from vanillajonathan/patch-1

Use file-scoped namespaces

Author: Court72

articles/azure-functions/functions-dotnet-dependency-injection.md

@@ -48,20 +48,19 @@ using Microsoft.Extensions.DependencyInjection;
 
 [assembly: FunctionsStartup(typeof(MyNamespace.Startup))]
 
-namespace MyNamespace
+namespace MyNamespace;
+
+public class Startup : FunctionsStartup
 {
-    public class Startup : FunctionsStartup
+    public override void Configure(IFunctionsHostBuilder builder)
     {
-        public override void Configure(IFunctionsHostBuilder builder)
-        {
-            builder.Services.AddHttpClient();
+        builder.Services.AddHttpClient();
 
-            builder.Services.AddSingleton<IMyService>((s) => {
-                return new MyService();
-            });
+        builder.Services.AddSingleton<IMyService>((s) => {
+            return new MyService();
+        });
 
-            builder.Services.AddSingleton<ILoggerProvider, MyLoggerProvider>();
-        }
+        builder.Services.AddSingleton<ILoggerProvider, MyLoggerProvider>();
     }
 }
 ```
@@ -91,29 +90,28 @@ using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace MyNamespace
+namespace MyNamespace;
+
+public class MyHttpTrigger
 {
-    public class MyHttpTrigger
-    {
-        private readonly HttpClient _client;
-        private readonly IMyService _service;
+    private readonly HttpClient _client;
+    private readonly IMyService _service;
 
-        public MyHttpTrigger(IHttpClientFactory httpClientFactory, IMyService service)
-        {
-            this._client = httpClientFactory.CreateClient();
-            this._service = service;
-        }
+    public MyHttpTrigger(IHttpClientFactory httpClientFactory, IMyService service)
+    {
+        this._client = httpClientFactory.CreateClient();
+        this._service = service;
+    }
 
-        [FunctionName("MyHttpTrigger")]
-        public async Task<IActionResult> Run(
-            [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req,
-            ILogger log)
-        {
-            var response = await _client.GetAsync("https://microsoft.com");
-            var message = _service.GetMessage();
+    [FunctionName("MyHttpTrigger")]
+    public async Task<IActionResult> Run(
+        [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req,
+        ILogger log)
+    {
+        var response = await _client.GetAsync("https://microsoft.com");
+        var message = _service.GetMessage();
 
-            return new OkObjectResult("Response from function with injected dependencies.");
-        }
+        return new OkObjectResult("Response from function with injected dependencies.");
     }
 }
 ```
@@ -147,25 +145,24 @@ The host injects `ILogger<T>` and `ILoggerFactory` services into constructors.
 The following example demonstrates how to add an `ILogger<HttpTrigger>` with logs that are exposed to the host.
 
 ```csharp
-namespace MyNamespace
+namespace MyNamespace;
+
+public class HttpTrigger
 {
-    public class HttpTrigger
-    {
-        private readonly ILogger<HttpTrigger> _log;
+    private readonly ILogger<HttpTrigger> _log;
 
-        public HttpTrigger(ILogger<HttpTrigger> log)
-        {
-            _log = log;
-        }
+    public HttpTrigger(ILogger<HttpTrigger> log)
+    {
+        _log = log;
+    }
 
-        [FunctionName("HttpTrigger")]
-        public async Task<IActionResult> Run(
-            [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req)
-        {
-            _log.LogInformation("C# HTTP trigger function processed a request.");
+    [FunctionName("HttpTrigger")]
+    public async Task<IActionResult> Run(
+        [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req)
+    {
+        _log.LogInformation("C# HTTP trigger function processed a request.");
 
-            // ...
-    }
+        // ...
 }
 ```
 
@@ -293,23 +290,22 @@ using Microsoft.Extensions.DependencyInjection;
 
 [assembly: FunctionsStartup(typeof(MyNamespace.Startup))]
 
-namespace MyNamespace
+namespace MyNamespace;
+
+public class Startup : FunctionsStartup
 {
-    public class Startup : FunctionsStartup
+    public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder builder)
+    {
+        FunctionsHostBuilderContext context = builder.GetContext();
+
+        builder.ConfigurationBuilder
+            .AddJsonFile(Path.Combine(context.ApplicationRootPath, "appsettings.json"), optional: true, reloadOnChange: false)
+            .AddJsonFile(Path.Combine(context.ApplicationRootPath, $"appsettings.{context.EnvironmentName}.json"), optional: true, reloadOnChange: false)
+            .AddEnvironmentVariables();
+    }
+    
+    public override void Configure(IFunctionsHostBuilder builder)
     {
-        public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder builder)
-        {
-            FunctionsHostBuilderContext context = builder.GetContext();
-
-            builder.ConfigurationBuilder
-                .AddJsonFile(Path.Combine(context.ApplicationRootPath, "appsettings.json"), optional: true, reloadOnChange: false)
-                .AddJsonFile(Path.Combine(context.ApplicationRootPath, $"appsettings.{context.EnvironmentName}.json"), optional: true, reloadOnChange: false)
-                .AddEnvironmentVariables();
-        }
-        
-        public override void Configure(IFunctionsHostBuilder builder)
-        {
-        }
     }
 }
 ```