Merge pull request #4178 from kotovaleksandr/rel/1.0.0

fix #4090
This commit is contained in:
Eric Erhardt 2016-09-15 10:57:56 -05:00 committed by GitHub
commit 95def6b243

View file

@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Tools.Resgen
using (var input = sourceFile.File.OpenRead())
{
var document = XDocument.Load(input);
var data = document.Root.Elements("data");
var data = document.Root.Elements("data").ToArray();
if (data.Any())
{
var rw = new ResourceWriter(outputStream);
@ -25,7 +25,8 @@ namespace Microsoft.DotNet.Tools.Resgen
foreach (var e in data)
{
var name = e.Attribute("name").Value;
var value = e.Element("value").Value;
var valueElement = e.Element("value");
var value = valueElement != null ? valueElement.Value : e.Value;
rw.AddResource(name, value);
}