Allow Cultures Within Names For EmbeddedResources

[benvillalobos]

Fixes #3064

Allows a workaround for those that want to embed resources that have cultures within their filenames.

The Workaround

Add the WithCulture metadata to your EmbeddedResource and set it to false.

<EmbeddedResource Include="a.cs.b" WithCulture="false"/>
<EmbeddedResource Include="light.sms.text" WithCulture="false" />
<EmbeddedResource Include="Resources.en.xml" WithCulture="false" />
<EmbeddedResource Include="some.cs.template" WithCulture="false" />

[Forgind]

Tests?

[drewnoakes]

@davkean is this related to dotnet/project-system#1553?

[Forgind]

I think the logic works now, thanks!

[Forgind]

Looks good

[benvillalobos]

NTS: CreateVisualBasicManifestResourceName_Tests.RootnamespaceWithCulture_RetainCultureInFileNamefails only on OSX mono for some reason?

Microsoft.Build.UnitTests.CreateVisualBasicManifestResourceName_Tests.RootnamespaceWithCulture_RetainCultureInFileName
Shouldly.ShouldAssertException : Shouldly uses your source code to generate its great error messages, build your test project with full debug information to get better error messages\nThe provided expression\n    should be\n\"RootNamespace.File.cs.cshtml\"\n    but was\n\"RootNamespace.Subfolder\\File.cs.cshtml\"\n    difference\nDifference     |       |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |        \n               |      \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/       \nIndex          | ...  14   15   16   17   18   19   20   21   22   23   24   25   26   27   28   29   30   31   32   33   34   ...  \nExpected Value | ...  F    i    l    e    .    c    s    .    c    s    h    t    m    l                                       ...  \nActual Value   | ...  S    u    b    f    o    l    d    e    r    \\    F    i    l    e    .    c    s    .    c    s    h    ...  \nExpected Code  | ...  70   105  108  101  46   99   115  46   99   115  104  116  109  108                                     ...  \nActual Code    | ...  83   117  98   102  111  108  100  101  114  92   70   105  108  101  46   99   115  46   99   115  104  ...  \n\nDifference     |       |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |   \n               |      \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \\|/  \nIndex          | ...  17   18   19   20   21   22   23   24   25   26   27   28   29   30   31   32   33   34   35   36   37   \nExpected Value | ...  e    .    c    s    .    c    s    h    t    m    l                                                      \nActual Value   | ...  f    o    l    d    e    r    \\    F    i    l    e    .    c    s    .    c    s    h    t    m    l    \nExpected Code  | ...  101  46   99   115  46   99   115  104  116  109  108                                                    \nActual Code    | ...  102  111  108  100  101  114  92   70   105  108  101  46   99   115  46   99   115  104  116  109  108  
  at Shouldly.ShouldBeStringTestExtensions.ExecuteAssertion (Shouldly.Internals.Assertions.IAssertion assertion, System.Func`1[TResult] customMessage) [0x0002b] in <cd631af7e9d7403ea1721c3ce03185bf>:0 
  at Shouldly.ShouldBeStringTestExtensions.ShouldBe (System.String actual, System.String expected, System.Func`1[TResult] customMessage, Shouldly.StringCompareShould options) [0x0000d] in <cd631af7e9d7403ea1721c3ce03185bf>:0 
  at Shouldly.ShouldBeStringTestExtensions.ShouldBe (System.String actual, System.String expected, Shouldly.StringCompareShould options) [0x00000] in <cd631af7e9d7403ea1721c3ce03185bf>:0 
  at Shouldly.ShouldBeStringTestExtensions.ShouldBe (System.String actual, System.String expected) [0x00000] in <cd631af7e9d7403ea1721c3ce03185bf>:0 
  at Microsoft.Build.UnitTests.CreateVisualBasicManifestResourceName_Tests.RootnamespaceWithCulture_RetainCultureInFileName () [0x00018] in <55cde099c8a64ebf88ba154dfeaee7ad>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <ba70b91736bd40cb990a357097dba9c3>:0 

should be\n\"RootNamespace.File.cs.cshtml\"\n but was\n\"RootNamespace.Subfolder\\File.cs.cshtml\"

---

mono works on linux. install in WSL and try it there.

run tests on master to make sure things are fine.

find something that explicitly on mono and fails on everything else and enable it, just to check

[Forgind]

Are you handling slashes correctly on non-Windows?

[benvillalobos]

@Forgind I believe that's handled before it gets to these functions.

This PR had a failing test because we called the API directly without fixing the file path that included a subfolder. So the options were either to remove the subfolder or fix the file path before the call. There was another function in the visual basic tests that called FixFilePath. so I could have done that. Ultimately, the subfolder wasn't a relevant part of the test so I removed it.