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

package up DNX in the tar.gz

Browse source 
includes a smoke test for verifying that the output can be used to build
also includes a checked-in CoreCLR in order to work around CoreCLR issue
This commit is contained in:
Andrew Stanton-Nurse 2015-10-21 15:21:14 -07:00
commit 1d76b2846c
45 changed files with 347 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,8 +84,6 @@ namespace Microsoft.DotNet.Tools.Compiler
var diagnostics = new List<DiagnosticMessage>();
bool success = true;
// Collect dependency diagnostics
diagnostics.AddRange(context.LibraryManager.GetAllDiagnostics());
@ -145,16 +143,19 @@ namespace Microsoft.DotNet.Tools.Compiler
configuration,
context.TargetFramework.GetTwoDigitShortFolderName());
if (!Directory.Exists(outputPath))
if (Directory.Exists(outputPath))
{
Directory.CreateDirectory(outputPath);
Directory.Delete(outputPath, recursive: true);
}
if (!Directory.Exists(intermediateOutputPath))
if (Directory.Exists(intermediateOutputPath))
{
Directory.CreateDirectory(intermediateOutputPath);
Directory.Delete(intermediateOutputPath, recursive: true);
}
Directory.CreateDirectory(outputPath);
Directory.CreateDirectory(intermediateOutputPath);
// Get compilation options
var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, configuration);
var outputName = Path.Combine(outputPath, context.ProjectFile.Name + (compilationOptions.EmitEntryPoint.GetValueOrDefault() ? ".exe" : ".dll"));
@ -227,18 +228,17 @@ namespace Microsoft.DotNet.Tools.Compiler
foreach (var diag in diagnostics)
{
success &= diag.Severity != DiagnosticMessageSeverity.Error;
PrintDiagnostic(diag);
}
success &= result.ExitCode == 0;
PrintSummary(diagnostics);
var success = result.ExitCode == 0;
PrintSummary(success, diagnostics);
return success;
}
private static void PrintSummary(List<DiagnosticMessage> diagnostics)
private static void PrintSummary(bool success, List<DiagnosticMessage> diagnostics)
{
Reporter.Output.Writer.WriteLine();

13
src/Microsoft.DotNet.Tools.Compiler/project.json
View file

@ -8,14 +8,13 @@
"dotnet-compile": "Microsoft.DotNet.Tools.Compiler"
},
"dependencies": {
"Microsoft.NETCore.TestHost": "1.0.0-*",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23420",
"System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-beta-23419",
"System.IO.FileSystem": "4.0.1-beta-23419",
"System.Console": "4.0.0-beta-23420",
"System.Collections": "4.0.11-beta-23420",
"System.Linq": "4.0.1-beta-23420",
"System.Diagnostics.Process": "4.1.0-beta-23420",
"System.IO.FileSystem": "4.0.1-beta-23420",
"Microsoft.Extensions.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",