diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-08-08 18:45:59 -0500 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-08-22 15:22:51 -0500 |
| commit | 5a63fd855de5d38d8429b68c50c08b8f00973d22 (patch) | |
| tree | de062b300b47b0dfc83621f8ffb65e7f4dbfaf4a /tests/build.proj | |
| parent | 158db015291e012bb79c6eba15718834cb4ae173 (diff) | |
| download | coreclr-5a63fd855de5d38d8429b68c50c08b8f00973d22.tar.gz coreclr-5a63fd855de5d38d8429b68c50c08b8f00973d22.tar.bz2 coreclr-5a63fd855de5d38d8429b68c50c08b8f00973d22.zip | |
Use versions repo tooling from BuildTools.
Sets up dependencies.props config. Removes UpdateDependencies powershell script, to be replaced by a call into VersionTools in Maestro automation. Changes UpdatePublishedVersions to pass through to VersionTools for backward compatibility.
Diffstat (limited to 'tests/build.proj')
| -rw-r--r-- | tests/build.proj | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/tests/build.proj b/tests/build.proj index 70029f19e3..6d5e456dbb 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -2,6 +2,8 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="dir.props" /> + <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" /> + <ItemGroup> <Project Include="src\dirs.proj" /> </ItemGroup> @@ -12,13 +14,12 @@ <PropertyGroup> <TraversalBuildDependsOn> - ValidateAllProjectDependencies; BatchRestorePackages; $(TraversalBuildDependsOn); </TraversalBuildDependsOn> </PropertyGroup> - <Target Name="BatchRestorePackages"> + <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies"> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> <!-- restore all project.jsons in one pass for perf & to avoid concurrency problems --> @@ -31,20 +32,6 @@ <!-- Task from buildtools that validates dependencies contained in project.json files. --> <UsingTask TaskName="ValidateProjectDependencyVersions" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - <Target Name="ValidateAllProjectDependencies" - Condition="'$(ValidatePackageVersions)'=='true' and '@(ProjectJsonFiles)'!=''"> - <ValidateProjectDependencyVersions ProjectJsons="@(ProjectJsonFiles)" - ProhibitFloatingDependencies="$(ProhibitFloatingDependencies)" - ValidationPatterns="@(ValidationPattern)" /> - </Target> - - <Target Name="UpdateInvalidPackageVersions"> - <ValidateProjectDependencyVersions ProjectJsons="@(ProjectJsonFiles)" - ProhibitFloatingDependencies="$(ProhibitFloatingDependencies)" - ValidationPatterns="@(ValidationPattern)" - UpdateInvalidDependencies="true" /> - </Target> - <!-- Tasks from buildtools for easy project.json dependency updates --> <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> |