Skip to content

[xaprepare] add --dotnet-sdk-archive switch #10769

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
grendello merged 2 commits into from
Feb 5, 2026
Merged

[xaprepare] add --dotnet-sdk-archive switch #10769

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
97850bf
[xaprepare] add `--dotnet-sdk-archive` switch
jonathanpeppers Feb 4, 2026
245f829
Apply suggestions from code review
jonathanpeppers Feb 4, 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
7 changes: 6 additions & 1 deletion build-tools/xaprepare/xaprepare/Application/Context.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,12 @@ public string DebugFileExtension {
/// </summary>
public IEnumerable<string> AndroidSdkPlatforms { get; set; } = Enumerable.Empty<string> ();

// <summary>
/// <summary>
/// Path to a local .NET SDK archive to use instead of downloading.
/// </summary>
public string? LocalDotNetSdkArchive { get; set; }

/// <summary>
/// Set by <see cref="Step_Get_Android_BuildTools"/> if the archive has been downloaded and validated.
/// </summary>
public bool BuildToolsArchiveDownloaded { get; set; }
Expand Down
3 changes: 3 additions & 0 deletions build-tools/xaprepare/xaprepare/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ sealed class ParsedOptions
public bool AutoProvisionUsesSudo { get; set; }
public RefreshableComponent RefreshList { get; set; }
public IEnumerable<string> AndroidSdkPlatforms { get; set; } = new [] { "latest" };
public string? LocalDotNetSdkArchive { get; set; }
}

public static int Main (string[] args)
Expand Down Expand Up @@ -101,6 +102,7 @@ static async Task<int> Run (string[] args)
{"auto-provision=", $"Automatically install software required by .NET for Android", v => parsedOptions.AutoProvision = ParseBoolean (v)},
{"auto-provision-uses-sudo=", $"Allow use of sudo(1) when provisioning", v => parsedOptions.AutoProvisionUsesSudo = ParseBoolean (v)},
{"android-sdk-platforms=", "Comma separated list of Android SDK platform levels to be installed or 'latest' or 'all'. Defaults to 'latest' if no value is provided.", v => parsedOptions.AndroidSdkPlatforms = ParseAndroidSdkPlatformLevels (v?.Trim () ?? String.Empty) },
{"dotnet-sdk-archive=", "Path to a local .NET SDK archive (zip or tar.gz) to use instead of downloading from the internet.", v => parsedOptions.LocalDotNetSdkArchive = v?.Trim () },
"",
{"h|help", "Show this help message", v => parsedOptions.ShowHelp = true },
};
Expand Down Expand Up @@ -132,6 +134,7 @@ static async Task<int> Run (string[] args)
Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
Context.Instance.ComponentsToRefresh = parsedOptions.RefreshList;
Context.Instance.AndroidSdkPlatforms = parsedOptions.AndroidSdkPlatforms;
Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

if (!String.IsNullOrEmpty (parsedOptions.Configuration))
Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down
23 changes: 22 additions & 1 deletion 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 @@ -21,7 +21,13 @@ protected override async Task<bool> Execute (Context context)
var dotnetPath = Configurables.Paths.DotNetPreviewPath;
dotnetPath = dotnetPath.TrimEnd (new char [] { Path.DirectorySeparatorChar });

if (!await InstallDotNetAsync (context, dotnetPath, BuildToolVersion, useCachedInstallScript: true) &&
// Check if a local SDK archive was specified
if (!String.IsNullOrEmpty (context.LocalDotNetSdkArchive)) {
if (!await InstallDotNetFromLocalArchiveAsync (context, dotnetPath, context.LocalDotNetSdkArchive!)) {
Log.ErrorLine ($"Installation of dotnet SDK from local archive '{context.LocalDotNetSdkArchive}' failed.");
return false;
}
} else if (!await InstallDotNetAsync (context, dotnetPath, BuildToolVersion, useCachedInstallScript: true) &&
!await InstallDotNetAsync (context, dotnetPath, BuildToolVersion, useCachedInstallScript: false)) {
Log.ErrorLine ($"Installation of dotnet SDK '{BuildToolVersion}' failed.");
return false;
Expand Down Expand Up @@ -179,6 +185,21 @@ string[] GetInstallationScriptArgs (string version, string dotnetPath, string do
return args.ToArray ();
}

async Task<bool> InstallDotNetFromLocalArchiveAsync (Context context, string dotnetPath, string archivePath)
{
if (!File.Exists (archivePath)) {
Log.ErrorLine ($"Local .NET SDK archive not found: '{archivePath}'");
return false;
}

Log.StatusLine ($"Installing .NET SDK from local archive: {archivePath}");

// Always delete the bin/$(Configuration)/dotnet/ directory
Utilities.DeleteDirectory (dotnetPath);

return await Utilities.Unpack (archivePath, dotnetPath);
}

async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string version, bool useCachedInstallScript, bool runtimeOnly = false)
{
string cacheDir = context.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory);
Expand Down