From feb9472c228f2c74acc4603dc0b7cf6d729b87ab Mon Sep 17 00:00:00 2001
From: Fabio Cavalcante <facaval@microsoft.com>
Date: Fri, 6 Sep 2024 16:55:49 -0700
Subject: [PATCH 1/3] Opting out of central package management in extensions
 inner build

---
 sdk/Sdk/ExtensionsCsprojGenerator.cs                         | 1 +
 sdk/Sdk/Sdk.csproj                                           | 4 ++--
 sdk/release_notes.md                                         | 5 ++---
 .../ExtensionsCsProjGeneratorTests.cs                        | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sdk/Sdk/ExtensionsCsprojGenerator.cs b/sdk/Sdk/ExtensionsCsprojGenerator.cs
index c08f92677..b8ba95584 100644
--- 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
index 95742edb5..3927acaf3 100644
--- 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
index cda7c74c7..848d79253 100644
--- a/sdk/release_notes.md
+++ b/sdk/release_notes.md
@@ -4,11 +4,10 @@
 - 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)
-
-- <entry>
+- Fix inner build failures when central package management is enabled (#2689)
 
 ### Microsoft.Azure.Functions.Worker.Sdk.Generators <version>
 
diff --git a/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs b/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs
index ce06d4e86..6576e99d7 100644
--- 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>

From 3c4d5b4283ec229e5ab70d21c64031bef4902f71 Mon Sep 17 00:00:00 2001
From: danielmarbach <danielmarbach@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:36:09 +0200
Subject: [PATCH 2/3] DefaultHttpCoordinator SetHttpContextAsync should use
 async/await to make the catch/rethrow effective

---
 .../src/Coordinator/DefaultHttpCoordinator.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/Worker.Extensions.Http.AspNetCore/src/Coordinator/DefaultHttpCoordinator.cs b/extensions/Worker.Extensions.Http.AspNetCore/src/Coordinator/DefaultHttpCoordinator.cs
index 85a2d3958..cbe542cdf 100644
--- 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)
             {

From dc09a2d9e6e5ae2c0b5fecbb7c36c68a64615677 Mon Sep 17 00:00:00 2001
From: Fabio Cavalcante <facaval@microsoft.com>
Date: Mon, 9 Sep 2024 08:57:30 -0700
Subject: [PATCH 3/3] Updating ASP.NET Core integration extension version

---
 .../src/Worker.Extensions.Http.AspNetCore.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f40062bc1..6ecd2aef6 100644
--- 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>