diff --git a/scripts/common/_common.sh b/scripts/common/_common.sh index b292ea307..faa29f0d4 100644 --- a/scripts/common/_common.sh +++ b/scripts/common/_common.sh @@ -23,7 +23,7 @@ export CHANNEL=$RELEASE_SUFFIX #TODO this is a workaround for a nuget bug on ubuntu. Remove export DISABLE_PARALLEL="" -[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="--disable-parallel" +[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="" unset COMMONSOURCE unset COMMONDIR diff --git a/scripts/dotnet-cli-build/PrepareTargets.cs b/scripts/dotnet-cli-build/PrepareTargets.cs index d65df0094..ac44561eb 100644 --- a/scripts/dotnet-cli-build/PrepareTargets.cs +++ b/scripts/dotnet-cli-build/PrepareTargets.cs @@ -205,8 +205,8 @@ namespace Microsoft.DotNet.Cli.Build { 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", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful(); + dotnet.Restore("--verbosity", "verbose").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful(); + dotnet.Restore("--verbosity", "verbose", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful(); return c.Success(); } diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs index 13c197f0b..65208c9be 100644 --- a/scripts/dotnet-cli-build/TestTargets.cs +++ b/scripts/dotnet-cli-build/TestTargets.cs @@ -69,7 +69,7 @@ namespace Microsoft.DotNet.Cli.Build CleanNuGetTempCache(); 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")) .Execute() .EnsureSuccessful(); @@ -87,8 +87,7 @@ namespace Microsoft.DotNet.Cli.Build var dotnet = DotNetCli.Stage2; dotnet.Restore( - "--verbosity", "verbose", - "--disable-parallel", + "--verbosity", "verbose", "--infer-runtimes", "--fallbacksource", Dirs.TestPackages) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestProjects")) @@ -96,15 +95,13 @@ namespace Microsoft.DotNet.Cli.Build // The 'ProjectModelServer' directory contains intentionally-unresolved dependencies, so don't check for success. Also, suppress the output dotnet.Restore( - "--verbosity", "verbose", - "--disable-parallel", + "--verbosity", "verbose", "--infer-runtimes") .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthTestProjects")) .Execute(); dotnet.Restore( - "--verbosity", "verbose", - "--disable-parallel", + "--verbosity", "verbose", "--infer-runtimes") .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthUpdateSearchPathSample")) .Execute(); @@ -119,7 +116,7 @@ namespace Microsoft.DotNet.Cli.Build var dotnet = DotNetCli.Stage2; dotnet.Restore("--verbosity", "verbose", - "--disable-parallel", "--infer-runtimes", + "--infer-runtimes", "--fallbacksource", Dirs.TestPackages) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "DesktopTestProjects")) .Execute().EnsureSuccessful(); @@ -257,7 +254,7 @@ namespace Microsoft.DotNet.Cli.Build CleanBinObj(c, Path.Combine(c.BuildContext.BuildDirectory, "test")); 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")) .Execute() .EnsureSuccessful(); diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1 index 6d91706d1..e75741858 100644 --- a/scripts/run-build.ps1 +++ b/scripts/run-build.ps1 @@ -72,7 +72,7 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" # Restore the build scripts Write-Host "Restoring Build Script projects..." pushd $PSScriptRoot -dotnet restore --disable-parallel --infer-runtimes +dotnet restore --infer-runtimes if($LASTEXITCODE -ne 0) { throw "Failed to restore" } popd diff --git a/scripts/run-build.sh b/scripts/run-build.sh index 78c2d546d..175cc10ea 100755 --- a/scripts/run-build.sh +++ b/scripts/run-build.sh @@ -103,7 +103,7 @@ fi echo "Restoring Build Script projects..." ( cd $DIR - dotnet restore --disable-parallel --infer-runtimes + dotnet restore --infer-runtimes ) # Build the builder