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

remove parameterless constructor

Browse source
This commit is contained in:
Krzysztof Wicher 2017-02-16 14:18:23 -08:00
parent 6f1ea62bc9
commit ae05e8af1d
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/dotnet/commands/dotnet-build/Program.cs
View file

@ -15,8 +15,6 @@ namespace Microsoft.DotNet.Tools.Build
{ {
private MSBuildForwardingApp _forwardingApp; private MSBuildForwardingApp _forwardingApp;
private BuildCommand() { }
public BuildCommand(IEnumerable<string> msbuildArgs, string msbuildPath = null) public BuildCommand(IEnumerable<string> msbuildArgs, string msbuildPath = null)
{ {
_forwardingApp = new MSBuildForwardingApp(msbuildArgs, msbuildPath); _forwardingApp = new MSBuildForwardingApp(msbuildArgs, msbuildPath);
@ -24,8 +22,6 @@ namespace Microsoft.DotNet.Tools.Build
public static BuildCommand FromArgs(string[] args, string msbuildPath = null) public static BuildCommand FromArgs(string[] args, string msbuildPath = null)
{ {
var buildCommand = new BuildCommand();
CommandLineApplication app = new CommandLineApplication(throwOnUnexpectedArg: false); CommandLineApplication app = new CommandLineApplication(throwOnUnexpectedArg: false);
app.Name = "dotnet build"; app.Name = "dotnet build";
app.FullName = LocalizableStrings.AppFullName; app.FullName = LocalizableStrings.AppFullName;
@ -48,9 +44,12 @@ namespace Microsoft.DotNet.Tools.Build
CommandOption noDependenciesOption = app.Option("--no-dependencies", LocalizableStrings.NoDependenciesOptionDescription, CommandOptionType.NoValue); CommandOption noDependenciesOption = app.Option("--no-dependencies", LocalizableStrings.NoDependenciesOptionDescription, CommandOptionType.NoValue);
CommandOption verbosityOption = MSBuildForwardingApp.AddVerbosityOption(app); CommandOption verbosityOption = MSBuildForwardingApp.AddVerbosityOption(app);
List<string> msbuildArgs = null;
app.OnExecute(() => app.OnExecute(() =>
{ {
List<string> msbuildArgs = new List<string>(); // this delayed initialization is here intentionally
// this code will not get run in some cases (i.e. --help)
msbuildArgs = new List<string>();
if (!string.IsNullOrEmpty(projectArgument.Value)) if (!string.IsNullOrEmpty(projectArgument.Value))
{ {
@ -105,18 +104,16 @@ namespace Microsoft.DotNet.Tools.Build
msbuildArgs.AddRange(app.RemainingArguments); msbuildArgs.AddRange(app.RemainingArguments);
buildCommand._forwardingApp = new MSBuildForwardingApp(msbuildArgs, msbuildPath);
return 0; return 0;
}); });
int exitCode = app.Execute(args); int exitCode = app.Execute(args);
if (buildCommand._forwardingApp == null) if (msbuildArgs == null)
{ {
throw new CommandCreationException(exitCode); throw new CommandCreationException(exitCode);
} }
return buildCommand; return new BuildCommand(msbuildArgs, msbuildPath);
} }
public static int Run(string[] args) public static int Run(string[] args)