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

Merge pull request #1160 from agocke/infer-analyzer-lang-id

Browse source 
Infer the analyzer languageId from compilerName
This commit is contained in:
Andy Gocke 2016-02-02 15:03:10 -08:00
commit 5e0329f417
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/dotnet/commands/dotnet-compile/CompilerUtil.cs
View file

@ -26,12 +26,29 @@ namespace Microsoft.DotNet.Tools.Compiler
return compilerName; return compilerName;
} }
private static readonly KeyValuePair<string, string>[] s_compilerNameToLanguageId =
{
new KeyValuePair<string, string>("csc", "cs"),
new KeyValuePair<string, string>("vbc", "vb"),
new KeyValuePair<string, string>("fsc", "fs")
};
public static string ResolveLanguageId(ProjectContext context) public static string ResolveLanguageId(ProjectContext context)
{ {
var languageId = context.ProjectFile.AnalyzerOptions?.LanguageId; var languageId = context.ProjectFile.AnalyzerOptions?.LanguageId;
languageId = languageId ?? "cs"; if (languageId == null)
{
var compilerName = ResolveCompilerName(context);
foreach (var kvp in s_compilerNameToLanguageId)
{
if (kvp.Key == compilerName)
{
languageId = kvp.Value;
}
}
}
return languageId; return languageId;
} }