Skip to content

[release/10.0.1xx] Fix dotnet restore hang during prepare step #11350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 2 commits into from
May 15, 2026
+35 −9
Merged

[release/10.0.1xx] Fix dotnet restore hang during prepare step #11350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0582a55
Fix dotnet restore hang during prepare step (#11282)
jonathanpeppers May 6, 2026
9ebde16
Fix dotnet restore hang in Step_InstallDotNetPreview (#11310)
jonathanpeppers May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build-tools/automation/yaml-templates/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,9 @@ variables:
value: true
- name: DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT
value: true
- name: DOTNET_CLI_TELEMETRY_OPTOUT
value: true
- name: DOTNET_NOLOGO
value: true
- name: DOTNET_GENERATE_ASPNET_CERTIFICATE
value: false
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/Application/ProcessRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public bool Run ()
if (!exited) {
Log.ErrorLine ($"Process '{FullCommandLine}' timed out after {ProcessTimeout}");
ErrorReason = ErrorReasonCode.ExecutionTimedOut;
process.Kill ();
process.Kill (entireProcessTree: true);
Comment thread
jonathanpeppers marked this conversation as resolved.
}

// See: https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.process.waitforexit?view=netframework-4.7.2#System_Diagnostics_Process_WaitForExit)
Expand Down
36 changes: 28 additions & 8 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,34 @@ protected override async Task<bool> Execute (Context context)

// Install runtime packs associated with the SDK previously installed.
var packageDownloadProj = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xaprepare", "xaprepare", "package-download.proj");
var logPath = Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{context.BuildTimeStamp}-download-runtime-packs.binlog");
var restoreArgs = new string [] { "restore",
ProcessRunner.QuoteArgument (packageDownloadProj),
"--configfile", Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "NuGet.config"),
ProcessRunner.QuoteArgument ($"-bl:{logPath}"),
};
if (!Utilities.RunCommand (Configurables.Paths.DotNetPreviewTool, restoreArgs)) {
Log.ErrorLine ($"Failed to restore runtime packs using '{packageDownloadProj}'.");
var logPathBase = Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{context.BuildTimeStamp}-download-runtime-packs");

const int maxAttempts = 3;
const int initialBackoffDelayMilliseconds = 2000;
bool restoreSucceeded = false;
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
var logPath = $"{logPathBase}-attempt{attempt}.binlog";
var runner = new ProcessRunner (Configurables.Paths.DotNetPreviewTool, "restore",
packageDownloadProj,
"--configfile", Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "NuGet.config"),
$"-bl:{logPath}",
"--verbosity", "normal"
) {
EchoStandardOutput = true,
EchoStandardError = true,
};
if (runner.Run ()) {
restoreSucceeded = true;
break;
}
if (attempt < maxAttempts) {
Log.WarningLine ($"Failed to restore runtime packs (attempt {attempt}/{maxAttempts}), retrying...");
var delayMilliseconds = initialBackoffDelayMilliseconds * (1 << (attempt - 1));
await Task.Delay (delayMilliseconds);
}
}
if (!restoreSucceeded) {
Log.ErrorLine ($"Failed to restore runtime packs using '{packageDownloadProj}' after {maxAttempts} attempts.");
return false;
}

Expand Down