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

Copy dependencies on compile for desktop targets

Browse source
This commit is contained in:
David Fowler 2015-11-01 02:04:26 -08:00
parent 30f8e6fa4c
commit 8a32f5ece9
1 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -244,10 +244,13 @@ namespace Microsoft.DotNet.Tools.Compiler
var success = result.ExitCode == 0; var success = result.ExitCode == 0;
if (success && !context.TargetFramework.IsDesktop() && compilationOptions.EmitEntryPoint.GetValueOrDefault()) if (success && compilationOptions.EmitEntryPoint.GetValueOrDefault())
{ {
var runtimeContext = ProjectContext.Create(context.ProjectDirectory, context.TargetFramework, new [] { RuntimeIdentifier.Current }); var runtimeContext = ProjectContext.Create(context.ProjectDirectory, context.TargetFramework, new[] { RuntimeIdentifier.Current });
EmitHost(outputPath, context.ProjectFile.Name, runtimeContext.CreateExporter(configuration)); MakeRunnable(runtimeContext,
outputPath,
context.ProjectFile.Name,
runtimeContext.CreateExporter(configuration));
} }
PrintSummary(success, diagnostics); PrintSummary(success, diagnostics);
@ -325,10 +328,32 @@ namespace Microsoft.DotNet.Tools.Compiler
Directory.CreateDirectory(path); Directory.CreateDirectory(path);
} }
private static void MakeRunnable(ProjectContext runtimeContext, string outputPath, string projectName, LibraryExporter exporter)
{
if (runtimeContext.TargetFramework.IsDesktop())
{
// On desktop we need to copy dependencies since we don't own the host
foreach (var export in exporter.GetAllExports())
{
if (export.Library == runtimeContext.RootProject)
{
continue;
}
CopyFiles(export.RuntimeAssemblies, outputPath);
CopyFiles(export.NativeLibraries, outputPath);
}
}
else
{
EmitHost(outputPath, projectName, exporter);
}
}
private static void EmitHost(string outputPath, string projectName, LibraryExporter exporter) private static void EmitHost(string outputPath, string projectName, LibraryExporter exporter)
{ {
// Write the Host information file (basically a simplified form of the lock file) // Write the Host information file (basically a simplified form of the lock file)
List<string> lines = new List<string>(); var lines = new List<string>();
foreach(var export in exporter.GetAllExports()) foreach(var export in exporter.GetAllExports())
{ {
lines.AddRange(GenerateLines(export, export.RuntimeAssemblies, "runtime")); lines.AddRange(GenerateLines(export, export.RuntimeAssemblies, "runtime"));
@ -587,5 +612,13 @@ namespace Microsoft.DotNet.Tools.Compiler
} }
} }
} }
private static void CopyFiles(IEnumerable<LibraryAsset> files, string outputPath)
{
foreach (var file in files)
{
File.Copy(file.ResolvedPath, Path.Combine(outputPath, Path.GetFileName(file.ResolvedPath)), overwrite: true);
}
}
} }
} }