diff --git a/src/Tasks/Common/MetadataKeys.cs b/src/Tasks/Common/MetadataKeys.cs index cfb93050a807..2940c81b9787 100644 --- a/src/Tasks/Common/MetadataKeys.cs +++ b/src/Tasks/Common/MetadataKeys.cs @@ -47,6 +47,7 @@ internal static class MetadataKeys // Diagnostics public const string DiagnosticCode = "DiagnosticCode"; + public const string DisplayName = "DisplayName"; public const string Message = "Message"; public const string FilePath = "FilePath"; public const string Severity = "Severity"; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateSupportedTargetFrameworkAlias.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateSupportedTargetFrameworkAlias.cs index db830ff19e2d..01768eed2360 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateSupportedTargetFrameworkAlias.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateSupportedTargetFrameworkAlias.cs @@ -49,8 +49,8 @@ protected override void ExecuteCore() targetFrameworkAlias = $"{targetFrameworkAlias}-windows"; } - var displayName = string.IsNullOrWhiteSpace(tfm.GetMetadata("DisplayName")) ? targetFrameworkAlias : tfm.GetMetadata("DisplayName"); - convertedTfms.Add(new TaskItem(targetFrameworkAlias, new Dictionary() { { "DisplayName", displayName } })); + var displayName = string.IsNullOrWhiteSpace(tfm.GetMetadata(MetadataKeys.DisplayName)) ? targetFrameworkAlias : tfm.GetMetadata(MetadataKeys.DisplayName); + convertedTfms.Add(new TaskItem(targetFrameworkAlias, new Dictionary() { { MetadataKeys.DisplayName, displayName } })); } } diff --git a/test/Microsoft.NET.Build.Tasks.Tests/GivenThatWeWantToGenerateSupportedTargetFrameworkAlias.cs b/test/Microsoft.NET.Build.Tasks.Tests/GivenThatWeWantToGenerateSupportedTargetFrameworkAlias.cs index 901bc5ef0b49..db02c90e567b 100644 --- a/test/Microsoft.NET.Build.Tasks.Tests/GivenThatWeWantToGenerateSupportedTargetFrameworkAlias.cs +++ b/test/Microsoft.NET.Build.Tasks.Tests/GivenThatWeWantToGenerateSupportedTargetFrameworkAlias.cs @@ -92,7 +92,7 @@ public void It_generates_supported_target_framework_alias_items_when_using_wpf_o private void RunTask(string targetFrameworkMoniker, string targetPlatformMoniker, bool UseWpf, bool UseWindowsForms, List<(string, string)> expectedResult) { - Func, ITaskItem[]> convertToItems = (List<(string, string)> list) => list.Select(item => new TaskItem(item.Item1, new Dictionary() { { "DisplayName", item.Item2 } })).ToArray(); + Func, ITaskItem[]> convertToItems = (List<(string, string)> list) => list.Select(item => new TaskItem(item.Item1, new Dictionary() { { MetadataKeys.DisplayName, item.Item2 } })).ToArray(); var task = new GenerateSupportedTargetFrameworkAlias() {