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

Opt in support for including subdirectories from nuget depdencies in

Browse source 
publish output.
This commit is contained in:
Bryan 2015-12-09 12:37:21 -08:00 • committed by Bryan Thornbury
parent f8d79624c0
commit bcf9392c40
1 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/Microsoft.DotNet.Tools.Publish/Program.cs
View file

@ -26,6 +26,7 @@ namespace Microsoft.DotNet.Tools.Publish
var output = app.Option("-o|--output <OUTPUT_PATH>", "Path in which to publish the app", CommandOptionType.SingleValue); var output = app.Option("-o|--output <OUTPUT_PATH>", "Path in which to publish the app", CommandOptionType.SingleValue);
var configuration = app.Option("-c|--configuration <CONFIGURATION>", "Configuration under which to build", CommandOptionType.SingleValue); var configuration = app.Option("-c|--configuration <CONFIGURATION>", "Configuration under which to build", CommandOptionType.SingleValue);
var projectPath = app.Argument("<PROJECT>", "The project to publish, defaults to the current directory. Can be a path to a project.json or a project directory"); var projectPath = app.Argument("<PROJECT>", "The project to publish, defaults to the current directory. Can be a path to a project.json or a project directory");
var subdirectories = app.Option("--subdir", "Include Subdirectories in native assets in the output", CommandOptionType.NoValue);
app.OnExecute(() => app.OnExecute(() =>
{ {
@ -107,7 +108,7 @@ namespace Microsoft.DotNet.Tools.Publish
/// <param name="outputPath">Location of published files</param> /// <param name="outputPath">Location of published files</param>
/// <param name="configuration">Debug or Release</param> /// <param name="configuration">Debug or Release</param>
/// <returns>Return 0 if successful else return non-zero</returns> /// <returns>Return 0 if successful else return non-zero</returns>
private static int Publish(ProjectContext context, string outputPath, string configuration) private static int Publish(ProjectContext context, string outputPath, string configuration, bool subdirectories)
{ {
Reporter.Output.WriteLine($"Publishing {context.RootProject.Identity.Name.Yellow()} for {context.TargetFramework.DotNetFrameworkName.Yellow()}/{context.RuntimeIdentifier.Yellow()}"); Reporter.Output.WriteLine($"Publishing {context.RootProject.Identity.Name.Yellow()} for {context.TargetFramework.DotNetFrameworkName.Yellow()}/{context.RuntimeIdentifier.Yellow()}");
@ -158,8 +159,8 @@ namespace Microsoft.DotNet.Tools.Publish
Reporter.Verbose.WriteLine($"Publishing {export.Library.Identity.ToString().Green().Bold()} ..."); Reporter.Verbose.WriteLine($"Publishing {export.Library.Identity.ToString().Green().Bold()} ...");
PublishFiles(export.RuntimeAssemblies, outputPath); PublishFiles(export.RuntimeAssemblies, outputPath, false);
PublishFiles(export.NativeLibraries, outputPath); PublishFiles(export.NativeLibraries, outputPath, subdirectories);
} }
// Publish a host if this is an application // Publish a host if this is an application
@ -199,13 +200,44 @@ namespace Microsoft.DotNet.Tools.Publish
{ {
foreach (var file in files) foreach (var file in files)
{ {
var copyDir = subdirectories ? Path.Combine(outputPath, Path.GetDirectoryName(copyPath)) : outputPath; var destinationDirectory = outputPath;
if (!Directory.Exists(copyDir))
if (subdirectories)
{ {
Directory.CreateDirectory(copyDir); destinationDirectory = Path.Combine(outputPath, GetNativeRelativeSubdirectory(file.RelativePath));
} }
File.Copy(path, Path.Combine(copyDir, Path.GetFileName(file.ResolvedPath)), overwrite: true);
if (!Directory.Exists(destinationDirectory))
{
Directory.CreateDirectory(destinationDirectory);
}
File.Copy(file.ResolvedPath, Path.Combine(destinationDirectory, Path.GetFileName(file.ResolvedPath)), overwrite: true);
} }
} }
private static string GetNativeRelativeSubdirectory(string filepath)
{
string directoryPath = Path.GetDirectoryName(filepath);
string[] parts = directoryPath.Split(new string[] { "native" }, 2, StringSplitOptions.None);
if (parts.Length != 2)
{
throw new UnrecognizedNativeDirectoryFormat() { FailedPath = filepath };
}
string candidate = parts[1];
candidate = candidate.TrimStart(new char[] { '/', '\\' });
return candidate;
}
private class UnrecognizedNativeDirectoryFormat : Exception
{
public string FailedPath { get; set; }
}
} }
} }