diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-08-11 02:50:29 +0300 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-08-17 18:06:01 +0300 |
| commit | cea2b84dc41510e4e2954d92c2c252b4bbd2b5b6 (patch) | |
| tree | 756d23c7e1d3fb47d0009b836f2a1887111ea1b5 /build.proj | |
| parent | 1493710b5eaa39d525ec9c069f6cdd1ad9b5c1fb (diff) | |
Add full-version package dependency verification.
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/build.proj b/build.proj index 992662054d..95f8e2b2cb 100644 --- a/build.proj +++ b/build.proj @@ -60,7 +60,6 @@ <PropertyGroup Condition="'$(RestoreDuringBuild)'=='true'"> <TraversalBuildDependsOn> - ValidateAllProjectDependencies; BatchRestorePackages; ValidateExactRestore; CreateOrUpdateCurrentVersionFile; @@ -76,7 +75,7 @@ <UsingTask TaskName="GatherDirectoriesToRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - <Target Name="BatchRestorePackages"> + <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies"> <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" /> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> @@ -103,23 +102,6 @@ <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's...done" /> </Target> - <!-- 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> - <!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. --> <UsingTask TaskName="ValidateExactRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> |