From 8b8187567b4fb7a2953ec9de6649283881a2fcf0 Mon Sep 17 00:00:00 2001
From: Surgupta <surgupta@microsoft.com>
Date: Tue, 10 Sep 2024 18:31:11 -0700
Subject: [PATCH 1/3] Adding net6 framework check

---
 .../Targets/Microsoft.NET.Sdk.Functions.targets                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
index 89d984f..6cab25a 100644
--- a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
+++ b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
@@ -26,6 +26,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <_ToolingSuffix Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0'">net8-in-process</_ToolingSuffix>
     <FunctionsToolingSuffix Condition="'$(FunctionsToolingSuffix)' == ''">$(_ToolingSuffix)</FunctionsToolingSuffix>
     <AzureFunctionsVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0' And $(AzureFunctionsVersion.StartsWith('v4'))">$(AzureFunctionsVersion.Replace("v4","v0"))</AzureFunctionsVersion>
+    <AzureFunctionsVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0' And $(AzureFunctionsVersion.StartsWith('v4'))">$(AzureFunctionsVersion.Replace("v4","v0"))</AzureFunctionsVersion>
   </PropertyGroup>
 
   <UsingTask TaskName="GenerateFunctions"

From 983e26c153fd5f33fabaca9274d74bc2a53b933a Mon Sep 17 00:00:00 2001
From: Surgupta <surgupta@microsoft.com>
Date: Wed, 11 Sep 2024 16:12:15 -0700
Subject: [PATCH 2/3] Adding net6 tooling suffix

---
 .../Targets/Microsoft.NET.Sdk.Functions.targets               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
index 6cab25a..6f0d820 100644
--- a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
+++ b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets
@@ -24,9 +24,9 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
     <_ToolingSuffix></_ToolingSuffix>
     <_ToolingSuffix Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0'">net8-in-process</_ToolingSuffix>
+    <_ToolingSuffix Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0'">net6-in-process</_ToolingSuffix>
     <FunctionsToolingSuffix Condition="'$(FunctionsToolingSuffix)' == ''">$(_ToolingSuffix)</FunctionsToolingSuffix>
-    <AzureFunctionsVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0' And $(AzureFunctionsVersion.StartsWith('v4'))">$(AzureFunctionsVersion.Replace("v4","v0"))</AzureFunctionsVersion>
-    <AzureFunctionsVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0' And $(AzureFunctionsVersion.StartsWith('v4'))">$(AzureFunctionsVersion.Replace("v4","v0"))</AzureFunctionsVersion>
+    <AzureFunctionsVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And (('$(TargetFrameworkVersion)' == 'v8.0') Or ('$(TargetFrameworkVersion)' == 'v6.0')) And $(AzureFunctionsVersion.StartsWith('v4'))">$(AzureFunctionsVersion.Replace("v4","v0"))</AzureFunctionsVersion>
   </PropertyGroup>
 
   <UsingTask TaskName="GenerateFunctions"

From eee7c8990ae5ce1657362c6f0e24b4ab084287b7 Mon Sep 17 00:00:00 2001
From: Surgupta <surgupta@microsoft.com>
Date: Mon, 16 Sep 2024 15:28:17 -0700
Subject: [PATCH 3/3] Updating version

---
 common.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.props b/common.props
index 2e4d5c0..77784e2 100644
--- a/common.props
+++ b/common.props
@@ -3,8 +3,8 @@
     <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
 
     <MajorProductVersion>4</MajorProductVersion>
-    <MinorProductVersion>4</MinorProductVersion>
-    <PatchProductVersion>1</PatchProductVersion>
+    <MinorProductVersion>5</MinorProductVersion>
+    <PatchProductVersion>0</PatchProductVersion>
 
     <!-- Clear this value for non-preview releases -->
     <PreviewProductVersion></PreviewProductVersion>