diff options
Diffstat (limited to 'tests/build.proj')
| -rw-r--r-- | tests/build.proj | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/build.proj b/tests/build.proj index 518d59ca69..ff2d96bada 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -20,6 +20,19 @@ </TraversalBuildDependsOn> </PropertyGroup> + <ItemGroup> + <RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\performance\performance.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\TestWrappersConfig\TestWrappersConfig.csproj" /> + </ItemGroup> + <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages"> <Message Text="Building Targeting Pack" Importance="High" /> <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" /> @@ -28,32 +41,19 @@ <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 --> - <Exec Command="$(DnuRestoreCommand) $(DnuRestoreDirs)" - StandardOutputImportance="Low" /> - + <!-- restore all csproj's with PackageReferences in one pass --> + <MSBuild Projects="build.proj" + Properties="RestoreProj=%(RestoreProjects.Identity)" + Targets="RestorePackage" /> + <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> </Target> - <!-- Task from buildtools that validates dependencies contained in project.json files. --> - <UsingTask TaskName="ValidateProjectDependencyVersions" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Tasks from buildtools for easy project.json dependency updates --> - <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Create a collection of all project.json files for dependency updates. --> - <ItemGroup> - <ProjectJsonFiles Include="$(SourceDir)**\project.json" /> - <ProjectJsonFiles Include="$(ProjectDir)scripts\**\project.json" /> - </ItemGroup> - - <Target Name="UpdatePackageDependencyVersion"> - <UpdatePackageDependencyVersion ProjectJsons="@(ProjectJsonFiles)" - PackageId="$(PackageId)" - OldVersion="$(OldVersion)" - NewVersion="$(NewVersion)" /> + <Target Name="RestorePackage"> + <Exec Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" + StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> -</Project> +</Project>
\ No newline at end of file |