diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets index 0db0e37d8..5d3bbd8b0 100644 --- a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets +++ b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets @@ -9,10 +9,12 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and *********************************************************************************************** --> + <_ToolingSuffix> - <_AzureFunctionsNotSet Condition="'$(AzureFunctionsVersion)' == ''">true - v4 + <_DefaultAzureFunctionsVersion>v4 + <_AzureFunctionsVersionNotSet Condition="'$(AzureFunctionsVersion)' == ''">true + $(_DefaultAzureFunctionsVersion) <_ToolingSuffix Condition="($(AzureFunctionsVersion.StartsWith('v3',StringComparison.OrdinalIgnoreCase)) Or $(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase))) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v5.0'">net5-isolated <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v6.0'">net6-isolated <_ToolingSuffix Condition="$(AzureFunctionsVersion.StartsWith('v4',StringComparison.OrdinalIgnoreCase)) And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v7.0'">net7-isolated @@ -45,6 +47,11 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and $(RootNamespace.Replace("-", "_")) + + <_FunctionsVersion Include="v3" InSupport="false" /> + <_FunctionsVersion Include="$(_DefaultAzureFunctionsVersion)" InSupport="true" /> + + @@ -55,12 +62,20 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and - - - - - - + + <_AzureFunctionsVersionStandardized>$(AzureFunctionsVersion.ToLowerInvariant()) + true + + + + <_SelectedFunctionVersion Include="@(_FunctionsVersion)" Condition="'%(_FunctionsVersion.Identity)' == '$(_AzureFunctionsVersionStandardized)'" /> + + + + + + + diff --git a/sdk/release_notes.md b/sdk/release_notes.md index 20b5b9394..cda7c74c7 100644 --- a/sdk/release_notes.md +++ b/sdk/release_notes.md @@ -4,7 +4,9 @@ - My change description (#PR/#issue) --> -### Microsoft.Azure.Functions.Worker.Sdk (meta package) +### Microsoft.Azure.Functions.Worker.Sdk + +- Fix incorrect function version in build message (#2606) -