Update code formatting and dependencies

.editorconfig

@@ -83,7 +83,7 @@ dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 csharp_using_directive_placement = outside_namespace:suggestion
 dotnet_sort_system_directives_first = true
 dotnet_separate_import_directive_groups = true
-csharp_prefer_braces = true:refactoring
+csharp_prefer_braces = true:error
 csharp_preserve_single_line_blocks = true:none
 csharp_preserve_single_line_statements = false:none
 csharp_prefer_static_local_function = true:suggestion
@@ -131,6 +131,7 @@ csharp_style_conditional_delegate_call = true:suggestion
 csharp_style_prefer_index_operator = false:none
 csharp_style_prefer_range_operator = false:none
 csharp_style_pattern_local_over_anonymous_function = false:none
+csharp_style_namespace_declarations = file_scoped:warning
 
 # Space preferences
 csharp_space_after_cast = false
@@ -192,4 +193,4 @@ indent_size= 2
 
 # Html files
 [*.html]
-indent_size= 2
+indent_size= 2

.github/workflows/build.yml

@@ -14,15 +14,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Use .NET ${{ env.DOTNET_VERSION }}
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - name: Use .NET Core ${{ env.DOTNETCORE_VERSION }}
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: ${{ env.DOTNETCORE_VERSION }}
 

.github/workflows/publish.yml

@@ -12,15 +12,15 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Use .NET ${{ env.DOTNET_VERSION }}
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - name: Use .NET Core ${{ env.DOTNETCORE_VERSION }}
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: ${{ env.DOTNETCORE_VERSION }}
 

samples/BasicSample/BasicSample.csproj

@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Azure.WebJobs.Extensions.HttpApi\Azure.WebJobs.Extensions.HttpApi.csproj" />
@@ -18,4 +18,4 @@
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
   </ItemGroup>
-</Project>
+</Project>

samples/BasicSample/Function1.cs

@@ -6,27 +6,26 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class Function1 : HttpFunctionBase
 {
-    public class Function1 : HttpFunctionBase
+    public Function1(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public Function1(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(Function1))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Function, "post")]
-            SampleModel model,
-            ILogger log)
+    [FunctionName(nameof(Function1))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Function, "post")]
+        SampleModel model,
+        ILogger log)
+    {
+        if (!TryValidateModel(model))
         {
-            if (!TryValidateModel(model))
-            {
-                return BadRequest(ModelState);
-            }
-
-            return Ok(model);
+            return BadRequest(ModelState);
         }
+
+        return Ok(model);
     }
 }

samples/BasicSample/Function2.cs

@@ -8,24 +8,23 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class Function2 : HttpFunctionBase
 {
-    public class Function2 : HttpFunctionBase
+    public Function2(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public Function2(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(Function2))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Function, "get")]
-            HttpRequest req,
-            ILogger log)
-        {
-            Response.Headers.Add("Cache-Control", "no-cache");
+    [FunctionName(nameof(Function2))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Function, "get")]
+        HttpRequest req,
+        ILogger log)
+    {
+        Response.Headers.Add("Cache-Control", "no-cache");
 
-            return Ok($"Now: {DateTime.Now}");
-        }
+        return Ok($"Now: {DateTime.Now}");
     }
 }

samples/BasicSample/Function3.cs

@@ -6,23 +6,22 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class Function3 : HttpFunctionBase
 {
-    public class Function3 : HttpFunctionBase
+    public Function3(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public Function3(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(Function3))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Function, "get", Route = "route/{id}")]
-            HttpRequest req,
-            string id,
-            ILogger log)
-        {
-            return CreatedAtFunction("Function3", new { id = "kazuakix" }, null);
-        }
+    [FunctionName(nameof(Function3))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Function, "get", Route = "route/{id}")]
+        HttpRequest req,
+        string id,
+        ILogger log)
+    {
+        return CreatedAtFunction("Function3", new { id = "kazuakix" }, null);
     }
 }

samples/BasicSample/Function4.cs

@@ -6,27 +6,26 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class Function4 : HttpFunctionBase
 {
-    public class Function4 : HttpFunctionBase
+    public Function4(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public Function4(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(Function4))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Function, "post")]
-            SampleModel model,
-            ILogger log)
+    [FunctionName(nameof(Function4))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Function, "post")]
+        SampleModel model,
+        ILogger log)
+    {
+        if (!TryValidateModel(model))
         {
-            if (!TryValidateModel(model))
-            {
-                return ValidationProblem(ModelState);
-            }
-
-            return Ok(model);
+            return ValidationProblem(ModelState);
         }
+
+        return Ok(model);
     }
 }

samples/BasicSample/Function5.cs

@@ -6,27 +6,26 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class Function5 : HttpFunctionBase
 {
-    public class Function5 : HttpFunctionBase
+    public Function5(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public Function5(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(Function5))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Function, "post")]
-            SampleNestedModel model,
-            ILogger log)
+    [FunctionName(nameof(Function5))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Function, "post")]
+        SampleNestedModel model,
+        ILogger log)
+    {
+        if (!TryValidateModel(model))
         {
-            if (!TryValidateModel(model))
-            {
-                return BadRequest(ModelState);
-            }
-
-            return Ok(model);
+            return BadRequest(ModelState);
         }
+
+        return Ok(model);
     }
 }

samples/BasicSample/SampleModel.cs

@@ -1,15 +1,14 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class SampleModel
 {
-    public class SampleModel
-    {
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public string[] Array { get; set; }
+    public string[] Array { get; set; }
 
-        [Range(100, 10000)]
-        public int Price { get; set; }
-    }
+    [Range(100, 10000)]
+    public int Price { get; set; }
 }

samples/BasicSample/SampleNestedModel.cs

@@ -1,19 +1,18 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BasicSample
+namespace BasicSample;
+
+public class SampleNestedModel
 {
-    public class SampleNestedModel
-    {
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        [Required]
-        public SampleChildModel Child { get; set; }
-    }
+    [Required]
+    public SampleChildModel Child { get; set; }
+}
 
-    public class SampleChildModel
-    {
-        [Required]
-        public string Name { get; set; }
-    }
+public class SampleChildModel
+{
+    [Required]
+    public string Name { get; set; }
 }

samples/ProxySample/HttpTrigger1.cs

@@ -6,21 +6,20 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace ProxySample
+namespace ProxySample;
+
+public class HttpTrigger1 : HttpFunctionBase
 {
-    public class HttpTrigger1 : HttpFunctionBase
+    public HttpTrigger1(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
     {
-        public HttpTrigger1(IHttpContextAccessor httpContextAccessor)
-            : base(httpContextAccessor)
-        {
-        }
+    }
 
-        [FunctionName(nameof(HttpTrigger1))]
-        public IActionResult Run(
-            [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = $"api/{nameof(HttpTrigger1)}")] HttpRequest req,
-            ILogger log)
-        {
-            return Ok(req.Query["name"]);
-        }
+    [FunctionName(nameof(HttpTrigger1))]
+    public IActionResult Run(
+        [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = $"api/{nameof(HttpTrigger1)}")] HttpRequest req,
+        ILogger log)
+    {
+        return Ok(req.Query["name"]);
     }
 }

samples/ProxySample/ProxySample.csproj

@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Azure.WebJobs.Extensions.HttpApi\Azure.WebJobs.Extensions.HttpApi.csproj" />