Merge branch 'main' into dev/anvillan/flex_consumption_zipdeploy

Azure · Sep 9, 2024 · 4f01d72 · 4f01d72
2 parents 3418578 + dc09a2d
commit 4f01d72
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/extensions/Worker.Extensions.Http.AspNetCore/src/Coordinator/DefaultHttpCoordinator.cs b/extensions/Worker.Extensions.Http.AspNetCore/src/Coordinator/DefaultHttpCoordinator.cs
@@ -24,7 +24,7 @@ public DefaultHttpCoordinator(ExtensionTrace extensionTrace)
  _logger = extensionTrace;
  }
 
- public Task<FunctionContext> SetHttpContextAsync(string invocationId, HttpContext context)
+ public async Task<FunctionContext> SetHttpContextAsync(string invocationId, HttpContext context)
  {
  var contextRef = _contextReferenceList.GetOrAdd(invocationId, static id => new ContextReference(id));
  contextRef.HttpContextValueSource.SetResult(context);
@@ -33,7 +33,7 @@ public Task<FunctionContext> SetHttpContextAsync(string invocationId, HttpContex
 
  try
  {
- return contextRef.FunctionContextValueSource.Task.WaitAsync(TimeSpan.FromSeconds(FunctionContextTimeoutInSeconds));
+ return await contextRef.FunctionContextValueSource.Task.WaitAsync(TimeSpan.FromSeconds(FunctionContextTimeoutInSeconds));
  }
  catch (TimeoutException e)
  {

diff --git a/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj b/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj
@@ -6,7 +6,7 @@
  <Description>ASP.NET Core extensions for .NET isolated functions</Description>
 
  <!--Version information-->
- <VersionPrefix>1.3.2</VersionPrefix>
+ <VersionPrefix>1.3.3</VersionPrefix>
  <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
 

diff --git a/sdk/Sdk/ExtensionsCsprojGenerator.cs b/sdk/Sdk/ExtensionsCsprojGenerator.cs
@@ -79,6 +79,7 @@ internal string GetCsProjContent()
  <Configuration>Release</Configuration>
  <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions</AssemblyName>
  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+ <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/sdk/Sdk/Sdk.csproj b/sdk/Sdk/Sdk.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <MinorProductVersion>17</MinorProductVersion>
- <PatchProductVersion>4</PatchProductVersion>
+ <MinorProductVersion>18</MinorProductVersion>
+ <PatchProductVersion>0</PatchProductVersion>
  <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
  <PackageId>Microsoft.Azure.Functions.Worker.Sdk</PackageId>
  <Description>This package provides development time support for the Azure Functions .NET Worker.</Description>

diff --git a/sdk/release_notes.md b/sdk/release_notes.md
@@ -4,16 +4,14 @@
 - My change description (#PR/#issue)
 -->
 
-### Microsoft.Azure.Functions.Worker.Sdk <version>
+### Microsoft.Azure.Functions.Worker.Sdk 1.18.0
 
 - Fix incorrect function version in build message (#2606)
-
+- Fix inner build failures when central package management is enabled (#2689)
 - Add support to publish a Function App (Flex Consumption) with `ZipDeploy` (#2688)
  - Add `'UseBlobContainerDeploy'` property to identify when to use `OneDeploy` publish API endpoint (`"<publish_url>/api/publish"`)
  - Enhance `ZipDeploy` deployment status logging by appending the `'status_message'` (when defined) to the output messages
 
-- <entry>
-
 ### Microsoft.Azure.Functions.Worker.Sdk.Generators <version>
 
-- <entry>
+- <entry>
diff --git a/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs b/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs
@@ -86,6 +86,7 @@ private static string ExpectedCsProjV3()
  <Configuration>Release</Configuration>
  <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions</AssemblyName>
  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+ <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
  </PropertyGroup>
 
  <ItemGroup>
@@ -113,6 +114,7 @@ private static string ExpectedCsProjV4()
  <Configuration>Release</Configuration>
  <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions</AssemblyName>
  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+ <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
  </PropertyGroup>
 
  <ItemGroup>