Upgrade to latest Azure Functions SDK (#41)

shibayan · web-flow · commit 05062aadfd0d · 2024-11-16T15:53:46.000+09:00
diff --git a/samples/BasicSample/BasicSample.csproj b/samples/BasicSample/BasicSample.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebJobs.Extensions.HttpApi\WebJobs.Extensions.HttpApi.csproj" />
diff --git a/samples/IsolatedSample/Function1.cs b/samples/IsolatedSample/Function1.cs
@@ -10,12 +10,10 @@ namespace IsolatedSample;
 public class Function1(IHttpContextAccessor httpContextAccessor, ILogger<Function1> logger)
     : HttpFunctionBase(httpContextAccessor)
 {
-    private readonly ILogger _logger = logger;
-
     [Function("Function1")]
     public IActionResult Run([HttpTrigger(AuthorizationLevel.Function, "get", "post")] HttpRequest req)
     {
-        _logger.LogInformation("C# HTTP trigger function processed a request.");
+        logger.LogInformation("C# HTTP trigger function processed a request.");
 
         return Ok($"Welcome to Azure Functions, {req.Query["name"]}!");
     }
diff --git a/samples/IsolatedSample/IsolatedSample.csproj b/samples/IsolatedSample/IsolatedSample.csproj
@@ -7,8 +7,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Functions.Worker.Extensions.HttpApi\Functions.Worker.Extensions.HttpApi.csproj" />
diff --git a/samples/IsolatedSample/Program.cs b/samples/IsolatedSample/Program.cs
@@ -1,12 +1,16 @@
 ﻿using Azure.Functions.Worker.Extensions.HttpApi.Config;
 
+using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
 
-var host = new HostBuilder()
-    .ConfigureFunctionsWebApplication(workerApplication =>
-    {
-        workerApplication.AddHttpApi();
-    })
-    .Build();
+var builder = FunctionsApplication.CreateBuilder(args);
 
-host.Run();
+builder.ConfigureFunctionsWebApplication()
+       .AddHttpApi();
+
+// Application Insights isn't enabled by default. See https://aka.ms/AAt8mw4.
+// builder.Services
+//     .AddApplicationInsightsTelemetryWorkerService()
+//     .ConfigureFunctionsApplicationInsights();
+
+builder.Build().Run();
diff --git a/samples/ProxySample/ProxySample.csproj b/samples/ProxySample/ProxySample.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebJobs.Extensions.HttpApi\WebJobs.Extensions.HttpApi.csproj" />
diff --git a/samples/VirtualPathSample/VirtualPathSample.csproj b/samples/VirtualPathSample/VirtualPathSample.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebJobs.Extensions.HttpApi\WebJobs.Extensions.HttpApi.csproj" />
diff --git a/samples/WebsiteSample/WebsiteSample.csproj b/samples/WebsiteSample/WebsiteSample.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebJobs.Extensions.HttpApi\WebJobs.Extensions.HttpApi.csproj" />
diff --git a/src/Functions.Worker.Extensions.HttpApi/Config/HttpApiBuilderExtensions.cs b/src/Functions.Worker.Extensions.HttpApi/Config/HttpApiBuilderExtensions.cs
@@ -12,10 +12,7 @@ public static class HttpApiBuilderExtensions
 {
     public static IFunctionsWorkerApplicationBuilder AddHttpApi(this IFunctionsWorkerApplicationBuilder builder)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
 
         builder.Services.AddHttpContextAccessor();
         builder.UseMiddleware<HttpContextAccessorMiddleware>();
diff --git a/src/Functions.Worker.Extensions.HttpApi/Functions.Worker.Extensions.HttpApi.csproj b/src/Functions.Worker.Extensions.HttpApi/Functions.Worker.Extensions.HttpApi.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.3.2" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Functions.Worker.Extensions.HttpApi/HttpFunctionBase.cs b/src/Functions.Worker.Extensions.HttpApi/HttpFunctionBase.cs
@@ -2,6 +2,4 @@
 
 namespace Azure.Functions.Worker.Extensions.HttpApi;
 
-public class HttpFunctionBase(IHttpContextAccessor httpContextAccessor) : WebJobs.Extensions.HttpApi.Core.HttpFunctionImpl(httpContextAccessor)
-{
-}
+public class HttpFunctionBase(IHttpContextAccessor httpContextAccessor) : WebJobs.Extensions.HttpApi.Core.HttpFunctionImpl(httpContextAccessor);
diff --git a/src/WebJobs.Extensions.HttpApi/HttpFunctionBase.cs b/src/WebJobs.Extensions.HttpApi/HttpFunctionBase.cs
@@ -2,6 +2,4 @@
 
 namespace Azure.WebJobs.Extensions.HttpApi;
 
-public class HttpFunctionBase(IHttpContextAccessor httpContextAccessor) : Core.HttpFunctionImpl(httpContextAccessor)
-{
-}
+public class HttpFunctionBase(IHttpContextAccessor httpContextAccessor) : Core.HttpFunctionImpl(httpContextAccessor);

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,10 @@ namespace IsolatedSample;`
`10`	`10`	`public class Function1(IHttpContextAccessor httpContextAccessor, ILogger<Function1> logger)`
`11`	`11`	`: HttpFunctionBase(httpContextAccessor)`
`12`	`12`	`{`
`13`		`- private readonly ILogger _logger = logger;`
`14`		`-`
`15`	`13`	`[Function("Function1")]`
`16`	`14`	`public IActionResult Run([HttpTrigger(AuthorizationLevel.Function, "get", "post")] HttpRequest req)`
`17`	`15`	`{`
`18`		`- _logger.LogInformation("C# HTTP trigger function processed a request.");`
	`16`	`+ logger.LogInformation("C# HTTP trigger function processed a request.");`
`19`	`17`
`20`	`18`	`return Ok($"Welcome to Azure Functions, {req.Query["name"]}!");`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,7 @@ public static class HttpApiBuilderExtensions`
`12`	`12`	`{`
`13`	`13`	`public static IFunctionsWorkerApplicationBuilder AddHttpApi(this IFunctionsWorkerApplicationBuilder builder)`
`14`	`14`	`{`
`15`		`- if (builder is null)`
`16`		`- {`
`17`		`- throw new ArgumentNullException(nameof(builder));`
`18`		`- }`
	`15`	`+ ArgumentNullException.ThrowIfNull(builder);`
`19`	`16`
`20`	`17`	`builder.Services.AddHttpContextAccessor();`
`21`	`18`	`builder.UseMiddleware<HttpContextAccessorMiddleware>();`