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

Fixes #1280

Browse source 
PR Feedback for resgen tests

don't trim

update use-dev for win10

additional product changes

More fixes

fix

fix resgen
This commit is contained in:
Bryan Thornbury 2016-02-16 10:57:11 -08:00
commit ccce495737
6 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/dotnet/commands/dotnet-resgen/ResgenCommand.cs
View file

@ -19,8 +19,14 @@ namespace Microsoft.DotNet.Tools.Resgen
public int Execute()
{
var intputResourceFiles = Args.Select(ParseInputFile).ToArray();
var outputResourceFile = ResourceFile.Create(OutputFileName);
var inputResourceFiles = Args.Select(ParseInputFile).ToArray();
var outputResourceFile = ResourceFile.Create(OutputFileName.Trim('"'));
var trimmedCompilationReferences = default(string[]);
if (CompilationReferences != null)
{
trimmedCompilationReferences = CompilationReferences.Select(r => r.Trim('"')).ToArray();
}
switch (outputResourceFile.Type)
{
@ -33,22 +39,23 @@ namespace Microsoft.DotNet.Tools.Resgen
AssemblyVersion = AssemblyVersion,
};
ResourceAssemblyGenerator.Generate(intputResourceFiles,
ResourceAssemblyGenerator.Generate(inputResourceFiles,
outputStream,
metadata,
Path.GetFileNameWithoutExtension(outputResourceFile.File.Name),
CompilationReferences.ToArray());
trimmedCompilationReferences
);
}
break;
case ResourceFileType.Resources:
using (var outputStream = outputResourceFile.File.Create())
{
if (intputResourceFiles.Length > 1)
if (inputResourceFiles.Length > 1)
{
Reporter.Error.WriteLine("Only one input file required when generating .resource output");
return 1;
}
ResourcesFileGenerator.Generate(intputResourceFiles.Single().Resource, outputStream);
ResourcesFileGenerator.Generate(inputResourceFiles.Single().Resource, outputStream);
}
break;
default:
@ -61,13 +68,13 @@ namespace Microsoft.DotNet.Tools.Resgen
private static ResourceSource ParseInputFile(string arg)
{
var seperatorIndex = arg.IndexOf(',');
var separatorIndex = arg.IndexOf(',');
string name;
string metadataName;
if (seperatorIndex > 0)
if (separatorIndex > 0)
{
name = arg.Substring(0, seperatorIndex);
metadataName = arg.Substring(seperatorIndex + 1);
name = arg.Substring(0, separatorIndex);
metadataName = arg.Substring(separatorIndex + 1);
}
else
{
@ -75,6 +82,10 @@ namespace Microsoft.DotNet.Tools.Resgen
metadataName = arg;
}
// Remove surrounding quotes
name = name.Trim('"');
metadataName = metadataName.Trim('"');
return new ResourceSource(ResourceFile.Create(name), metadataName);
}
}