diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs b/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs index 549f912e1a..2aa3dac0e0 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs +++ b/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs @@ -34,7 +34,10 @@ namespace Microsoft.Framework.WebEncoders private static uint[] CreateDefinedCharacterBitmap() { // The stream should be exactly 8KB in size. - var stream = typeof(UnicodeHelpers).GetTypeInfo().Assembly.GetManifestResourceStream("compiler/resources/unicode-7.0.0-defined-characters.bin"); + var assembly = typeof(UnicodeHelpers).GetTypeInfo().Assembly; + var resourceName = assembly.GetName().Name + ".compiler.resources.unicode-7.0.0-defined-characters.bin"; + + var stream = assembly.GetManifestResourceStream(resourceName); if (stream.Length != 8 * 1024) { Environment.FailFast("Corrupt data detected."); diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs b/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs index 6be7c93bbc..4d34a40e96 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs +++ b/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs @@ -157,7 +157,10 @@ namespace Microsoft.Framework.WebEncoders HashSet seenCategories = new HashSet(); bool[] retVal = new bool[0x10000]; - string[] allLines = new StreamReader(typeof(UnicodeHelpersTests).GetTypeInfo().Assembly.GetManifestResourceStream("../../unicode/UnicodeData.txt")).ReadAllLines(); + + var assembly = typeof(UnicodeHelpersTests).GetTypeInfo().Assembly; + var resourceName = assembly.GetName().Name + ".UnicodeData.txt"; + string[] allLines = new StreamReader(assembly.GetManifestResourceStream(resourceName)).ReadAllLines(); foreach (string line in allLines) {