diff --git a/DotNetWorker.sln b/DotNetWorker.sln
index a0ce8d085..102591a1b 100644
--- a/DotNetWorker.sln
+++ b/DotNetWorker.sln
@@ -134,6 +134,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Tests", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetIntegration", "samples\AspNetIntegration\AspNetIntegration.csproj", "{D2F67410-9933-42E8-B04A-E17634D83A30}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net7Worker", "samples\Net7Worker\Net7Worker.csproj", "{EC1A321B-70F6-420B-85D4-56C7869BB71B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -332,6 +334,10 @@ Global
 		{D2F67410-9933-42E8-B04A-E17634D83A30}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2F67410-9933-42E8-B04A-E17634D83A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2F67410-9933-42E8-B04A-E17634D83A30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC1A321B-70F6-420B-85D4-56C7869BB71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC1A321B-70F6-420B-85D4-56C7869BB71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC1A321B-70F6-420B-85D4-56C7869BB71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC1A321B-70F6-420B-85D4-56C7869BB71B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -390,6 +396,7 @@ Global
 		{286F9EE3-00AE-4EFA-BFD8-A2E58BC809D2} = {FD7243E4-BF18-43F8-8744-BA1D17ACF378}
 		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A} = {FD7243E4-BF18-43F8-8744-BA1D17ACF378}
 		{D2F67410-9933-42E8-B04A-E17634D83A30} = {9D6603BD-7EA2-4D11-A69C-0D9E01317FD6}
+		{EC1A321B-70F6-420B-85D4-56C7869BB71B} = {9D6603BD-7EA2-4D11-A69C-0D9E01317FD6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {497D2ED4-A13E-4BCA-8D29-F30CA7D0EA4A}
diff --git a/sdk/Sdk/ExtensionsCsprojGenerator.cs b/sdk/Sdk/ExtensionsCsprojGenerator.cs
index ad565f787..c54553c9c 100644
--- a/sdk/Sdk/ExtensionsCsprojGenerator.cs
+++ b/sdk/Sdk/ExtensionsCsprojGenerator.cs
@@ -32,16 +32,13 @@ public void Generate()
             var extensionsCsprojFilePath = Path.Combine(_outputPath, ExtensionsProjectName);
 
             string csproj = GetCsProjContent();
-
-            // Incremental build support: write the new csproj only if contents have changed.
-            // By keeping one from a previous build around, our restore & build has a chance
-            // to follow incremental build and no-op if nothing needs to be done.
             if (File.Exists(extensionsCsprojFilePath))
             {
                 string existing = File.ReadAllText(extensionsCsprojFilePath);
                 if (string.Equals(csproj, existing, StringComparison.Ordinal))
                 {
-                    // Up to date, nothing to do.
+                    // If contents are the same, only touch the file to update timestamp.
+                    File.SetLastWriteTimeUtc(extensionsCsprojFilePath, DateTime.UtcNow);
                     return;
                 }
             }
diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
index 77767d968..4b4767cc8 100644
--- a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
+++ b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
@@ -8,429 +8,217 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
 ***********************************************************************************************
 -->
-<Project ToolsVersion="14.0"
-         xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <_ToolingSuffix></_ToolingSuffix>
-        <_AzureFunctionsNotSet Condition="'$(AzureFunctionsVersion)' == ''">true</_AzureFunctionsNotSet>
-        <AzureFunctionsVersion Condition="'$(AzureFunctionsVersion)' == ''">v3</AzureFunctionsVersion>
-        <_ToolingSuffix Condition="($(AzureFunctionsVersion.StartsWith('v3',StringComparison.OrdinalIgnoreCase)) Or $(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase))) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v5.0'">net5-isolated</_ToolingSuffix>
-        <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0'">net6-isolated</_ToolingSuffix>
-        <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v7.0'">net7-isolated</_ToolingSuffix>
-        <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0'">net8-isolated</_ToolingSuffix>
-        <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETFramework'">netfx-isolated</_ToolingSuffix>
-        <FunctionsToolingSuffix Condition="'$(FunctionsToolingSuffix)' == ''">$(_ToolingSuffix)</FunctionsToolingSuffix>
-        <_FunctionsTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_FunctionsTaskFramework>
-        <_FunctionsTaskFramework Condition=" '$(_FunctionsTaskFramework)' == ''">net472</_FunctionsTaskFramework>
-        <_FunctionsTasksDir Condition=" '$(_FunctionsTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_FunctionsTaskFramework)\</_FunctionsTasksDir>
-        <_FunctionsTaskAssemblyFullPath Condition=" '$(_FunctionsTaskAssemblyFullPath)'=='' ">$(_FunctionsTasksDir)\Microsoft.Azure.Functions.Worker.Sdk.dll</_FunctionsTaskAssemblyFullPath>
-
-        <_FunctionsWorkerConfigInputFile>$(MSBuildThisFileDirectory)\..\tools\worker.config.json</_FunctionsWorkerConfigInputFile>
-
-        <_FunctionsMetadataLoaderExtensionFile>$(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.dll</_FunctionsMetadataLoaderExtensionFile>
-        <_FunctionsExtensionsDirectory>.azurefunctions</_FunctionsExtensionsDirectory>
-        <_FunctionsExtensionsJsonName>extensions.json</_FunctionsExtensionsJsonName>
-        <_FunctionsExtensionsFullPublish Condition="$(NoBuild) == '' And $(_FunctionsExtensionsFullPublish) == ''">True</_FunctionsExtensionsFullPublish>
-        <_FunctionsExtensionsFullPublish Condition="$(_FunctionsExtensionsFullPublish) == ''">!$(NoBuild)</_FunctionsExtensionsFullPublish>
-        <MSBuildFunctionsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed.Functions\</MSBuildFunctionsTargetsPath>
-      
-        <FunctionsEnablePlaceholder Condition="$(FunctionsEnablePlaceholder) == ''">false</FunctionsEnablePlaceholder>
-        <FunctionsEnableWorkerIndexing Condition="$(FunctionsEnablePlaceholder)">true</FunctionsEnableWorkerIndexing>
-        <FunctionsEnableWorkerIndexing Condition="$(FunctionsEnableWorkerIndexing) == '' And !$(FunctionsEnablePlaceholder)">false</FunctionsEnableWorkerIndexing>
-        <FunctionsEnableMetadataSourceGen Condition="$(FunctionsEnableWorkerIndexing) And $(FunctionsEnableMetadataSourceGen) == ''">true</FunctionsEnableMetadataSourceGen>
-        <FunctionsEnableExecutorSourceGen Condition="$(FunctionsEnableExecutorSourceGen) == ''">false</FunctionsEnableExecutorSourceGen>
-        <FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor) == ''">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
-        <FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor)">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
-        <FunctionsAutoRegisterGeneratedMetadataProvider Condition="$(FunctionsAutoRegisterGeneratedMetadataProvider) == ''">false</FunctionsAutoRegisterGeneratedMetadataProvider>
-        <FunctionsAutoRegisterGeneratedMetadataProvider Condition="$(FunctionsAutoRegisterGeneratedMetadataProvider)">true</FunctionsAutoRegisterGeneratedMetadataProvider>
-    </PropertyGroup>
-
-    <UsingTask TaskName="GenerateFunctionMetadata"
-             AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
-
-    <UsingTask TaskName="CreateZipFileTask"
-             AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
-
-    <UsingTask TaskName="ZipDeployTask"
-              AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
-
-    <Import Project="$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets"
-           Condition="Exists('$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets')" />
-
-    <Target Name="_FunctionsPreBuild" BeforeTargets="BeforeBuild">
-        <Message Condition="'$(_AzureFunctionsNotSet)' == 'true'" Importance="high" Text="AzureFunctionsVersion not configured in the project. Setting AzureFunctionsVersion to v3"/>
-        <Error Condition="$(AzureFunctionsVersion.StartsWith('v1',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version, Please set it to v4"/>
-        <Error Condition="$(AzureFunctionsVersion.StartsWith('v2',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version, Please set it to v3"/>
-        <Error Condition="!$(AzureFunctionsVersion.StartsWith('v3',StringComparison.OrdinalIgnoreCase)) And !$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version"/>
-        <Error Condition="'$(_ToolingSuffix)' == ''" Text="Invalid combination of TargetFramework and AzureFunctionsVersion is set."/>
-        <Error Condition="'$(_IsFunctionsSdkBuild)' == 'true'" Text="Microsoft.NET.Sdk.Functions package is meant to be used with in-proc function apps. Please remove the reference to this package in isolated function apps."/>
-    </Target>
-
-    <Target Name="_FunctionsPostBuild" AfterTargets="AfterBuild" DependsOnTargets="_FunctionsGetWorkerExtensionPath;_FunctionsPostBuildNetFx;_FunctionsPostBuildNetApp"/>
-
-    <Target Name="_FunctionsGetWorkerExtensionPath">
-        <PropertyGroup>
-            <_FunctionsWorkerConfigOutputFile>$(TargetDir)\worker.config.json</_FunctionsWorkerConfigOutputFile>
-            <ExtensionsCsProjFilePath Condition="'$(ExtensionsCsProjFilePath)' == ''">$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)WorkExtensions))</ExtensionsCsProjFilePath>
-        </PropertyGroup>
-    </Target>
-
-    <!--.NET Framework post build-->
-    <Target Name="_FunctionsPostBuildNetFx" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
-        <GenerateFunctionMetadata
-          AssemblyPath="$(TargetDir)$(AssemblyName).exe"
-          ReferencePaths="@(ReferencePath)"
-          ExtensionsCsProjFilePath="$(ExtensionsCsProjFilePath)"
-          AzureFunctionsVersion="$(AzureFunctionsVersion)"
-          TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
-          TargetFrameworkVersion="$(TargetFrameworkVersion)"
-          OutputPath="$(TargetDir)"/>
-
-        <!-- Do not copy _FunctionsMetadataLoaderExtensionFile when in placeholder mode, as we don't want the FunctionMetadataLoader entry in extensions.json-->
-        <Copy
-          Condition="!$(FunctionsEnablePlaceholder)"
-          SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
-          DestinationFolder="$(ExtensionsCsProjFilePath)\buildout"
-          SkipUnchangedFiles="true"
-          OverwriteReadOnlyFiles="true" />
-
-        <WriteLinesToFile
-          File="$(_FunctionsWorkerConfigOutputFile)"
-          Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                .Replace('$functionExe$', '{WorkerRoot}$(TargetName).exe')
-                                .Replace('$functionWorker$', '$(TargetName).exe')
-                                .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
-          Overwrite="true" />
-    </Target>
-
-    <!--.NET/.NET Core post build-->
-    <Target Name="_FunctionsPostBuildNetApp" Condition="$(TargetFrameworkIdentifier) != '.NETFramework'">
-        <GenerateFunctionMetadata
-          AssemblyPath="$(TargetDir)$(AssemblyName).dll"
-          ReferencePaths="@(ReferencePath)"
-          ExtensionsCsProjFilePath="$(ExtensionsCsProjFilePath)"
-          AzureFunctionsVersion="$(AzureFunctionsVersion)"
-          TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
-          TargetFrameworkVersion="$(TargetFrameworkVersion)"
-          OutputPath="$(TargetDir)"/>
-
-        <!-- Do not copy _FunctionsMetadataLoaderExtensionFile when in placeholder mode, as we don't want the FunctionMetadataLoader entry in extensions.json--> 
-        <Copy
-          Condition="!$(FunctionsEnablePlaceholder)"
-          SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
-          DestinationFolder="$(ExtensionsCsProjFilePath)\buildout"
-          SkipUnchangedFiles="true"
-          OverwriteReadOnlyFiles="true" />
-
-        <WriteLinesToFile
-          Condition="$(SelfContained)"
-          File="$(_FunctionsWorkerConfigOutputFile)"
-          Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                .Replace('$functionExe$', '{WorkerRoot}$(TargetName)')
-                                .Replace('$functionWorker$', '$(TargetName).dll')
-                                .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
-          Overwrite="true" />
-
-
-        <WriteLinesToFile
-          Condition="!$(SelfContained)"
-          File="$(_FunctionsWorkerConfigOutputFile)"
-          Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                .Replace('$functionExe$', 'dotnet')
-                                .Replace('$functionWorker$', '$(TargetName).dll')
-                                .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
-          Overwrite="true" />
-
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+  <_ToolingSuffix></_ToolingSuffix>
+  <_AzureFunctionsNotSet Condition="'$(AzureFunctionsVersion)' == ''">true</_AzureFunctionsNotSet>
+  <AzureFunctionsVersion Condition="'$(AzureFunctionsVersion)' == ''">v3</AzureFunctionsVersion>
+  <_ToolingSuffix Condition="($(AzureFunctionsVersion.StartsWith('v3',StringComparison.OrdinalIgnoreCase)) Or $(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase))) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v5.0'">net5-isolated</_ToolingSuffix>
+  <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0'">net6-isolated</_ToolingSuffix>
+  <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v7.0'">net7-isolated</_ToolingSuffix>
+  <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v8.0'">net8-isolated</_ToolingSuffix>
+  <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETFramework'">netfx-isolated</_ToolingSuffix>
+  <FunctionsToolingSuffix Condition="'$(FunctionsToolingSuffix)' == ''">$(_ToolingSuffix)</FunctionsToolingSuffix>
+  <_FunctionsTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_FunctionsTaskFramework>
+  <_FunctionsTaskFramework Condition=" '$(_FunctionsTaskFramework)' == ''">net472</_FunctionsTaskFramework>
+  <_FunctionsTasksDir Condition=" '$(_FunctionsTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_FunctionsTaskFramework)\</_FunctionsTasksDir>
+  <_FunctionsTaskAssemblyFullPath Condition=" '$(_FunctionsTaskAssemblyFullPath)'=='' ">$(_FunctionsTasksDir)\Microsoft.Azure.Functions.Worker.Sdk.dll</_FunctionsTaskAssemblyFullPath>
+
+  <_FunctionsExtensionCommonProps>ImportDirectoryBuildProps=false;ImportDirectoryBuildTargets=false;ImportDirectoryPackagesProps=false</_FunctionsExtensionCommonProps>
+  <_FunctionsWorkerConfigInputFile>$(MSBuildThisFileDirectory)\..\tools\worker.config.json</_FunctionsWorkerConfigInputFile>
+
+  <_FunctionsMetadataLoaderExtensionFile>$(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.dll</_FunctionsMetadataLoaderExtensionFile>
+  <_FunctionsExtensionsDirectory>.azurefunctions</_FunctionsExtensionsDirectory>
+  <_FunctionsExtensionsJsonName>extensions.json</_FunctionsExtensionsJsonName>
+  <MSBuildFunctionsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed.Functions\</MSBuildFunctionsTargetsPath>
+
+  <FunctionsEnablePlaceholder Condition="$(FunctionsEnablePlaceholder) == ''">false</FunctionsEnablePlaceholder>
+  <FunctionsEnableWorkerIndexing Condition="$(FunctionsEnablePlaceholder)">true</FunctionsEnableWorkerIndexing>
+  <FunctionsEnableWorkerIndexing Condition="$(FunctionsEnableWorkerIndexing) == '' And !$(FunctionsEnablePlaceholder)">false</FunctionsEnableWorkerIndexing>
+  <FunctionsEnableMetadataSourceGen Condition="$(FunctionsEnableWorkerIndexing) And $(FunctionsEnableMetadataSourceGen) == ''">true</FunctionsEnableMetadataSourceGen>
+  <FunctionsEnableExecutorSourceGen Condition="$(FunctionsEnableExecutorSourceGen) == ''">false</FunctionsEnableExecutorSourceGen>
+  <FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor) == ''">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
+  <FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor)">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
+  <FunctionsAutoRegisterGeneratedMetadataProvider Condition="$(FunctionsAutoRegisterGeneratedMetadataProvider) == ''">false</FunctionsAutoRegisterGeneratedMetadataProvider>
+  <FunctionsAutoRegisterGeneratedMetadataProvider Condition="$(FunctionsAutoRegisterGeneratedMetadataProvider)">true</FunctionsAutoRegisterGeneratedMetadataProvider>
+  </PropertyGroup>
+
+  <UsingTask TaskName="GenerateFunctionMetadata" AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
+  <UsingTask TaskName="CreateZipFileTask" AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
+  <UsingTask TaskName="ZipDeployTask" AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
+  <UsingTask TaskName="EnhanceExtensionsMetadata" AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
+
+  <Import Project="$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets"
+          Condition="Exists('$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets')" />
+
+  <!-- Validating some expectations for the function app early on. -->
+  <Target Name="_FunctionsPreBuild" BeforeTargets="BeforeBuild">
+    <Message Condition="'$(_AzureFunctionsNotSet)' == 'true'" Importance="high" Text="AzureFunctionsVersion not configured in the project. Setting AzureFunctionsVersion to v3"/>
+    <Error Condition="$(AzureFunctionsVersion.StartsWith('v1',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version, Please set it to v4"/>
+    <Error Condition="$(AzureFunctionsVersion.StartsWith('v2',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version, Please set it to v3"/>
+    <Error Condition="!$(AzureFunctionsVersion.StartsWith('v3',StringComparison.OrdinalIgnoreCase)) And !$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase))" Text="AzureFunctionsVersion is set to an incompatible version"/>
+    <Error Condition="'$(_ToolingSuffix)' == ''" Text="Invalid combination of TargetFramework and AzureFunctionsVersion is set."/>
+    <Error Condition="'$(_IsFunctionsSdkBuild)' == 'true'" Text="Microsoft.NET.Sdk.Functions package is meant to be used with in-proc function apps. Please remove the reference to this package in isolated function apps."/>
   </Target>
 
+  <!-- These two targets set up the main sequence of targets we want to run and when we want to run them. -->
+  <Target Name="_FunctionsInnerBuild" AfterTargets="CoreCompile" BeforeTargets="CopyFilesToOutputDirectory" DependsOnTargets="_FunctionsGenerateMetadata;_FunctionsPostBuild;_WorkerExtensionsBuild;_FunctionsExtensionAssignTargetPaths" />
 
-    <!--
-  Build the webjobs extensions in ".azurefunctions"
-  -->
-    <!--
-  We need to copy all files from <build-out>/bin except for "runtimes" directory. The "runtimes" directory inside "bin" doesn't contain the binaries for all platforms.
-  This is due to a bug in Functions SDK. Until that is fixed, we need to copy "runtimes" directly from build output, instead of copying from the "bin".
-  -->
-    <Target Name ="_WorkerExtensionsBuildCopy" AfterTargets="_WorkerExtensionsBuild">
-        <ItemGroup>
-            <ExtensionBinaries Include="$(ExtensionsCsProjFilePath)\buildout\bin\**\*.*"
-                               Exclude="$(ExtensionsCsProjFilePath)\buildout\bin\runtimes\**\*.*" />
-            <ExtensionRuntimeBinaries Include="$(ExtensionsCsProjFilePath)\buildout\runtimes\**\*.*" />
-        </ItemGroup>
-
-        <Copy SourceFiles="@(ExtensionBinaries)" DestinationFolder="$(TargetDir)\.azurefunctions\%(RecursiveDir)" SkipUnchangedFiles="true" />
-        <Copy SourceFiles="@(ExtensionRuntimeBinaries)" DestinationFolder="$(TargetDir)\.azurefunctions\runtimes\%(RecursiveDir)" SkipUnchangedFiles="true" />
-    </Target>
-
-    <Target Name ="_WorkerExtensionsBuild" AfterTargets="_WorkerExtensionsRestore">
-        <MSBuild Projects="$(ExtensionsCsProjFilePath)\WorkerExtensions.csproj" Targets="Build" RemoveProperties="DeployOnBuild" Properties="Configuration=Release;OutputPath=$(ExtensionsCsProjFilePath)\buildout;CopyLocalLockFileAssemblies=true"/>
-    </Target>
-
-    <Target Name="_WorkerExtensionsRestore" AfterTargets="_FunctionsPostBuild">
-        <MSBuild Projects="$(ExtensionsCsProjFilePath)\WorkerExtensions.csproj" Targets="Restore" Properties="IsRestoring=true"/>
-    </Target>
-
-    <!--
-  Add HintPath to references in "extensions.json"
-  -->
-    <UsingTask TaskName="EnhanceExtensionsMetadata"
-             AssemblyFile="$(_FunctionsTaskAssemblyFullPath)"/>
-
-    <Target Name="_EnhanceFunctionsExtensionsMetadataPostBuild"
-            AfterTargets="_WorkerExtensionsBuildCopy">
-
-        <EnhanceExtensionsMetadata
-          ExtensionsJsonPath="$(TargetDir)\$(_FunctionsExtensionsDirectory)\$(_FunctionsExtensionsJsonName)"
-          OutputPath="$(TargetDir)\$(_FunctionsExtensionsJsonName)"/>
-
-    </Target>
-
-    <!--
-  ***********************************************************************************************
-  Import the Publish target
-  ***********************************************************************************************
- -->
-    <Import Project="$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Sdk.Publish.targets"
-            Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Sdk.Publish.targets')" />
-
-    <Target
-      Name="_CleanFunctions"
-      AfterTargets="Clean">
-
-        <ItemGroup>
-            <_FilesInTargetDir Include="$(TargetDir)**\*" />
-        </ItemGroup>
-
-        <Delete Files="@(_FilesInTargetDir)"
-                ContinueOnError="true" />
-
-        <RemoveDir Directories="$(TargetDir)"
-                   ContinueOnError="true" />
-    </Target>
-
-    <!--
-  Publish targets from Functions SDK
-  -->
-
-    <Target Name="_InitializeDotNetPublishProperties"
-            BeforeTargets="PrepareForPublish"
-            Condition="'$(DeployOnBuild)' != 'true'">
-
-        <ConvertToAbsolutePath Paths="$(PublishDir)">
-            <Output TaskParameter="AbsolutePaths"
-                    PropertyName="FunctionsDir"/>
-        </ConvertToAbsolutePath>
-
-        <PropertyGroup>
-            <PublishDir>$(FunctionsDir)</PublishDir>
-            <PublishDir Condition="!HasTrailingSlash('$(PublishDir)')">$(PublishDir)\</PublishDir>
-            <FunctionsTargetPath>$(PublishDir)bin\$(TargetFileName)</FunctionsTargetPath>
-            <FunctionsOutputPath>$(FunctionsDir)</FunctionsOutputPath>
-        </PropertyGroup>
-
-    </Target>
+  <!-- For publish we have very little targets. Either:
+    1) It is a publish with build, in which case _FunctionsInnerBuild will already be ran.
+    2) It is publish no-build, in which case we assume everything is as expected in the output directory already. -->
+  <Target Name="_FunctionsInnerPublish" BeforeTargets="GetCopyToPublishDirectoryItems" DependsOnTargets="_FunctionsExtensionAssignTargetPaths" />
 
-    <Target Name="_InitializeDeployOnBuildProperties" >
-
-        <ConvertToAbsolutePath Paths="$(PublishIntermediateOutputPath)">
-            <Output TaskParameter="AbsolutePaths"
-                    PropertyName="PublishIntermediateOutputPath"/>
-        </ConvertToAbsolutePath>
-
-        <PropertyGroup>
-            <PublishDir>$(PublishIntermediateOutputPath)</PublishDir>
-            <PublishDir Condition="!HasTrailingSlash('$(PublishDir)')">$(PublishDir)\</PublishDir>
-            <FunctionsTargetPath>$(PublishDir)bin\$(TargetFileName)</FunctionsTargetPath>
-            <FunctionsOutputPath>$(PublishIntermediateOutputPath)</FunctionsOutputPath>
-        </PropertyGroup>
-
-        <!-- Remove all the files from the temp directory first-->
-        <ItemGroup>
-            <_PublishTempFiles Include="$(PublishIntermediateOutputPath)**\*.*" />
-        </ItemGroup>
-
-        <Delete Files="@(_PublishTempFiles)"
-                ContinueOnError="true" />
-
-        <RemoveDir Directories="$(PublishIntermediateOutputPath)"
-                   ContinueOnError="true"
-                   Condition="Exists('$(PublishIntermediateOutputPath)')" />
-
-        <MakeDir Directories="$(PublishIntermediateOutputPath)"
-                 Condition="!Exists('$(PublishIntermediateOutputPath)')"/>
-
-    </Target>
-
-    <Target Name="_FunctionsPostPublish"
-          AfterTargets="Publish"
-          DependsOnTargets="_GenerateFunctionsAndCopyContentFiles;_WorkerExtensionsPublish"
-          >
-    </Target>
-
-    <!--
-    ============================================================
-
-    This targets gets called when publish is invoked with DeployOnBuild
-    set. This target is responsible for overriding the publish targets
-    from Publish SDK and generating function.json during publish.
-
-    ============================================================
-    -->
+  <!-- This is a no-op target purely for backwards compatibilty. Remove this with a major version rev. -->
+  <Target Name="_FunctionsPostBuild" />
 
+  <!-- Setting up some paths we will use for later targets. Broken out into its own as we want to pull it in not just for build (ie: Clean also). -->
+  <Target Name="_FunctionsGetPaths">
     <PropertyGroup>
-        <CorePublishDependsOn>
-            _InitializeDeployOnBuildProperties;
-            Publish;
-            $(_DotNetPublishFiles);
-        </CorePublishDependsOn>
+      <_FunctionsMetadataPath>$(IntermediateOutputPath)functions.metadata</_FunctionsMetadataPath>
+      <_FunctionsWorkerConfigPath>$(IntermediateOutputPath)worker.config.json</_FunctionsWorkerConfigPath>
+      <ExtensionsCsProjDirectory Condition="'$(ExtensionsCsProjDirectory)' == ''">$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)WorkerExtensions))</ExtensionsCsProjDirectory>
+      <ExtensionsCsProj>$([System.IO.Path]::Combine($(ExtensionsCsProjDirectory), WorkerExtensions.csproj))</ExtensionsCsProj>
+      <_FunctionsIntermediateExtensionJsonPath>$(ExtensionsCsProjDirectory)\buildout\bin\$(_FunctionsExtensionsJsonName)</_FunctionsIntermediateExtensionJsonPath>
+      <_FunctionsIntermediateExtensionUpdatedJsonPath>$(IntermediateOutputPath)$(_FunctionsExtensionsJsonName)</_FunctionsIntermediateExtensionUpdatedJsonPath>
     </PropertyGroup>
+  </Target>
 
-    <Target Name="_GenerateFunctionsAndCopyContentFiles" DependsOnTargets="_GenerateFunctionsAndCopyContentFilesNetApp;_GenerateFunctionsAndCopyContentFilesNetFx" />
-
-    <Target Name="_GenerateFunctionsAndCopyContentFilesNetFx" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
-
-        <PropertyGroup>
-            <OutputFile>$(PublishDir)\worker.config.json</OutputFile>
-            <ExtensionsCsProjFilePath>$([System.IO.Path]::Combine($([System.IO.Path]::GetTempPath()), $([System.IO.Path]::GetRandomFileName())))</ExtensionsCsProjFilePath>
-        </PropertyGroup>
-
-        <GenerateFunctionMetadata
-          AssemblyPath="$(PublishDir)\$(AssemblyName).exe"
-          ReferencePaths="@(ReferencePath)"
-          ExtensionsCsProjFilePath="$(ExtensionsCsProjFilePath)"
-          AzureFunctionsVersion="$(AzureFunctionsVersion)"
-          TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
-          TargetFrameworkVersion="$(TargetFrameworkVersion)"
-          OutputPath="$(PublishDir)"/>
-
-        <Copy
-          Condition="!$(FunctionsEnablePlaceholder)"
-          SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
-          DestinationFolder="$(ExtensionsCsProjFilePath)\publishout"
-          OverwriteReadOnlyFiles="true" />
-
-        <WriteLinesToFile
-            File="$(OutputFile)"
-            Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                  .Replace('$functionExe$', '{WorkerRoot}$(TargetName).exe')
-                                  .Replace('$functionWorker$', '$(TargetName).exe')
-                                  .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
-            Overwrite="true" />
-    </Target>
-
-    <Target Name="_GenerateFunctionsAndCopyContentFilesNetApp" Condition="$(TargetFrameworkIdentifier) != '.NETFramework'">
-
-        <PropertyGroup>
-            <OutputFile>$(PublishDir)\worker.config.json</OutputFile>
-            <ExtensionsCsProjFilePath>$([System.IO.Path]::Combine($([System.IO.Path]::GetTempPath()), $([System.IO.Path]::GetRandomFileName())))</ExtensionsCsProjFilePath>
-        </PropertyGroup>
+  <!-- We have a few files we can tell the .NET SDK targets to copy for us early on in the build. -->
+  <Target Name="_FunctionsPreBuild" DependsOnTargets="_FunctionsGetPaths" BeforeTargets="AssignTargetPaths">
+    <ItemGroup>
+      <None Include="$(_FunctionsMetadataPath)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" TargetPath="functions.metadata"  />
+      <None Include="$(_FunctionsWorkerConfigPath)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" TargetPath="worker.config.json" />
+      <None Include="$(_FunctionsIntermediateExtensionUpdatedJsonPath)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" TargetPath="$(_FunctionsExtensionsJsonName)" />
+    </ItemGroup>
+  </Target>
 
-        <GenerateFunctionMetadata
-          AssemblyPath="$(PublishDir)\$(AssemblyName).dll"
-          ReferencePaths="@(ReferencePath)"
-          ExtensionsCsProjFilePath="$(ExtensionsCsProjFilePath)"
-          AzureFunctionsVersion="$(AzureFunctionsVersion)"
-          TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
-          TargetFrameworkVersion="$(TargetFrameworkVersion)"
-          OutputPath="$(PublishDir)"/>
+  <!-- Helper target to granularly order more targets. -->
+  <Target Name="_FunctionsGenerateMetadata" DependsOnTargets="_FunctionsGenerateCommon;_FunctionsCopyMetadataLoader;_FunctionsGenerateNetApp;_FunctionsGenerateNetFx" />
+
+  <!-- Generates the extension files. Generates functions.metadata and the WorkerExtension.csproj -->
+  <Target Name="_FunctionsGenerateCommon" Inputs="@(IntermediateAssembly);@(ReferencePath)" Outputs="$(_FunctionsMetadataPath);$(ExtensionsCsProj)">
+    <GenerateFunctionMetadata
+      AssemblyPath="$(IntermediateOutputPath)$(TargetName)$(TargetExt)"
+      ReferencePaths="@(ReferencePath)"
+      ExtensionsCsProjFilePath="$(ExtensionsCsProjDirectory)"
+      AzureFunctionsVersion="$(AzureFunctionsVersion)"
+      TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
+      TargetFrameworkVersion="$(TargetFrameworkVersion)"
+      OutputPath="$(IntermediateOutputPath)"/>
+  </Target>
 
-        <Copy
-          Condition="!$(FunctionsEnablePlaceholder)"
-          SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
-          DestinationFolder="$(ExtensionsCsProjFilePath)\publishout"
-          OverwriteReadOnlyFiles="true" />
+  <!-- Copies an assembly over only if we are not a placeholder. -->
+  <Target Name="_FunctionsCopyMetadataLoader" Condition="!$(FunctionsEnablePlaceholder)">
+    <Copy
+      SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
+      DestinationFolder="$(ExtensionsCsProjDirectory)\buildout"
+      SkipUnchangedFiles="true"
+      OverwriteReadOnlyFiles="true" />
+  </Target>
 
-        <WriteLinesToFile
-            Condition="$(SelfContained)"
-            File="$(OutputFile)"
-            Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                  .Replace('$functionExe$', '{WorkerRoot}$(TargetName)')
-                                  .Replace('$functionWorker$', '$(TargetName).dll')
-                                  .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
+  <!-- Generates the worker.config.json for .NET apps -->
+  <Target Name="_FunctionsGenerateNetApp" Condition="$(TargetFrameworkIdentifier) != '.NETFramework'">
+    <WriteLinesToFile
+      Condition="$(SelfContained)"
+      File="$(_FunctionsWorkerConfigPath)"
+      Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
+        .Replace('$functionExe$', '{WorkerRoot}$(TargetName)')
+        .Replace('$functionWorker$', '$(TargetName).dll')
+        .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
         Overwrite="true" />
 
-        <WriteLinesToFile
-            Condition="!$(SelfContained)"
-            File="$(OutputFile)"
-            Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
-                                  .Replace('$functionExe$', 'dotnet')
-                                  .Replace('$functionWorker$', '$(TargetName).dll')
-                                  .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
+      <WriteLinesToFile
+        Condition="!$(SelfContained)"
+        File="$(_FunctionsWorkerConfigPath)"
+        Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
+          .Replace('$functionExe$', 'dotnet')
+          .Replace('$functionWorker$', '$(TargetName).dll')
+          .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
         Overwrite="true" />
+  </Target>
 
-    </Target>
-
-    <!--
-  Publish the webjobs extensions in ".azurefunctions"
-  -->
-    <!--
-  We need to copy all files from <build-out>/bin except for "runtimes" directory. The "runtimes" directory inside "bin" doesn't contain the binaries for all platforms.
-  This is due to a bug in Functions SDK. Until that is fixed, we need to copy "runtimes" directly from build output, instead of copying from the "bin".
-  -->
-    <Target Name ="_WorkerExtensionsPublishCopy">
-        <ItemGroup>
-            <ExtensionBinaries Include="$(ExtensionsCsProjFilePath)\publishout\bin\**\*.*"
-                               Exclude="$(ExtensionsCsProjFilePath)\publishout\bin\runtimes\**\*.*"/>
-            <ExtensionRuntimeBinaries Include="$(ExtensionsCsProjFilePath)\publishout\runtimes\**\*.*" />
-        </ItemGroup>
-
-        <Copy SourceFiles="@(ExtensionBinaries)" DestinationFolder="$(PublishDir)\.azurefunctions\%(RecursiveDir)" />
-        <Copy SourceFiles="@(ExtensionRuntimeBinaries)" DestinationFolder="$(PublishDir)\.azurefunctions\runtimes\%(RecursiveDir)" />
-    </Target>
-
-    <Target Name ="_WorkerExtensionsFullPublish">
-        <MSBuild Projects="$(ExtensionsCsProjFilePath)\WorkerExtensions.csproj" RemoveProperties="DeployOnBuild" Targets="Publish" Properties="Configuration=Release;PublishDir=$(ExtensionsCsProjFilePath)\publishout;OutputPath=$(ExtensionsCsProjFilePath)\publishout;CopyLocalLockFileAssemblies=true"/>
-    </Target>
-
-    <Target Name="_WorkerExtensionsRestorePublish">
-        <MSBuild Projects="$(ExtensionsCsProjFilePath)\WorkerExtensions.csproj" Targets="Restore" Properties="IsRestoring=true"/>
-    </Target>
-
-    <Target Name="_WorkerExtensionsPublish"
-          AfterTargets="_GenerateFunctionsAndCopyContentFiles"
-          DependsOnTargets="$(FunctionsWorkerExtensionsPublishDependsOn)">
-    </Target>
+  <!-- Generates the worker.config.json for netfx apps -->
+  <Target Name="_FunctionsGenerateNetFx" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
+    <WriteLinesToFile
+      File="$(_FunctionsWorkerConfigPath)"
+      Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
+        .Replace('$functionExe$', '{WorkerRoot}$(TargetName).exe')
+        .Replace('$functionWorker$', '$(TargetName).exe')
+        .Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
+      Overwrite="true" />
+  </Target>
 
-    <PropertyGroup>
-        <FunctionsWorkerExtensionsPublishDependsOn Condition="$(_FunctionsExtensionsFullPublish)">
-            _GenerateFunctionsAndCopyContentFiles;
-            _WorkerExtensionsRestorePublish;
-            _WorkerExtensionsFullPublish;
-            _WorkerExtensionsPublishCopy;
-            _EnhanceFunctionsExtensionsMetadataPostPublish
-        </FunctionsWorkerExtensionsPublishDependsOn>
-        <FunctionsWorkerExtensionsPublishDependsOn Condition="!$(_FunctionsExtensionsFullPublish)">
-            _GenerateFunctionsAndCopyContentFiles;
-            _WorkerExtensionsPublishCopyNoBuild
-        </FunctionsWorkerExtensionsPublishDependsOn>
-    </PropertyGroup>
+  <!-- Invoke restore on WorkerExtension.csproj -->
+  <Target Name="_WorkerExtensionsRestore">
+    <MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;$(_FunctionsExtensionCommonProps)" />
+  </Target>
 
-    <!--
-  Add HintPath to references in "extensions.json"
-  -->
-    <Target Name="_EnhanceFunctionsExtensionsMetadataPostPublish">
+  <!-- Invoke build on WorkerExtension.csproj -->
+  <Target Name="_WorkerExtensionsBuild" DependsOnTargets="_WorkerExtensionsRestore">
+    <MSbuild Projects="$(ExtensionsCsProj)" Targets="Build" RemoveProperties="DeployOnBuild" Properties="Configuration=Release;OutputPath=$(ExtensionsCsProjDirectory)\buildout;$(_FunctionsExtensionCommonProps)" />
+  </Target>
 
-        <EnhanceExtensionsMetadata
-          ExtensionsJsonPath="$(PublishDir)\$(_FunctionsExtensionsDirectory)\$(_FunctionsExtensionsJsonName)"
-          OutputPath="$(PublishDir)\$(_FunctionsExtensionsJsonName)" />
+  <!-- Touch up the extensions.json file as needed for .NET isolated -->
+  <Target Name="_FunctionsExtensionUpdateMetadata"
+    AfterTargets="_WorkerExtensionsBuild"
+    BeforeTargets="CopyFilesToOutputDirectory"
+    Inputs="$(_FunctionsIntermediateExtensionJsonPath)"
+    Outputs="$(_FunctionsIntermediateExtensionUpdatedJsonPath)">
+    <EnhanceExtensionsMetadata
+      ExtensionsJsonPath="$(_FunctionsIntermediateExtensionJsonPath)"
+      OutputPath="$(_FunctionsIntermediateExtensionUpdatedJsonPath)"/>
+  </Target>
 
-    </Target>
+  <!-- We do not copy files to output or publish directory ourselves. Instead, we are going to leverage existing
+    targets in the .NET SDK to perform the copying for us. All we have to do is append to an item group with
+    appropriate metadata on the items, and now both Build and Publish will know our files are to be copied out. -->
+  <Target Name="_FunctionsExtensionAssignTargetPaths">
+    <ItemGroup>
+      <_ExtensionBinaries Include="$(ExtensionsCsProjDirectory)\buildout\bin\**"
+        Exclude="$(ExtensionsCsProjDirectory)\buildout\bin\runtimes\**;$(_FunctionsIntermediateExtensionJsonPath)"
+        CopyToOutputDirectory="PreserveNewest"
+        CopyToPublishDirectory="PreserveNewest" />
+      <_ExtensionRuntimeBinaries Include="$(ExtensionsCsProjDirectory)\buildout\runtimes\**"
+        CopyToOutputDirectory="PreserveNewest"
+        CopyToPublishDirectory="PreserveNewest" />
+    </ItemGroup>
+
+    <!-- This target will assign the 'TargetPath' metadata for us with the correct root. The 'TargetPath' is what
+      the CopyToOutputDirectory and CopyToPublishDirectory will use to determine path to copy to. Setting
+      'RootFolder' as we do tells this task to trim off the root when deciding the final location. -->
+    <AssignTargetPath Files="@(_ExtensionBinaries)" RootFolder="$(ExtensionsCsProjDirectory)\buildout\bin">
+      <Output TaskParameter="AssignedFiles" ItemName="_ExtensionFilesWithTargetPath" />
+    </AssignTargetPath>
+
+    <AssignTargetPath Files="@(_ExtensionRuntimeBinaries)" RootFolder="$(ExtensionsCsProjDirectory)\buildout">
+      <Output TaskParameter="AssignedFiles" ItemName="_ExtensionFilesWithTargetPath" />
+    </AssignTargetPath>
+
+    <!-- Hook all these files into CopyToOutputDirectory by appending to _NoneWithTargetPath. -->
+    <ItemGroup>
+      <_NoneWithTargetPath Include="@(_ExtensionFilesWithTargetPath)" TargetPath="$(_FunctionsExtensionsDirectory)/%(_ExtensionFilesWithTargetPath.TargetPath)" />
+    </ItemGroup>
+  </Target>
 
-    <!--
-  Copies the assemblies from build directory ("bin\...\net5.0\") to the publish directory ("bin\...\net5.0\publish")
-  This task is executed instead of full publish of WorkerExtensions when NoBuild property is set
-  -->
-    <Target Name ="_WorkerExtensionsPublishCopyNoBuild">
-        <ItemGroup>
-            <ExtensionBinaries Include="$(OutDir)\$(_FunctionsExtensionsDirectory)\**\*.*"
-                               Exclude="$(OutDir)\$(_FunctionsExtensionsDirectory)\runtimes\**\*.*"/>
-            <ExtensionRuntimeBinaries Include="$(OutDir)\.azurefunctions\runtimes\**\*.*" />
-            <ExtensionsJson Include="$(OutDir)\$(_FunctionsExtensionsJsonName)" />
-        </ItemGroup>
+  <Target Name="_CleanFunctions" AfterTargets="Clean" DependsOnTargets="_FunctionsGetPaths">
+    <ItemGroup>
+      <_WorkerExtFilesToClean Include="$(ExtensionsCsProjDirectory)\**" Condition="'$(ExtensionsCsProjDirectory)' != ''" />
+      <_WorkerExtFilesToClean Include="$(TargetDir)$(_FunctionsExtensionsDirectory)\**" />
+      <_WorkerExtFilesToClean Include="$(_FunctionsMetadataPath)" />
+      <_WorkerExtFilesToClean Include="$(_FunctionsWorkerConfigPath)" />
+      <_WorkerExtFilesToClean Include="$(TargetDir)worker.config.json" />
+      <_WorkerExtFilesToClean Include="$(TargetDir)extensions.json" />
+      <_WorkerExtFilesToClean Include="$(TargetDir)functions.metadata" />
+      <_WorkerExtFilesToClean Include="$(_FunctionsIntermediateExtensionUpdatedJsonPath)" />
+    </ItemGroup>
+
+    <Delete Files="@(_WorkerExtFilesToClean)" ContinueOnError="true" />
+    <RemoveDir Directories="$(TargetDir)$(_FunctionsExtensionsDirectory)" ContinueOnError="true" />
+    <RemoveDir Directories="$(ExtensionsCsProjDirectory)" ContinueOnError="true" Condition="'$(ExtensionsCsProjDirectory)' != ''" />
+  </Target>
 
-        <Copy SourceFiles="@(ExtensionBinaries)" DestinationFolder="$(PublishDir)\$(_FunctionsExtensionsDirectory)\%(RecursiveDir)" />
-        <Copy SourceFiles="@(ExtensionRuntimeBinaries)" DestinationFolder="$(PublishDir)\$(_FunctionsExtensionsDirectory)\runtimes\%(RecursiveDir)" />
-        <Copy SourceFiles="@(ExtensionsJson)" DestinationFolder="$(PublishDir)\" />
-    </Target>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Sdk.Publish.targets"
+    Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Sdk.Publish.targets')" />
 
 </Project>
\ No newline at end of file
diff --git a/sdk/Sdk/Tasks/EnhanceExtensionsMetadata.cs b/sdk/Sdk/Tasks/EnhanceExtensionsMetadata.cs
index 8fbaf5c13..c76bb4871 100644
--- a/sdk/Sdk/Tasks/EnhanceExtensionsMetadata.cs
+++ b/sdk/Sdk/Tasks/EnhanceExtensionsMetadata.cs
@@ -34,8 +34,6 @@ public override bool Execute()
             string newJson = JsonSerializer.Serialize(extensionsMetadata, _serializerOptions);
             File.WriteAllText(OutputPath, newJson);
 
-            File.Delete(ExtensionsJsonPath);
-
             return true;
         }
     }
diff --git a/sdk/release_notes.md b/sdk/release_notes.md
index 36a1697ad..5bb97cb31 100644
--- a/sdk/release_notes.md
+++ b/sdk/release_notes.md
@@ -7,9 +7,11 @@
 
 ### Microsoft.Azure.Functions.Worker.Sdk 1.15.0-preview1
 
-- Improve incremental build support for worker extension project inner build [#1749](https://github.com/Azure/azure-functions-dotnet-worker/pull/1749)
-    - Now builds to intermediate output path
-    - Avoids disk writes for generated .csproj and file copies if nothing has changed
+- Improve incremental build support for worker extension project inner build [#1749](https://github.com/Azure/azure-functions-dotnet-worker/pull/1749) 
+    - Now builds to intermediate output path - adding support for `nuget.config`
+- Integrate inner build with existing .NET SDK targets [##1861](https://github.com/Azure/azure-functions-dotnet-worker/pull/1861)
+    - Targets have been refactored to participate with `CopyToOutputDirectory` and `CopyToPublishDirectory` instead of manually copying
+    - Incremental build support further improved
 
 ### Microsoft.Azure.Functions.Worker.Sdk.Analyzers <version> (delete if not updated)
 
diff --git a/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs b/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs
index 05f148941..3af598ce7 100644
--- a/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs
+++ b/test/FunctionMetadataGeneratorTests/ExtensionsCsProjGeneratorTests.cs
@@ -33,20 +33,23 @@ public void GetCsProjContent_Succeeds(FuncVersion version)
         [InlineData(FuncVersion.V4)]
         public void GetCsProjContent_IncrementalSupport(FuncVersion version)
         {
-            DateTime RunGenerate(string subPath)
+            DateTime RunGenerate(string subPath, out string contents)
             {
                 var generator = GetGenerator(version, subPath);
                 generator.Generate();
 
+                string path = Path.Combine(subPath, ExtensionsCsprojGenerator.ExtensionsProjectName);
+                contents = File.ReadAllText(path);
                 var csproj = new FileInfo(Path.Combine(subPath, ExtensionsCsprojGenerator.ExtensionsProjectName));
                 return csproj.LastWriteTimeUtc;
             }
 
             string subPath = Guid.NewGuid().ToString();
-            DateTime firstRun = RunGenerate(subPath);
-            DateTime secondRun = RunGenerate(subPath);
+            DateTime firstRun = RunGenerate(subPath, out string first);
+            DateTime secondRun = RunGenerate(subPath, out string second);
 
-            Assert.Equal(firstRun, secondRun);
+            Assert.NotEqual(firstRun, secondRun);
+            Assert.Equal(first, second);
         }
 
         static ExtensionsCsprojGenerator GetGenerator(FuncVersion version, string subPath = "")