mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ResourceWriter requires that AddResource be called at least one before generate. However, when we have an empty resx, AddResource does not get called which causes resgen to crash when ResourceWriter.Generate gets called.

Browse source
This commit is contained in:
Livar Cunha 2015-11-16 17:02:04 -08:00
parent b5fabb9d7d
commit 1e357a2e03
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Microsoft.DotNet.Tools.Resgen/Program.cs
View file

@ -1,7 +1,9 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Resources;
using System.Xml.Linq;
using Microsoft.Dnx.Runtime.Common.CommandLine;
@ -26,32 +28,42 @@ namespace Microsoft.DotNet.Tools.Resgen
app.OnExecute(() =>
{
WriteResourcesFile(inputFile.Value, outputFile.Value);
WriteResourcesFileIfNotEmpty(inputFile.Value, outputFile.Value);
return 0;
});
return app.Execute(args);
}
private static void WriteResourcesFile(string resxFilePath, string outputFile)
private static void WriteResourcesFileIfNotEmpty(string resxFilePath, string outputFile)
{
using (var fs = File.OpenRead(resxFilePath))
using (var outfs = File.Create(outputFile))
{
var document = XDocument.Load(fs);
var rw = new ResourceWriter(outfs);
var data = document.Root.Elements("data");
foreach (var e in document.Root.Elements("data"))
if (data.Any())
{
string name = e.Attribute("name").Value;
string value = e.Element("value").Value;
rw.AddResource(name, value);
WriteResourcesFile(outfs, data);
}
rw.Generate();
}
}
private static void WriteResourcesFile(Stream outfs, IEnumerable<XElement> data)
{
var rw = new ResourceWriter(outfs);
foreach (var e in data)
{
var name = e.Attribute("name").Value;
var value = e.Element("value").Value;
rw.AddResource(name, value);
}
rw.Generate();
}
}
}