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

This happened because we were adding the framework to the input path when the output was specified. But Build does not add the framework folders when output gets passed to it.

Browse source
This commit is contained in:
Livar Cunha 2016-01-11 14:53:22 -08:00
parent 44027c2969
commit d07f3e3e25
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Microsoft.DotNet.Tools.Pack/ArtifactPathsCalculator.cs
View file

@ -16,13 +16,16 @@ namespace Microsoft.DotNet.Tools.Pack
private bool PackageArtifactsPathSet => !string.IsNullOrWhiteSpace(PackageArtifactsPathParameter);
private bool ShouldCombinePathWithFramework => !CompiledArtifactsPathSet && !PackageArtifactsPathSet;
public string CompiledArtifactsPathParameter { get; }
public string PackageArtifactsPathParameter { get; }
public bool CompiledArtifactsPathSet => !string.IsNullOrWhiteSpace(CompiledArtifactsPathParameter);
public string CompiledArtifactsPath => CompiledArtifactsPathSet ? CompiledArtifactsPathParameter : PackageArtifactsPath;
public string CompiledArtifactsPath =>
CompiledArtifactsPathSet ? CompiledArtifactsPathParameter : PackageArtifactsPath;
public string PackageArtifactsPath
{
@ -42,7 +45,11 @@ namespace Microsoft.DotNet.Tools.Pack
}
}
public ArtifactPathsCalculator(Project project, string compiledArtifactsPath, string packageArtifactsPath, string configuration)
public ArtifactPathsCalculator(
Project project,
string compiledArtifactsPath,
string packageArtifactsPath,
string configuration)
{
_project = project;
CompiledArtifactsPathParameter = compiledArtifactsPath;
@ -52,7 +59,9 @@ namespace Microsoft.DotNet.Tools.Pack
public string InputPathForContext(ProjectContext context)
{
return CompiledArtifactsPathSet ? CompiledArtifactsPath : Path.Combine(CompiledArtifactsPath, context.TargetFramework.GetTwoDigitShortFolderName());
}
return ShouldCombinePathWithFramework ?
Path.Combine(CompiledArtifactsPath, context.TargetFramework.GetTwoDigitShortFolderName()) :
CompiledArtifactsPath;
}
}
}