huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure PackageVersion is set when computing sharedfx output path

This commit is contained in:
Nate McMaster 2017-12-27 13:30:38 -08:00
parent 4a3f00b255
commit 50391c0341
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/SharedFx.targets
View File

@ -2,6 +2,10 @@
<Import Project="common.props" /> <Import Project="common.props" />
<Import Project="SharedFx.props" /> <Import Project="SharedFx.props" />
<PropertyGroup>
<SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
</PropertyGroup>
<Target Name="BuildMetapackage" DependsOnTargets="ResolveRepoInfo"> <Target Name="BuildMetapackage" DependsOnTargets="ResolveRepoInfo">
<!-- Clear working directory --> <!-- Clear working directory -->
<RemoveDir Directories="$(_WorkRoot)" /> <RemoveDir Directories="$(_WorkRoot)" />
@ -122,6 +126,8 @@
Lines="@(VersionLines)" Lines="@(VersionLines)"
Overwrite="true" /> Overwrite="true" />
<MakeDir Directories="$(SharedFxOutputPath)" />
<!-- <!--
Used by the downloader scripts when pulling from a 'channel' instead of a specific version. Used by the downloader scripts when pulling from a 'channel' instead of a specific version.
The second line must be the package version. The second line must be the package version.

1
build/repo.props
View File

@ -11,7 +11,6 @@
<SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot> <SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot>
<LineupBuildDir>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))lineups\</LineupBuildDir> <LineupBuildDir>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))lineups\</LineupBuildDir>
<SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
<DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir> <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
<DependencyMirrorPackageDir>$(RepositoryRoot).deps\mirror\</DependencyMirrorPackageDir> <DependencyMirrorPackageDir>$(RepositoryRoot).deps\mirror\</DependencyMirrorPackageDir>