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

Migrate dotnet-pack

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-03-10 01:11:16 -08:00
parent 4912e4aa6c
commit 120d28a78d
2 changed files with 43 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
src/dotnet/commands/dotnet-pack/PackCommand.cs
View file

@ -19,112 +19,26 @@ namespace Microsoft.DotNet.Tools.Pack
public static PackCommand FromArgs(string[] args, string msbuildPath = null)
{
DebugHelper.HandleDebugSwitch(ref args);
var msbuildArgs = new List<string>();
CommandLineApplication cmd = new CommandLineApplication(throwOnUnexpectedArg: false)
var parser = Parser.Instance;
var result = parser.ParseFrom("dotnet pack", args);
Reporter.Output.WriteLine(result.Diagram());
result.ShowHelpIfRequested();
var parsedPack = result["dotnet"]["pack"];
var msbuildArgs = new List<string>()
{
Name = "pack",
FullName = LocalizableStrings.AppFullName,
Description = LocalizableStrings.AppDescription,
HandleRemainingArguments = true,
ArgumentSeparatorHelpText = HelpMessageStrings.MSBuildAdditionalArgsHelpText
"/t:pack"
};
cmd.HelpOption("-h|--help");
msbuildArgs.AddRange(parsedPack.OptionValuesToBeForwarded());
var output = cmd.Option(
$"-o|--output <{LocalizableStrings.CmdOutputDir}>",
LocalizableStrings.CmdOutputDirDescription,
CommandOptionType.SingleValue);
var noBuild = cmd.Option(
"--no-build",
LocalizableStrings.CmdNoBuildOptionDescription,
CommandOptionType.NoValue);
var includeSymbols = cmd.Option(
"--include-symbols",
LocalizableStrings.CmdIncludeSymbolsDescription,
CommandOptionType.NoValue);
var includeSource = cmd.Option(
"--include-source",
LocalizableStrings.CmdIncludeSourceDescription,
CommandOptionType.NoValue);
var configuration = cmd.Option(
$"-c|--configuration <{LocalizableStrings.CmdConfig}>",
LocalizableStrings.CmdConfigDescription,
CommandOptionType.SingleValue);
var versionSuffix = cmd.Option(
$"--version-suffix <{LocalizableStrings.CmdVersionSuffix}>",
LocalizableStrings.CmdVersionSuffixDescription,
CommandOptionType.SingleValue);
var serviceable = cmd.Option(
"-s|--serviceable",
LocalizableStrings.CmdServiceableDescription,
CommandOptionType.NoValue);
var argRoot = cmd.Argument(
$"<{LocalizableStrings.CmdArgumentProject}>",
LocalizableStrings.CmdArgumentDescription,
multipleValues:true);
CommandOption verbosityOption = AddVerbosityOption(cmd);
List<string> msbuildArgs = null;
cmd.OnExecute(() =>
{
msbuildArgs = new List<string>()
{
"/t:pack"
};
if (noBuild.HasValue())
{
msbuildArgs.Add($"/p:NoBuild=true");
}
if (includeSymbols.HasValue())
{
msbuildArgs.Add($"/p:IncludeSymbols=true");
}
if (includeSource.HasValue())
{
msbuildArgs.Add($"/p:IncludeSource=true");
}
if (output.HasValue())
{
msbuildArgs.Add($"/p:PackageOutputPath={output.Value()}");
}
if (configuration.HasValue())
{
msbuildArgs.Add($"/p:Configuration={configuration.Value()}");
}
if (versionSuffix.HasValue())
{
msbuildArgs.Add($"/p:VersionSuffix={versionSuffix.Value()}");
}
if (serviceable.HasValue())
{
msbuildArgs.Add($"/p:Serviceable=true");
}
if (verbosityOption.HasValue())
{
msbuildArgs.Add($"/verbosity:{verbosityOption.Value()}");
}
msbuildArgs.AddRange(argRoot.Values);
msbuildArgs.AddRange(cmd.RemainingArguments);
return 0;
});
int exitCode = cmd.Execute(args);
if (msbuildArgs == null)
{
throw new CommandCreationException(exitCode);
}
msbuildArgs.AddRange(parsedPack.Arguments);
return new PackCommand(msbuildArgs, msbuildPath);
}

54
src/dotnet/commands/dotnet-pack/PackCommandParser.cs
View file

@ -1,38 +1,40 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Linq;
using Microsoft.DotNet.Cli.CommandLine;
using LocalizableStrings = Microsoft.DotNet.Tools.Pack.LocalizableStrings;
namespace Microsoft.DotNet.Cli
{
internal static class PackCommandParser
{
public static Command Pack() =>
Create.Command("pack",
".NET Core NuGet Package Packer",
CommonOptions.HelpOption(),
Create.Option("-o|--output",
"Directory in which to place built packages.",
Accept.ExactlyOneArgument
.With(name: "OUTPUT_DIR")),
Create.Option("--no-build",
"Skip building the project prior to packing. By default, the project will be built."),
Create.Option("--include-symbols",
"Include packages with symbols in addition to regular packages in output directory."),
Create.Option("--include-source",
"Include PDBs and source files. Source files go into the src folder in the resulting nuget package"),
Create.Option("-c|--configuration",
"Configuration to use for building the project. Default for most projects is \"Debug\".",
Accept.ExactlyOneArgument
.With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG",
"RELEASE")),
Create.Option("--version-suffix",
"Defines the value for the $(VersionSuffix) property in the project.",
Accept.ExactlyOneArgument
.With(name: "VERSION_SUFFIX")),
Create.Option("-s|--serviceable",
"Set the serviceable flag in the package. For more information, please see https://aka.ms/nupkgservicing."),
CommonOptions.VerbosityOption());
Create.Command(
"pack",
LocalizableStrings.AppDescription,
Accept.ZeroOrMoreArguments,
CommonOptions.HelpOption(),
Create.Option(
"-o|--output",
LocalizableStrings.CmdOutputDirDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAs(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
Create.Option("--no-build",
LocalizableStrings.CmdNoBuildOptionDescription,
Accept.NoArguments.ForwardAs("/p:NoBuild=true")),
Create.Option("--include-symbols",
LocalizableStrings.CmdIncludeSymbolsDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSymbols=true")),
Create.Option("--include-source",
LocalizableStrings.CmdIncludeSourceDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSource=true")),
CommonOptions.ConfigurationOption(),
CommonOptions.VersionSuffixOption(),
Create.Option("-s|--serviceable",
LocalizableStrings.CmdServiceableDescription,
Accept.NoArguments.ForwardAs("/p:Serviceable=true")),
CommonOptions.VerbosityOption());
}
}