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

Escape assembly info properties

Browse source
This commit is contained in:
Pavel Krymets 2015-12-15 14:49:45 -08:00
parent 8f228f446a
commit bb94f6046b
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Microsoft.DotNet.Compiler.Common/AssemblyInfoOptions.cs
View file

@ -67,21 +67,21 @@ namespace Microsoft.Dotnet.Cli.Compiler.Common
string culture = null;
string neutralCulture = null;
syntax.DefineOption(AssemblyVersionOptionName, ref version, "Assembly version");
syntax.DefineOption(AssemblyVersionOptionName, ref version, UnescapeNewlines, "Assembly version");
syntax.DefineOption(TitleOptionName, ref title, "Assembly title");
syntax.DefineOption(TitleOptionName, ref title, UnescapeNewlines, "Assembly title");
syntax.DefineOption(DescriptionOptionName, ref description, "Assembly description");
syntax.DefineOption(DescriptionOptionName, ref description, UnescapeNewlines, "Assembly description");
syntax.DefineOption(CopyrightOptionName, ref copyright, "Assembly copyright");
syntax.DefineOption(CopyrightOptionName, ref copyright, UnescapeNewlines, "Assembly copyright");
syntax.DefineOption(NeutralCultureOptionName, ref neutralCulture, "Assembly neutral culture");
syntax.DefineOption(NeutralCultureOptionName, ref neutralCulture, UnescapeNewlines, "Assembly neutral culture");
syntax.DefineOption(CultureOptionName, ref culture, "Assembly culture");
syntax.DefineOption(CultureOptionName, ref culture, UnescapeNewlines, "Assembly culture");
syntax.DefineOption(InformationalVersionOptionName, ref informationalVersion, "Assembly informational version");
syntax.DefineOption(InformationalVersionOptionName, ref informationalVersion, UnescapeNewlines, "Assembly informational version");
syntax.DefineOption(AssemblyFileVersionOptionName, ref fileVersion, "Assembly title");
syntax.DefineOption(AssemblyFileVersionOptionName, ref fileVersion, UnescapeNewlines, "Assembly title");
return new AssemblyInfoOptions()
{
@ -137,7 +137,16 @@ namespace Microsoft.Dotnet.Cli.Compiler.Common
private static string FormatOption(string optionName, string value)
{
return $"--{optionName}:{value}";
return $"--{optionName}:{EscapeNewlines(value)}";
}
private static string UnescapeNewlines(string text)
{
return text.Replace("\\r", "\r").Replace("\\n", "\n");
}
private static string EscapeNewlines(string text)
{
return text.Replace("\r", "\\r").Replace("\n", "\\n");
}
}
}