|
@@ -1,4 +1,4 @@
|
|
|
-// Licensed to the .NET Foundation under one or more agreements.
|
|
|
|
|
|
|
+// Licensed to the .NET Foundation under one or more agreements.
|
|
|
// The .NET Foundation licenses this file to you under the MIT license.
|
|
// The .NET Foundation licenses this file to you under the MIT license.
|
|
|
|
|
|
|
|
using System;
|
|
using System;
|
|
@@ -90,11 +90,11 @@ public class GenerateEmbeddedResourcesManifest : Microsoft.Build.Utilities.Task
|
|
|
return manifest;
|
|
return manifest;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private static string GetManifestPath(ITaskItem taskItem) => string.Equals(taskItem.GetMetadata(LogicalName), taskItem.GetMetadata(ManifestResourceName)) ?
|
|
|
|
|
|
|
+ private static string GetManifestPath(ITaskItem taskItem) => string.IsNullOrEmpty(taskItem.GetMetadata(LogicalName)) || string.Equals(taskItem.GetMetadata(LogicalName), taskItem.GetMetadata(ManifestResourceName)) ?
|
|
|
taskItem.GetMetadata(TargetPath) :
|
|
taskItem.GetMetadata(TargetPath) :
|
|
|
NormalizePath(taskItem.GetMetadata(LogicalName));
|
|
NormalizePath(taskItem.GetMetadata(LogicalName));
|
|
|
|
|
|
|
|
- private static string GetAssemblyResourceName(ITaskItem taskItem) => string.Equals(taskItem.GetMetadata(LogicalName), taskItem.GetMetadata(ManifestResourceName)) ?
|
|
|
|
|
|
|
+ private static string GetAssemblyResourceName(ITaskItem taskItem) => string.IsNullOrEmpty(taskItem.GetMetadata(LogicalName)) || string.Equals(taskItem.GetMetadata(LogicalName), taskItem.GetMetadata(ManifestResourceName)) ?
|
|
|
taskItem.GetMetadata(ManifestResourceName) :
|
|
taskItem.GetMetadata(ManifestResourceName) :
|
|
|
taskItem.GetMetadata(LogicalName);
|
|
taskItem.GetMetadata(LogicalName);
|
|
|
|
|
|