From 35eb6b4e4cc576a8d8d80fabda36f29a4bc6b3bb Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Fri, 29 Sep 2023 11:45:39 -0700
Subject: [PATCH 1/3] Pass RestoreSources to inner-build restore task

---
 .../Targets/Microsoft.Azure.Functions.Worker.Sdk.targets  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
index 4b4767cc8..cba8d83c8 100644
--- a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
+++ b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
@@ -151,7 +151,13 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
   <!-- Invoke restore on WorkerExtension.csproj -->
   <Target Name="_WorkerExtensionsRestore">
-    <MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;$(_FunctionsExtensionCommonProps)" />
+    <!-- Task from Nuget targets, this will resolve the restore sources this project has configured. We want to pass
+      these on to the inner-build, so that nuget feeds used are identical. -->
+    <GetRestoreSettingsTask ProjectUniqueName="$(MSBuildProjectFullPath)" RestoreSources="$(RestoreSources)" RestorePackagesPath="$(RestorePackagesPath)" RestoreRepositoryPath="$(RestoreRepositoryPath)" RestoreFallbackFolders="$(RestoreFallbackFolders)" RestoreConfigFile="$(RestoreConfigFile)" RestoreRootConfigDirectory="$(RestoreRootConfigDirectory)" RestoreSolutionDirectory="$(RestoreSolutionDirectory)" RestoreSettingsPerFramework="@(_RestoreSettingsPerFramework)" RestorePackagesPathOverride="$(_RestorePackagesPathOverride)" RestoreRepositoryPathOverride="$(_RestoreRepositoryPathOverride)" RestoreSourcesOverride="$(_RestoreSourcesOverride)" RestoreFallbackFoldersOverride="$(_RestoreFallbackFoldersOverride)" RestoreProjectStyle="$(RestoreProjectStyle)" MSBuildStartupDirectory="$(MSBuildStartupDirectory)">
+      <Output TaskParameter="OutputSources" PropertyName="_ExtensionRestoreSources" />
+    </GetRestoreSettingsTask>
+
+    <MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;RestoreSources=$(_ExtensionRestoreSources);$(_FunctionsExtensionCommonProps)" />
   </Target>
 
   <!-- Invoke build on WorkerExtension.csproj -->

From dd79dc61f5854b825ee657a925431e1f5a0ec39a Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Fri, 29 Sep 2023 12:09:20 -0700
Subject: [PATCH 2/3] Depend on target instead of task

---
 .../Microsoft.Azure.Functions.Worker.Sdk.targets   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
index cba8d83c8..403299592 100644
--- a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
+++ b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
@@ -149,15 +149,11 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
       Overwrite="true" />
   </Target>
 
-  <!-- Invoke restore on WorkerExtension.csproj -->
-  <Target Name="_WorkerExtensionsRestore">
-    <!-- Task from Nuget targets, this will resolve the restore sources this project has configured. We want to pass
-      these on to the inner-build, so that nuget feeds used are identical. -->
-    <GetRestoreSettingsTask ProjectUniqueName="$(MSBuildProjectFullPath)" RestoreSources="$(RestoreSources)" RestorePackagesPath="$(RestorePackagesPath)" RestoreRepositoryPath="$(RestoreRepositoryPath)" RestoreFallbackFolders="$(RestoreFallbackFolders)" RestoreConfigFile="$(RestoreConfigFile)" RestoreRootConfigDirectory="$(RestoreRootConfigDirectory)" RestoreSolutionDirectory="$(RestoreSolutionDirectory)" RestoreSettingsPerFramework="@(_RestoreSettingsPerFramework)" RestorePackagesPathOverride="$(_RestorePackagesPathOverride)" RestoreRepositoryPathOverride="$(_RestoreRepositoryPathOverride)" RestoreSourcesOverride="$(_RestoreSourcesOverride)" RestoreFallbackFoldersOverride="$(_RestoreFallbackFoldersOverride)" RestoreProjectStyle="$(RestoreProjectStyle)" MSBuildStartupDirectory="$(MSBuildStartupDirectory)">
-      <Output TaskParameter="OutputSources" PropertyName="_ExtensionRestoreSources" />
-    </GetRestoreSettingsTask>
-
-    <MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;RestoreSources=$(_ExtensionRestoreSources);$(_FunctionsExtensionCommonProps)" />
+  <!-- Invoke restore on WorkerExtension.csproj.
+    We depend on _GetRestoreSettings, which is a task from nuget targets that will resolve various nuget restore settings.
+    Namely we want to know what restore sources ($(_OutputSources)) to use. -->
+  <Target Name="_WorkerExtensionsRestore" DependsOnTargets="_GetRestoreSettings">
+    <MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;RestoreSources=$(_OutputSources);$(_FunctionsExtensionCommonProps)" />
   </Target>
 
   <!-- Invoke build on WorkerExtension.csproj -->

From 4871f2ef9c45cb937e9778d3be0dc3243718bc49 Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Fri, 29 Sep 2023 13:27:37 -0700
Subject: [PATCH 3/3] Update release notes

---
 sdk/release_notes.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sdk/release_notes.md b/sdk/release_notes.md
index 5bb97cb31..e0cb7502e 100644
--- a/sdk/release_notes.md
+++ b/sdk/release_notes.md
@@ -7,11 +7,12 @@
 
 ### 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 - 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
+- Improve incremental build support for worker extension project inner build (https://github.com/Azure/azure-functions-dotnet-worker/pull/1749) 
+  - Now builds to intermediate output path
+- Resolve and pass nuget restore sources as explicit property to inner build (https://github.com/Azure/azure-functions-dotnet-worker/pull/1937)
+- Integrate inner build with existing .NET SDK targets (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)