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

Changing the input parameter to basepath to match nuget pack

Browse source
This commit is contained in:
Livar Cunha 2016-01-07 15:55:36 -08:00
parent d2e06f0ebf
commit ae7ec0427c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/nuget/package.ps1
View file

@ -37,7 +37,7 @@ foreach ($ProjectName in $Projects) {
Write-Host "$toolsDir\dotnet restore failed for: $ProjectFile"
Exit 1
}
& $toolsDir\dotnet pack "$ProjectFile" --input "Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
& $toolsDir\dotnet pack "$ProjectFile" --basepath "Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
if (!$?) {
Write-Host "$toolsDir\dotnet pack failed for: $ProjectFile"
Exit 1

6
src/Microsoft.DotNet.Tools.Pack/Program.cs
View file

@ -23,7 +23,7 @@ namespace Microsoft.DotNet.Tools.Compiler
app.Description = "Packager for the .NET Platform";
app.HelpOption("-h|--help");
var input = app.Option("-i|--input <INPUT_DIR>", "Directory from where the assets to be packages are going to be picked up", CommandOptionType.SingleValue);
var basePath = app.Option("-b|--basepath <BASE_PATH>", "Directory from where the assets to be packaged are going to be picked up", CommandOptionType.SingleValue);
var output = app.Option("-o|--output <OUTPUT_DIR>", "Directory in which to place outputs", CommandOptionType.SingleValue);
var intermediateOutput = app.Option("-t|--temp-output <OUTPUT_DIR>", "Directory in which to place temporary outputs", CommandOptionType.SingleValue);
var configuration = app.Option("-c|--configuration <CONFIGURATION>", "Configuration under which to build", CommandOptionType.SingleValue);
@ -63,13 +63,13 @@ namespace Microsoft.DotNet.Tools.Compiler
var contexts = ProjectContext.CreateContextForEachFramework(pathValue, settings);
var configValue = configuration.Value() ?? Cli.Utils.Constants.DefaultConfiguration;
var inputValue = input.Value();
var basePathValue = basePath.Value();
var outputValue = output.Value();
var intermediateOutputValue = intermediateOutput.Value();
var project = contexts.First().ProjectFile;
var artifactPathsCalculator = new ArtifactPathsCalculator(project, inputValue, outputValue, configValue);
var artifactPathsCalculator = new ArtifactPathsCalculator(project, basePathValue, outputValue, configValue);
var buildProjectCommand = new BuildProjectCommand(project, artifactPathsCalculator, intermediateOutputValue, configValue);
var packageBuilder = new PackagesGenerator(contexts, artifactPathsCalculator, configValue);