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

Remove mono bootstrapping logic

Browse source
This commit is contained in:
David Fowler 2015-10-21 01:18:14 -07:00
parent 7191080caf
commit c1e2d152e3
1 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,8 +160,6 @@ namespace Microsoft.DotNet.Tools.Compiler
var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, configuration); var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, configuration);
var outputName = Path.Combine(outputPath, context.ProjectFile.Name + (compilationOptions.EmitEntryPoint.GetValueOrDefault() ? ".exe" : ".dll")); var outputName = Path.Combine(outputPath, context.ProjectFile.Name + (compilationOptions.EmitEntryPoint.GetValueOrDefault() ? ".exe" : ".dll"));
var bootstrappingWithMono = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BOOTSTRAPPING_WITH_MONO"));
// Assemble args // Assemble args
var compilerArgs = new List<string>() var compilerArgs = new List<string>()
{ {
@ -170,16 +168,13 @@ namespace Microsoft.DotNet.Tools.Compiler
$"-out:\"{outputName}\"" $"-out:\"{outputName}\""
}; };
if (!bootstrappingWithMono)
{
// Default suppressions, some versions of mono don't support these // Default suppressions, some versions of mono don't support these
compilerArgs.Add("-nowarn:CS1701"); compilerArgs.Add("-nowarn:CS1701");
compilerArgs.Add("-nowarn:CS1702"); compilerArgs.Add("-nowarn:CS1702");
compilerArgs.Add("-nowarn:CS1705"); compilerArgs.Add("-nowarn:CS1705");
}
// Add compilation options to the args // Add compilation options to the args
ApplyCompilationOptions(compilationOptions, compilerArgs, bootstrappingWithMono); ApplyCompilationOptions(compilationOptions, compilerArgs);
foreach (var dependency in dependencies) foreach (var dependency in dependencies)
{ {
@ -393,52 +388,51 @@ namespace Microsoft.DotNet.Tools.Compiler
} }
} }
private static void ApplyCompilationOptions(CompilerOptions compilationOptions, List<string> cscArgs, bool bootstrappingWithMono) private static void ApplyCompilationOptions(CompilerOptions compilationOptions, List<string> compilerArgs)
{ {
// TODO: Move compilation arguments into the compiler itself
var targetType = compilationOptions.EmitEntryPoint.GetValueOrDefault() ? "exe" : "library"; var targetType = compilationOptions.EmitEntryPoint.GetValueOrDefault() ? "exe" : "library";
cscArgs.Add($"-target:{targetType}"); compilerArgs.Add($"-target:{targetType}");
if (compilationOptions.AllowUnsafe.GetValueOrDefault()) if (compilationOptions.AllowUnsafe.GetValueOrDefault())
{ {
cscArgs.Add("-unsafe+"); compilerArgs.Add("-unsafe+");
} }
cscArgs.AddRange(compilationOptions.Defines.Select(d => $"-d:{d}")); compilerArgs.AddRange(compilationOptions.Defines.Select(d => $"-d:{d}"));
if (compilationOptions.Optimize.GetValueOrDefault()) if (compilationOptions.Optimize.GetValueOrDefault())
{ {
cscArgs.Add("-optimize"); compilerArgs.Add("-optimize");
} }
if (!string.IsNullOrEmpty(compilationOptions.Platform)) if (!string.IsNullOrEmpty(compilationOptions.Platform))
{ {
cscArgs.Add($"-platform:{compilationOptions.Platform}"); compilerArgs.Add($"-platform:{compilationOptions.Platform}");
} }
if (compilationOptions.WarningsAsErrors.GetValueOrDefault()) if (compilationOptions.WarningsAsErrors.GetValueOrDefault())
{ {
cscArgs.Add("-warnaserror"); compilerArgs.Add("-warnaserror");
} }
if (compilationOptions.DelaySign.GetValueOrDefault()) if (compilationOptions.DelaySign.GetValueOrDefault())
{ {
cscArgs.Add("-delaysign+"); compilerArgs.Add("-delaysign+");
} }
if (!string.IsNullOrEmpty(compilationOptions.KeyFile)) if (!string.IsNullOrEmpty(compilationOptions.KeyFile))
{ {
cscArgs.Add($"-keyFile:\"{compilationOptions.KeyFile}\""); compilerArgs.Add($"-keyFile:\"{compilationOptions.KeyFile}\"");
} }
if (bootstrappingWithMono || RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
cscArgs.Add("-debug:full"); compilerArgs.Add("-debug:full");
} }
else else
{ {
cscArgs.Add("-debug:portable"); compilerArgs.Add("-debug:portable");
} }
// TODO: OSS signing // TODO: OSS signing