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

Merge pull request #2153 from dotnet/pakrym/infer-scripts

Browse source 
Infer rids for build script restore
This commit is contained in:
Pavel Krymets 2016-03-30 19:20:51 -07:00
commit 6bd374a4ec
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/dotnet-cli-build/PrepareTargets.cs
View file

@ -206,7 +206,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage0; var dotnet = DotNetCli.Stage0;
dotnet.Restore("--verbosity", "verbose", "--disable-parallel").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful(); dotnet.Restore("--verbosity", "verbose", "--disable-parallel").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful();
dotnet.Restore("--verbosity", "verbose", "--disable-parallel").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful(); dotnet.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
return c.Success(); return c.Success();
} }

2
scripts/run-build.ps1
View file

@ -72,7 +72,7 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
# Restore the build scripts # Restore the build scripts
Write-Host "Restoring Build Script projects..." Write-Host "Restoring Build Script projects..."
pushd $PSScriptRoot pushd $PSScriptRoot
dotnet restore --disable-parallel dotnet restore --disable-parallel --infer-runtimes
if($LASTEXITCODE -ne 0) { throw "Failed to restore" } if($LASTEXITCODE -ne 0) { throw "Failed to restore" }
popd popd

2
scripts/run-build.sh
View file

@ -103,7 +103,7 @@ fi
echo "Restoring Build Script projects..." echo "Restoring Build Script projects..."
( (
cd $DIR cd $DIR
dotnet restore --disable-parallel dotnet restore --disable-parallel --infer-runtimes
) )
# Build the builder # Build the builder

0
src/dotnet/commands/dotnet-compile-native/appdep/project.json → tools/appdep/project.json
View file