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

Remove compiler name autodetection

Browse source 
Also add compilerName: csc to every project.json to compensate.
This commit is contained in:
Andy Gocke 2015-10-25 23:37:41 -07:00
parent 2ccecbf78e
commit 72665a4f9f
8 changed files with 9 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -191,9 +191,9 @@ namespace Microsoft.DotNet.Tools.Compiler
}
var compilerName = context.ProjectFile.CompilerName;
if (compilerName == null && !TryDetectCompilerName(sourceFiles, out compilerName))
if (compilerName == null)
{
Console.Error.WriteLine("Could not detect the compiler name. Please specify it in the project.json file.");
Console.Error.WriteLine("Could not find the compiler name. Please specify it in the project.json file.");
return false;
}
@ -242,55 +242,6 @@ namespace Microsoft.DotNet.Tools.Compiler
return success;
}
private static readonly KeyValuePair<string, string>[] s_compilerNameLookupTable =
{
new KeyValuePair<string, string>(".cs", "csc"),
new KeyValuePair<string, string>(".vb", "vbc"),
new KeyValuePair<string, string>(".fs", "fsc")
};
/// <summary>
/// Uses the extension on the source files to try to detect the
/// compiler. If the source files have different extensions or the
/// extension is not recognized, returns false.
/// </summary>
private static bool TryDetectCompilerName(IEnumerable<string> sourceFiles, out string compilerName)
{
compilerName = null;
string extension = null;
foreach (var file in sourceFiles)
{
if (!Path.HasExtension(file))
{
return false;
}
var tmpExtension = Path.GetExtension(file);
extension = extension ?? tmpExtension;
if (extension != tmpExtension)
{
return false;
}
}
if (extension == null)
{
return false;
}
foreach (var kvp in s_compilerNameLookupTable)
{
if (extension == kvp.Key)
{
compilerName = kvp.Value;
return true;
}
}
return false;
}
private static void PrintSummary(List<DiagnosticMessage> diagnostics)
{
Reporter.Output.Writer.WriteLine();