Allow Cultures Within Names For EmbeddedResources

src/Tasks/AssignCulture.cs

@@ -133,7 +133,8 @@ public override bool Execute()
                     Culture.ItemCultureInfo info = Culture.GetItemCultureInfo
                         (
                             AssignedFiles[i].ItemSpec,
-                            dependentUpon
+                            dependentUpon,
+                            AssignedFiles[i].GetMetadata("WithCulture") == "false"
                         );
 
                     if (!string.IsNullOrEmpty(info.culture))

src/Tasks/CreateCSharpManifestResourceName.cs

@@ -39,9 +39,13 @@ Stream binaryStream
         )
         {
             string culture = null;
+            bool retainCultureInResourceName = false;
             if (fileName != null && itemSpecToTaskitem.TryGetValue(fileName, out ITaskItem item))
             {
                 culture = item.GetMetadata("Culture");
+                // If 'WithCulture' is explicitly set to false, keep the name of the resource even if it has a culture as part of its name.
+                // https://github.com/dotnet/msbuild/issues/3064
+                retainCultureInResourceName = item.GetMetadata("WithCulture") == "false";
             }
 
             /*
@@ -59,7 +63,8 @@ Stream binaryStream
                 dependentUponFileName,
                 culture,
                 binaryStream,
-                Log
+                Log,
+                retainCultureInResourceName
             );
         }
 
@@ -78,6 +83,7 @@ Stream binaryStream
         /// <param name="culture">The override culture of this resource, if any</param>
         /// <param name="binaryStream">File contents binary stream, may be null</param>
         /// <param name="log">Task's TaskLoggingHelper, for logging warnings or errors</param>
+        /// <param name="retainCultureInResourceName">Whether to treat the current file as 'culture-neutral'.</param>
         /// <returns>Returns the manifest name</returns>
         internal static string CreateManifestNameImpl
         (
@@ -88,7 +94,8 @@ internal static string CreateManifestNameImpl
             string dependentUponFileName, // May be null
             string culture, // may be null 
             Stream binaryStream, // File contents binary stream, may be null
-            TaskLoggingHelper log
+            TaskLoggingHelper log,
+            bool retainCultureInResourceName = false
         )
         {
             // Use the link file name if there is one, otherwise, fall back to file name.
@@ -99,7 +106,7 @@ TaskLoggingHelper log
             }
 
             dependentUponFileName = FileUtilities.FixFilePath(dependentUponFileName);
-            Culture.ItemCultureInfo info = Culture.GetItemCultureInfo(embeddedFileName, dependentUponFileName);
+            Culture.ItemCultureInfo info = Culture.GetItemCultureInfo(embeddedFileName, dependentUponFileName, retainCultureInResourceName);
 
             // If the item has a culture override, respect that. 
             if (!string.IsNullOrEmpty(culture))

src/Tasks/CreateVisualBasicManifestResourceName.cs

@@ -37,9 +37,13 @@ protected override string CreateManifestName
         )
         {
             string culture = null;
+            bool retainCultureInResourceName = false;
             if (fileName != null && itemSpecToTaskitem.TryGetValue(fileName, out ITaskItem item))
             {
                 culture = item.GetMetadata("Culture");
+                // If 'WithCulture' is explicitly set to false, keep the name of the resource even if it has a culture as part of its name.
+                // https://github.com/dotnet/msbuild/issues/3064
+                retainCultureInResourceName = item.GetMetadata("WithCulture") == "false";
             }
 
             /*
@@ -57,7 +61,8 @@ protected override string CreateManifestName
                 dependentUponFileName,
                 culture,
                 binaryStream,
-                Log
+                Log,
+                retainCultureInResourceName
             );
         }
 
@@ -76,6 +81,7 @@ protected override string CreateManifestName
         /// <param name="culture">The override culture of this resource, if any</param>
         /// <param name="binaryStream">File contents binary stream, may be null</param>
         /// <param name="log">Task's TaskLoggingHelper, for logging warnings or errors</param>
+        /// <param name="retainCultureInResourceName">Whether to treat the current file as 'culture-neutral'.</param>
         /// <returns>Returns the manifest name</returns>
         internal static string CreateManifestNameImpl
         (
@@ -86,7 +92,8 @@ internal static string CreateManifestNameImpl
             string dependentUponFileName, // May be null
             string culture,
             Stream binaryStream, // File contents binary stream, may be null
-            TaskLoggingHelper log
+            TaskLoggingHelper log,
+            bool retainCultureInResourceName = false
         )
         {
             // Use the link file name if there is one, otherwise, fall back to file name.
@@ -96,7 +103,7 @@ TaskLoggingHelper log
                 embeddedFileName = fileName;
             }
 
-            Culture.ItemCultureInfo info = Culture.GetItemCultureInfo(embeddedFileName, dependentUponFileName);
+            Culture.ItemCultureInfo info = Culture.GetItemCultureInfo(embeddedFileName, dependentUponFileName, retainCultureInResourceName);
 
             // If the item has a culture override, respect that. 
             if (!string.IsNullOrEmpty(culture))

src/Tasks/Culture.cs

@@ -29,7 +29,8 @@ internal struct ItemCultureInfo
         internal static ItemCultureInfo GetItemCultureInfo
         (
             string name,
-            string dependentUponFilename
+            string dependentUponFilename,
+            bool retainCultureInResourceName = false
         )
         {
             ItemCultureInfo info;
@@ -38,9 +39,11 @@ string dependentUponFilename
 
             if (String.Equals(Path.GetFileNameWithoutExtension(parentName),
                                    Path.GetFileNameWithoutExtension(name),
-                                   StringComparison.OrdinalIgnoreCase))
+                                   StringComparison.OrdinalIgnoreCase) ||
+                                   retainCultureInResourceName)
             {
-                // Dependent, but we treat it is as not localized because they have same base filename
+                // Dependent or explicitly using culture as part of the file name
+                // but we treat it is as not localized because they have same base filename
                 info.cultureNeutralFilename = name;
             }
             else

src/Tasks/Microsoft.Common.CurrentVersion.targets

@@ -2945,7 +2945,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <Type>Non-Resx</Type>
       </EmbeddedResource>
     </ItemGroup>
-
+    
     <AssignCulture Files="@(EmbeddedResource)" Condition="'%(Extension)'!='.licx'">
       <!-- Create the list of culture resx and embedded resource files -->
       <Output TaskParameter="AssignedFilesWithCulture" ItemName="_MixedResourceWithCulture"/>