diff options
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" /> |