Skip to content

Pass RestoreSources to inner-build restore task #1937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jviau merged 3 commits into from
Oct 3, 2023
Merged

Pass RestoreSources to inner-build restore task #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35eb6b4
Pass RestoreSources to inner-build restore task
jviau Sep 29, 2023
dd79dc6
Depend on target instead of task
jviau Sep 29, 2023
4871f2e
Update release notes
jviau Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +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">
<MSBuild Projects="$(ExtensionsCsProj)" Targets="Restore" Properties="IsRestoring=true;$(_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 -->
Expand Down
11 changes: 6 additions & 5 deletions sdk/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down