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

Avoid conflicts between PinVersion and lineups

This commit is contained in:
Nate McMaster 2017-08-25 17:21:12 -07:00
parent 2ddba022aa
commit 1d4e7dcd08
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/repobuild/BeforeKoreBuild.props
View File

@ -4,7 +4,7 @@
<!-- Restore locally-built lineups into a temp directory, not the global cache. --> <!-- Restore locally-built lineups into a temp directory, not the global cache. -->
<PolicyRestorePackagesPath>$([MSBuild]::NormalizeDirectory($(Universe_IntermediateDir)))packages\</PolicyRestorePackagesPath> <PolicyRestorePackagesPath>$([MSBuild]::NormalizeDirectory($(Universe_IntermediateDir)))packages\</PolicyRestorePackagesPath>
<!-- Restore from the locally-built artifacts directory --> <!-- Restore from the locally-built artifacts directory -->
<PolicyRestoreAdditionalSources Condition=" '$(Universe_LineupBuildDir)' != '' ">$(PolicyRestoreAdditionalSources);$([MSBuild]::NormalizeDirectory($(Universe_LineupBuildDir)))</PolicyRestoreAdditionalSources> <PolicyRestoreAdditionalSources Condition=" Exists('$(Universe_LineupBuildDir)') ">$(PolicyRestoreAdditionalSources);$(Universe_LineupBuildDir)</PolicyRestoreAdditionalSources>
<PolicyRestoreAdditionalSources Condition=" '$(Universe_DependencyLineupDir)' != '' ">$(PolicyRestoreAdditionalSources);$([MSBuild]::NormalizeDirectory($(Universe_DependencyLineupDir)))</PolicyRestoreAdditionalSources> <PolicyRestoreAdditionalSources Condition=" Exists('$(Universe_DependencyLineupDir)') ">$(PolicyRestoreAdditionalSources);$(Universe_DependencyLineupDir)</PolicyRestoreAdditionalSources>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
build/tasks/VersionPinning/DependencyGraphSpecProvider.cs
View File

@ -55,6 +55,7 @@ namespace RepoTasks.VersionPinning
"/v:q", "/v:q",
"/p:BuildProjectReferences=false", "/p:BuildProjectReferences=false",
$"/p:RestoreGraphOutputPath=\"{outputFile}\"", $"/p:RestoreGraphOutputPath=\"{outputFile}\"",
"/p:KoreBuildRestoreTargetsImported=true",
}; };
psi.Arguments = string.Join(" ", arguments); psi.Arguments = string.Join(" ", arguments);