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

Enable parallel restore

Browse source
This commit is contained in:
Joel Verhagen 2016-04-04 09:11:15 -07:00
parent 60b23d5115
commit f6fa1cf060
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/common/_common.sh
View file

@ -23,7 +23,7 @@ export CHANNEL=$RELEASE_SUFFIX
#TODO this is a workaround for a nuget bug on ubuntu. Remove #TODO this is a workaround for a nuget bug on ubuntu. Remove
export DISABLE_PARALLEL="" export DISABLE_PARALLEL=""
[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="--disable-parallel" [[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL=""
unset COMMONSOURCE unset COMMONSOURCE
unset COMMONDIR unset COMMONDIR

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

@ -205,8 +205,8 @@ 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").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful();
dotnet.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful(); dotnet.Restore("--verbosity", "verbose", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
return c.Success(); return c.Success();
} }

9
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -69,7 +69,7 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache(); CleanNuGetTempCache();
var dotnet = DotNetCli.Stage2; var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose", "--infer-runtimes", "--disable-parallel") dotnet.Restore("--verbosity", "verbose", "--infer-runtimes")
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages"))
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();
@ -88,7 +88,6 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2; var dotnet = DotNetCli.Stage2;
dotnet.Restore( dotnet.Restore(
"--verbosity", "verbose", "--verbosity", "verbose",
"--disable-parallel",
"--infer-runtimes", "--infer-runtimes",
"--fallbacksource", Dirs.TestPackages) "--fallbacksource", Dirs.TestPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestProjects")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestProjects"))
@ -97,14 +96,12 @@ namespace Microsoft.DotNet.Cli.Build
// The 'ProjectModelServer' directory contains intentionally-unresolved dependencies, so don't check for success. Also, suppress the output // The 'ProjectModelServer' directory contains intentionally-unresolved dependencies, so don't check for success. Also, suppress the output
dotnet.Restore( dotnet.Restore(
"--verbosity", "verbose", "--verbosity", "verbose",
"--disable-parallel",
"--infer-runtimes") "--infer-runtimes")
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthTestProjects")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthTestProjects"))
.Execute(); .Execute();
dotnet.Restore( dotnet.Restore(
"--verbosity", "verbose", "--verbosity", "verbose",
"--disable-parallel",
"--infer-runtimes") "--infer-runtimes")
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthUpdateSearchPathSample")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthUpdateSearchPathSample"))
.Execute(); .Execute();
@ -119,7 +116,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2; var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose", dotnet.Restore("--verbosity", "verbose",
"--disable-parallel", "--infer-runtimes", "--infer-runtimes",
"--fallbacksource", Dirs.TestPackages) "--fallbacksource", Dirs.TestPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "DesktopTestProjects")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "DesktopTestProjects"))
.Execute().EnsureSuccessful(); .Execute().EnsureSuccessful();
@ -257,7 +254,7 @@ namespace Microsoft.DotNet.Cli.Build
CleanBinObj(c, Path.Combine(c.BuildContext.BuildDirectory, "test")); CleanBinObj(c, Path.Combine(c.BuildContext.BuildDirectory, "test"));
CleanNuGetTempCache(); CleanNuGetTempCache();
DotNetCli.Stage2.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes","--fallbacksource", Dirs.TestPackages) DotNetCli.Stage2.Restore("--verbosity", "verbose", "--infer-runtimes", "--fallbacksource", Dirs.TestPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test")) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test"))
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();

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 --infer-runtimes dotnet restore --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 --infer-runtimes dotnet restore --infer-runtimes
) )
# Build the builder # Build the builder