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

Use the same name for the props file when loading it from the deps directory

This commit is contained in:
Pranav K 2017-03-08 06:59:31 -08:00
parent 4e84690938
commit bca4474dd2
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/repo.targets
View File

@ -4,13 +4,14 @@
<_BuildGraphFile>$(BuildDir)BuildGraph.proj</_BuildGraphFile> <_BuildGraphFile>$(BuildDir)BuildGraph.proj</_BuildGraphFile>
<_CloneRepositoryRoot>$(RepositoryRoot).r\</_CloneRepositoryRoot> <_CloneRepositoryRoot>$(RepositoryRoot).r\</_CloneRepositoryRoot>
<_DependencyPackagesDirectory>$(RepositoryRoot).deps\build\</_DependencyPackagesDirectory> <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\</_DependencyBuildDirectory>
<_CommitsFile>$(RepositoryRoot).deps\build\RepositoryCommits.proj</_CommitsFile> <_DependencyPackagesDirectory>$(_DependencyBuildDirectory)></_DependencyPackagesDirectory>
<_RepositoryListFileName>Repositories.props</_RepositoryListFileName>
<_DependencyRepositoryList>$(_DependencyBuildDirectory)$(_RepositoryListFileName)</_DependencyRepositoryList>
<_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\</_RestoreGraphSpecsDirectory> <_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\</_RestoreGraphSpecsDirectory>
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">Package;VerifyPackages</_RepositoryBuildTargets> <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">Package;VerifyPackages</_RepositoryBuildTargets>
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">Verify</_RepositoryBuildTargets> <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">Verify</_RepositoryBuildTargets>
<_RepositoriesWithCommitsFile>$(RepositoryRoot).deps\build\Repositories.props</_RepositoriesWithCommitsFile>
<PrepareDependsOn>$(PrepareDependsOn);CleanUniverseArtifacts</PrepareDependsOn> <PrepareDependsOn>$(PrepareDependsOn);CleanUniverseArtifacts</PrepareDependsOn>
<CleanDependsOn>$(CleanDependsOn);CleanUniverseArtifacts</CleanDependsOn> <CleanDependsOn>$(CleanDependsOn);CleanUniverseArtifacts</CleanDependsOn>
@ -18,14 +19,11 @@
</PropertyGroup> </PropertyGroup>
<Import <Import
Project="$(_RepositoriesWithCommitsFile)" Project="$(_DependencyRepositoryList)"
Condition="Exists('$(_RepositoriesWithCommitsFile)')" /> Condition="Exists('$(_DependencyRepositoryList)')" />
<Import <Import
Project="Repositories.props" Project="$(_RepositoryListFileName)"
Condition="!Exists('$(_RepositoriesWithCommitsFile)')" /> Condition="!Exists('$(_DependencyRepositoryList)')" />
<Import
Project="$(_CommitsFile)"
Condition="Exists('$(_CommitsFile)')" />
<Target Name="CleanUniverseArtifacts"> <Target Name="CleanUniverseArtifacts">
<RemoveDir Directories="$(RepositoryRoot)obj" Condition="Exists('$(RepositoryRoot)obj')" /> <RemoveDir Directories="$(RepositoryRoot)obj" Condition="Exists('$(RepositoryRoot)obj')" />
@ -125,7 +123,6 @@
<_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'"> <_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'">
$(_BuildRepositoryProperties); $(_BuildRepositoryProperties);
APIKey=$(APIKey) APIKey=$(APIKey)
DotNetPath=$(DotNetPath);
NuGetPublishVolatileFeed=$(NuGetPublishVolatileFeed); NuGetPublishVolatileFeed=$(NuGetPublishVolatileFeed);
PublishPackages=$(PublishPackages) PublishPackages=$(PublishPackages)
</_BuildRepositoryProperties> </_BuildRepositoryProperties>
@ -177,10 +174,10 @@
<Target Name="_CreateRepositoriesListWithCommits" DependsOnTargets="_GetRepositoryCommits"> <Target Name="_CreateRepositoriesListWithCommits" DependsOnTargets="_GetRepositoryCommits">
<PropertyGroup> <PropertyGroup>
<RepositoryFileWithCommit>$(BuildDir)Repositories.props</RepositoryFileWithCommit> <RepositoryFileWithCommit>$(BuildDir)$(_RepositoryListFileName)</RepositoryFileWithCommit>
</PropertyGroup> </PropertyGroup>
<Copy <Copy
SourceFiles="$(MSBuildThisFileDirectory)Repositories.props" SourceFiles="$(MSBuildThisFileDirectory)$(_RepositoryListFileName)"
DestinationFiles="$(RepositoryFileWithCommit)" /> DestinationFiles="$(RepositoryFileWithCommit)" />
<XmlPoke2 <XmlPoke2