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

Merge pull request #4516 from dagood/disable-parallel

Browse source 
Use --disable-parallel during xplat restores
This commit is contained in:
Livar 2016-10-29 00:49:09 -07:00 • committed by GitHub
commit 3ec5279491
6 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.toolversions
View file

@ -1,2 +1,2 @@
microsoft.dotnet.buildtools=1.0.26-prerelease-00802-01 microsoft.dotnet.buildtools=1.0.26-prerelease-00926-02
microsoft.dotnet.buildtools.run=1.0.0-prerelease-00807-04 microsoft.dotnet.buildtools.run=1.0.0-prerelease-00807-04

6
build.proj
View file

@ -68,7 +68,11 @@
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj" Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"> Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)">
<Exec Command="$(DotnetStage0) restore3" WorkingDirectory="$(DotnetCliBuildDirectory)"/> <PropertyGroup>
<ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs>
</PropertyGroup>
<Exec Command="$(DotnetStage0) restore3 $(ExtraRestoreArgs)" WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target> </Target>
<Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target> <Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target>

7
build_projects/dotnet-cli-build/DotNetRestore.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args protected override string Args
{ {
get { return $"{GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()}"; } get { return $"{GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetDisableParallel()}"; }
} }
public string Source { get; set; } public string Source { get; set; }
@ -50,5 +50,10 @@ namespace Microsoft.DotNet.Cli.Build
return null; return null;
} }
private string GetDisableParallel()
{
return "--disable-parallel";
}
} }
} }

7
build_projects/dotnet-cli-build/DotNetRestoreProjectJson.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args protected override string Args
{ {
get { return $"{GetVerbosity()} {GetFallbackSource()} {GetPackages()}"; } get { return $"{GetVerbosity()} {GetFallbackSource()} {GetPackages()} {GetDisableParallel()}"; }
} }
public string FallbackSource { get; set; } public string FallbackSource { get; set; }
@ -50,5 +50,10 @@ namespace Microsoft.DotNet.Cli.Build
return null; return null;
} }
private string GetDisableParallel()
{
return "--disable-parallel";
}
} }
} }

3
run-build.sh
View file

@ -132,6 +132,9 @@ done < "$REPOROOT/branchinfo.txt"
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR [ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR
# During xplat bootstrapping, disable HTTP parallelism to avoid fatal restore timeouts.
export __INIT_TOOLS_RESTORE_ARGS="$__INIT_TOOLS_RESTORE_ARGS --disable-parallel"
DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
toolsLocalPath="$REPOROOT/build_tools" toolsLocalPath="$REPOROOT/build_tools"
bootStrapperPath="$toolsLocalPath/bootstrap.sh" bootStrapperPath="$toolsLocalPath/bootstrap.sh"

4
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs
View file

@ -14,13 +14,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"restore {args}"; args = $"restore {args} --disable-parallel";
return base.Execute(args); return base.Execute(args);
} }
public override CommandResult ExecuteWithCapturedOutput(string args = "") public override CommandResult ExecuteWithCapturedOutput(string args = "")
{ {
args = $"restore {args}"; args = $"restore {args} --disable-parallel";
return base.ExecuteWithCapturedOutput(args); return base.ExecuteWithCapturedOutput(args);
} }
} }