mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move RestorePackages to Prepare, not Init.

Browse source 
RestorePackages will fail if the 'artifacts\rid\corehost` folder doesn't exist. So other targets that depend on Init can't run unless the host has been built.
This commit is contained in:
Eric Erhardt 2016-05-17 10:36:02 -05:00
parent aea6fc62ac
commit 7cb7b660d8
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build_projects/dotnet-cli-build/PrepareTargets.cs
View file

@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public class PrepareTargets public class PrepareTargets
{ {
[Target(nameof(Init))] [Target(nameof(Init), nameof(RestorePackages))]
public static BuildTargetResult Prepare(BuildTargetContext c) => c.Success(); public static BuildTargetResult Prepare(BuildTargetContext c) => c.Success();
[Target(nameof(CheckPrereqCmakePresent), nameof(CheckPlatformDependencies))] [Target(nameof(CheckPrereqCmakePresent), nameof(CheckPlatformDependencies))]
@ -38,8 +38,7 @@ namespace Microsoft.DotNet.Cli.Build
nameof(UpdateTemplateVersions), nameof(UpdateTemplateVersions),
nameof(CheckPrereqs), nameof(CheckPrereqs),
nameof(LocateStage0), nameof(LocateStage0),
nameof(ExpectedBuildArtifacts), nameof(ExpectedBuildArtifacts))]
nameof(RestorePackages))]
public static BuildTargetResult Init(BuildTargetContext c) public static BuildTargetResult Init(BuildTargetContext c)
{ {
var configEnv = Environment.GetEnvironmentVariable("CONFIGURATION"); var configEnv = Environment.GetEnvironmentVariable("CONFIGURATION");