Skip to content

Commit 88d3d7f

Browse files
authored
Avoid registering metadata loader extension when running in the native worker (#1258)
1 parent ae0cbe0 commit 88d3d7f

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

sdk/Sdk/Sdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<MinorProductVersion>8</MinorProductVersion>
5-
<VersionSuffix>-preview3</VersionSuffix>
5+
<VersionSuffix>-preview4</VersionSuffix>
66
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
77
<PackageId>Microsoft.Azure.Functions.Worker.Sdk</PackageId>
88
<Description>This package provides development time support for the Azure Functions .NET Worker.</Description>

sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
3535

3636
<FunctionsEnableWorkerIndexing Condition="$(FunctionsEnableWorkerIndexing) == ''">false</FunctionsEnableWorkerIndexing>
3737
<FunctionsMetadataSourceGen_Enabled Condition="$(FunctionsMetadataSourceGen_Enabled) == ''">true</FunctionsMetadataSourceGen_Enabled>
38+
<FunctionsEnablePlaceholder Condition="$(FunctionsEnablePlaceholder) == ''">false</FunctionsEnablePlaceholder>
3839
</PropertyGroup>
3940

4041
<UsingTask TaskName="GenerateFunctionMetadata"
@@ -75,7 +76,9 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
7576
TargetFrameworkVersion="$(TargetFrameworkVersion)"
7677
OutputPath="$(TargetDir)"/>
7778

79+
<!-- Do not copy _FunctionsMetadataLoaderExtensionFile when in placeholder mode, as we don't want the FunctionMetadataLoader entry in extensions.json-->
7880
<Copy
81+
Condition="!$(FunctionsEnablePlaceholder)"
7982
SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
8083
DestinationFolder="$(ExtensionsCsProjFilePath)\buildout"
8184
OverwriteReadOnlyFiles="true" />
@@ -104,8 +107,9 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
104107
TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
105108
TargetFrameworkVersion="$(TargetFrameworkVersion)"
106109
OutputPath="$(TargetDir)"/>
107-
110+
<!-- Do not copy _FunctionsMetadataLoaderExtensionFile when in placeholder mode, as we don't want the FunctionMetadataLoader entry in extensions.json-->
108111
<Copy
112+
Condition="!$(FunctionsEnablePlaceholder)"
109113
SourceFiles="$(_FunctionsMetadataLoaderExtensionFile)"
110114
DestinationFolder="$(ExtensionsCsProjFilePath)\buildout"
111115
OverwriteReadOnlyFiles="true" />

sdk/release_notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
- Support sdk-type binding reference type (#1107)
77
- Add MS Build property to disable source generation of function metadata (it is enabled automatically) (#1200)
8-
- Prop name: `FunctionsMetadataSourceGen_Enabled`
8+
- Prop name: `FunctionsMetadataSourceGen_Enabled`
9+
- Avoid registering metadata loader extension when running in the native worker (#1216)

0 commit comments

Comments
 (0)