提交 8b131b21 编写于 作者: C Christopher Costa

Ensure buildversion.props is evaluated before dotnet restore


Commit migrated from https://github.com/dotnet/core-setup/commit/936a6f7dd9c539aaa4ea6e2dd246c3fb1ecc3975
上级 54c17980
......@@ -14,10 +14,10 @@
<PropertyGroup>
<TraversalBuildDependencies>
BatchRestorePackages;
ValidateExactRestore;
CreateOrUpdateCurrentVersionFile;
CreateVersionInfoFile;
BatchRestorePackages;
ValidateExactRestore;
BuildCustomTasks;
</TraversalBuildDependencies>
<TraversalBuildDependsOn>
......@@ -56,8 +56,10 @@
</Target>
<Target Name="BatchRestorePackages" Condition="'$(RestoreDuringBuild)'=='true'">
<Message Importance="High" Text="Restoring all packages..." />
<Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" />
<!--<Message Importance="High" Text="Restoring all packages..." /> -->
<!--<Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" /> -->
<MSBuild Projects="$(MSBuildThisFileDirectory)restore.proj"
Condition="'$(RestoreDuringBuild)' == 'true'" />
</Target>
<!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. -->
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dir.props" />
<Target Name="Build">
<Message Importance="High" Text="Restoring all packages..." />
<Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" />
</Target>
</Project>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册