Skip to content

Generate correct value for defaultWorkerPath in worker.config when AOT publishing is enabled #1980

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
kshyju merged 4 commits into from
Nov 16, 2023
Merged

Generate correct value for defaultWorkerPath in worker.config when AOT publishing is enabled #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aec171f
Generate value for `defaultWorkerPath` in worker.config for publishAO…
kshyju Oct 23, 2023
3f85498
Using TargetExt variable
kshyju Oct 24, 2023
1a18653
Rebasing on main., took release notes from main. then updated to refl…
kshyju Nov 14, 2023
dc32198
Version bump for Sdk project
kshyju Nov 14, 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
2 changes: 1 addition & 1 deletion sdk/Sdk/Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<MinorProductVersion>16</MinorProductVersion>
<PatchProductVersion>2</PatchProductVersion>
<PatchProductVersion>3</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>
Expand Down
22 changes: 16 additions & 6 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 @@ -65,6 +65,16 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<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>

<PropertyGroup Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<_FunctionsWorkerExecutableFileName >$(TargetName)$(TargetExt)</_FunctionsWorkerExecutableFileName>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFrameworkIdentifier) != '.NETFramework'">
<_FunctionsNativeExecutableExtension Condition="($(RuntimeIdentifier.StartsWith('win')) or $(DefaultAppHostRuntimeIdentifier.StartsWith('win')))">.exe</_FunctionsNativeExecutableExtension>
<_FunctionsWorkerExecutableFileName Condition="'$(PublishAot)' != 'true'">$(TargetName).dll</_FunctionsWorkerExecutableFileName>
<_FunctionsWorkerExecutableFileName Condition="'$(PublishAot)' == 'true'">$(TargetName)$(_FunctionsNativeExecutableExtension)</_FunctionsWorkerExecutableFileName>
</PropertyGroup>
Comment thread
kshyju marked this conversation as resolved.
Outdated

<Target Name="_FunctionsPostBuild" AfterTargets="AfterBuild" DependsOnTargets="_FunctionsPostBuildNetFx;_FunctionsPostBuildNetApp"/>
<!--.NET Framework post build-->
<Target Name="_FunctionsPostBuildNetFx" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
Expand Down Expand Up @@ -93,7 +103,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', '{WorkerRoot}$(TargetName).exe')
.Replace('$functionWorker$', '$(TargetName).exe')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />
</Target>
Expand Down Expand Up @@ -125,7 +135,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', '{WorkerRoot}$(TargetName)')
.Replace('$functionWorker$', '$(TargetName).dll')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />

Expand All @@ -135,7 +145,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', 'dotnet')
.Replace('$functionWorker$', '$(TargetName).dll')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />

Expand Down Expand Up @@ -311,7 +321,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', '{WorkerRoot}$(TargetName).exe')
.Replace('$functionWorker$', '$(TargetName).exe')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />
</Target>
Expand Down Expand Up @@ -343,7 +353,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', '{WorkerRoot}$(TargetName)')
.Replace('$functionWorker$', '$(TargetName).dll')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />

Expand All @@ -352,7 +362,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
File="$(OutputFile)"
Lines="$([System.IO.File]::ReadAllText($(_FunctionsWorkerConfigInputFile))
.Replace('$functionExe$', 'dotnet')
.Replace('$functionWorker$', '$(TargetName).dll')
.Replace('$functionWorker$', '$(_FunctionsWorkerExecutableFileName)')
.Replace('$enableWorkerIndexing$', '$(FunctionsEnableWorkerIndexing)'))"
Overwrite="true" />

Expand Down
8 changes: 2 additions & 6 deletions sdk/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
- My change description (#PR/#issue)
-->

### Microsoft.Azure.Functions.Worker.Sdk 1.16.2 (meta package)
### Microsoft.Azure.Functions.Worker.Sdk 1.16.3 (meta package)

- Update Microsoft.Azure.Functions.Worker.Sdk.Generators dependency to 1.1.4

### Microsoft.Azure.Functions.Worker.Sdk.Generators 1.1.4

- Adding support for locating functions within nested types and nested namespaces from referenced assemblies (#2054)
- Update worker.config generation to accurate worker executable name (#1053)