[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into from
Jun 24, 2026
Merged

[build] Provision .NET SDK via standard scripts, drop xaprepare's installer #11636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f1f2059
Migrate .NET SDK provisioning to Arcade scripts
jonathanpeppers Jun 11, 2026
b01c358
Read SDK version from eng/Versions.props, drop global.json:tools.dotnet
jonathanpeppers Jun 11, 2026
2645bdb
Make eng/install-dotnet.sh executable
jonathanpeppers Jun 12, 2026
0e22d0b
Invoke install-dotnet.sh via `bash` so executable bit is not required
jonathanpeppers Jun 12, 2026
b30879c
[build] Move workload prep to src/workloads/workloads.csproj
jonathanpeppers Jun 15, 2026
4838aba
Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit
jonathanpeppers Jun 17, 2026
c24ebf1
Address Copilot review comments
jonathanpeppers Jun 17, 2026
11dc706
Revert unintentional submodule bumps
jonathanpeppers Jun 17, 2026
12fa9b8
Address PR review feedback
jonathanpeppers Jun 22, 2026
ffad9a0
Revert submodule bumps (again)
jonathanpeppers Jun 22, 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 Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down
3 changes: 0 additions & 3 deletions build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
steps:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
xaprepareScenario: EmulatorTestDependencies
jdkMajorVersion: $(LatestJavaSdkMajorVersion)

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
xaprepareScenario: EmulatorTestDependencies
useAgentJdkPath: false
jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
xaprepareScenario: EmulatorTestDependencies
useAgentJdkPath: false
jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down
1 change: 0 additions & 1 deletion build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
parameters:
installTestSlicer: true
installApkDiff: false
xaprepareScenario: EmulatorTestDependencies
use1ESTemplate: false

- task: DownloadPipelineArtifact@2
Expand Down
1 change: 0 additions & 1 deletion build-tools/automation/yaml-templates/run-emulator-tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
xaprepareScenario: EmulatorTestDependencies
jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down
17 changes: 0 additions & 17 deletions build-tools/automation/yaml-templates/run-xaprepare.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions build-tools/automation/yaml-templates/setup-test-environment-public.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
androidSdkPlatforms: $(DefaultTestSdkPlatforms)
repositoryAlias: 'self'
commit: ''
xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
installTestSlicer: ${{ parameters.installTestSlicer }}
installApkDiff: ${{ parameters.installApkDiff }}
androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
xaprepareScenario: ${{ parameters.xaprepareScenario }}
use1ESTemplate: false
24 changes: 19 additions & 5 deletions build-tools/automation/yaml-templates/setup-test-environment-steps.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
installTestSlicer: false
installApkDiff: true
androidSdkPlatforms: $(DefaultTestSdkPlatforms)
xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
displayName: Install p7zip on macOS
condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
parameters:
arguments: --s=${{ parameters.xaprepareScenario }}
xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
& "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
set -e
bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
env:
CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
displayName: prepare .NET workloads
inputs:
projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down
2 changes: 0 additions & 2 deletions build-tools/automation/yaml-templates/setup-test-environment.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
androidSdkPlatforms: $(DefaultTestSdkPlatforms)
repositoryAlias: 'self'
commit: ''
xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
installTestSlicer: ${{ parameters.installTestSlicer }}
installApkDiff: ${{ parameters.installApkDiff }}
androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
xaprepareScenario: ${{ parameters.xaprepareScenario }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}
1 change: 0 additions & 1 deletion build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
xaSourcePath: ${{ parameters.xaSourcePath }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
xaprepareScenario: EmulatorTestDependencies
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- task: DownloadPipelineArtifact@2
Expand Down
2 changes: 0 additions & 2 deletions build-tools/automation/yaml-templates/stage-package-tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
steps:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
xaprepareScenario: EmulatorTestDependencies
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
steps:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
xaprepareScenario: EmulatorTestDependencies
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- task: DownloadPipelineArtifact@2
Expand Down
9 changes: 8 additions & 1 deletion build-tools/scripts/PrepareWindows.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
<_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
</PropertyGroup>
<Import Project="$(_TopDir)\Configuration.props" />
<Target Name="_BuildXAPrepare">
<Target Name="_InstallDotNet">
<Exec
Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
WorkingDirectory="$(_TopDir)"
/>
</Target>
<Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
<MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
</Target>
<Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
/>
<Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
<MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
<MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
<CallTarget Targets="PrepareJavaInterop" />
</Target>
</Project>
5 changes: 0 additions & 5 deletions build-tools/xaprepare/xaprepare/Application/Context.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
}
}

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

/// <summary>
/// Determines whether or not we are running on a hosted azure pipelines agent.
/// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down
9 changes: 0 additions & 9 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
{
public const string DefaultCompiler = "cc";
}

partial class Urls
{
// This is the "public" url that we really should be using, but it keeps failing with:
// AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
// For now we'll grab it directly from GitHub
// public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
}
}
}
5 changes: 0 additions & 5 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
partial class Paths
{
}

partial class Urls
{
public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
}
}
}
16 changes: 0 additions & 16 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
XAPackagesDir,
$"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
);

public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
XAPackagesDir,
$"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
);

public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down
3 changes: 0 additions & 3 deletions build-tools/xaprepare/xaprepare/Main.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
public string? Configuration { get; set; }
public bool AutoProvision { get; set; }
public bool AutoProvisionUsesSudo { get; set; }
public string? LocalDotNetSdkArchive { get; set; }
}

public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
{"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
Context.Instance.AutoProvision = parsedOptions.AutoProvision;
Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

if (!String.IsNullOrEmpty (parsedOptions.Configuration))
Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down
2 changes: 0 additions & 2 deletions build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

protected override void AddSteps (Context context)
{
Steps.Add (new Step_InstallDotNetPreview ());

// disable installation of missing programs...
context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
if (context == null)
throw new ArgumentNullException (nameof (context));

Steps.Add (new Step_InstallDotNetPreview ());
Steps.Add (new Step_GenerateFiles (atBuildStart: true));
Steps.Add (new Step_GenerateCGManifest ());
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[build] Provision .NET SDK via standard scripts, drop xaprepare's installer#11636

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 10 commits into

from

Jun 24, 2026
 Merged


[build] Provision .NET SDK via standard scripts, drop xaprepare's installer
#11636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
f1f2059

Migrate .NET SDK provisioning to Arcade scripts


jonathanpeppers Jun 11, 2026
b01c358

Read SDK version from eng/Versions.props, drop global.json:tools.dotnet


jonathanpeppers Jun 11, 2026
2645bdb

Make eng/install-dotnet.sh executable


jonathanpeppers Jun 12, 2026
0e22d0b

Invoke install-dotnet.sh via `bash` so executable bit is not required


jonathanpeppers Jun 12, 2026
b30879c

[build] Move workload prep to src/workloads/workloads.csproj


jonathanpeppers Jun 15, 2026
4838aba

Merge branch 'main' into jonathanpeppers/sdk-provisioning-audit


jonathanpeppers Jun 17, 2026
c24ebf1

Address Copilot review comments


jonathanpeppers Jun 17, 2026
11dc706

Revert unintentional submodule bumps


jonathanpeppers Jun 17, 2026
12fa9b8

Address PR review feedback


jonathanpeppers Jun 22, 2026
ffad9a0

Revert submodule bumps (again)


jonathanpeppers Jun 22, 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
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,16 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
	CONFIGURATION=$(CONFIGURATION) bash ./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/automation/azure-pipelines-nightly.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
Expand DownExpand Up@@ -194,7 +193,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand DownExpand Up@@ -247,7 +245,6 @@ stages:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 installTestSlicer: true
 xaprepareScenario: EmulatorTestDependencies
 useAgentJdkPath: false
 jdkMajorVersion: $(LatestJavaSdkMajorVersion)

Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/azure-pipelines-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,7 +379,6 @@ stages:
 parameters:
 installTestSlicer: true
 installApkDiff: false
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: false

 - task: DownloadPipelineArtifact@2
Expand Down

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/run-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ jobs:

 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
 useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}
Expand Down

17 changes: 0 additions & 17 deletions
build-tools/automation/yaml-templates/run-xaprepare.yaml

View file


Open in desktop


This file was deleted.


2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment-public.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: false

steps:
Expand All@@ -36,5 +35,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: false

24 changes: 19 additions & 5 deletions
build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ parameters:
 installTestSlicer: false
 installApkDiff: true
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -50,10 +49,25 @@ steps:
 displayName: Install p7zip on macOS
 condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
 parameters:
 arguments: --s=${{ parameters.xaprepareScenario }}
 xaSourcePath: ${{ parameters.xaSourcePath }}
- pwsh: |
 & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

- bash: |
 set -e
 bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
 displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
 condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 env:
 CONFIGURATION: ${{ parameters.configuration }}

- task: DotNetCoreCLI@2
 displayName: prepare .NET workloads
 inputs:
 projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
 arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog

- task: DotNetCoreCLI@2
 displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/setup-test-environment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 androidSdkPlatforms: $(DefaultTestSdkPlatforms)
 repositoryAlias: 'self'
 commit: ''
 xaprepareScenario: AndroidTestDependencies # Use 'EmulatorTestDependencies' for agents that need the emulator installed
 use1ESTemplate: true

steps:
Expand DownExpand Up@@ -41,5 +40,4 @@ steps:
 installTestSlicer: ${{ parameters.installTestSlicer }}
 installApkDiff: ${{ parameters.installApkDiff }}
 androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
 xaprepareScenario: ${{ parameters.xaprepareScenario }}
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

1 change: 0 additions & 1 deletion
build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ stages:
 xaSourcePath: ${{ parameters.xaSourcePath }}
 repositoryAlias: ${{ parameters.repositoryAlias }}
 commit: ${{ parameters.commit }}
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/automation/yaml-templates/stage-package-tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand DownExpand Up@@ -120,7 +119,6 @@ stages:
 steps:
 - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 parameters:
 xaprepareScenario: EmulatorTestDependencies
 use1ESTemplate: ${{ parameters.use1ESTemplate }}

 - task: DownloadPipelineArtifact@2
Expand Down

9 changes: 8 additions & 1 deletion
build-tools/scripts/PrepareWindows.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,13 @@
 <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
 </PropertyGroup>
 <Import Project="$(_TopDir)\Configuration.props" />
 <Target Name="_BuildXAPrepare">
 <Target Name="_InstallDotNet">
 <Exec
 Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
 WorkingDirectory="$(_TopDir)"
 />
 </Target>
 <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
 <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
 </Target>
 <Target Name="Prepare"
Expand All@@ -20,6 +26,7 @@
 />
 <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
 <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
 <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
 <CallTarget Targets="PrepareJavaInterop" />
 </Target>
</Project>

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/Application/Context.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,11 +277,6 @@ public string DebugFileExtension {
 }
 }

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

 /// <summary>
 /// Determines whether or not we are running on a hosted azure pipelines agent.
 /// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down

9 changes: 0 additions & 9 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,5 @@ partial class Defaults
 {
 public const string DefaultCompiler = "cc";
 }

 partial class Urls
 {
 // This is the "public" url that we really should be using, but it keeps failing with:
 // AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
 // For now we'll grab it directly from GitHub
 // public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
 }
	}
}

5 changes: 0 additions & 5 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,5 @@ partial class Defaults
 partial class Paths
 {
 }

 partial class Urls
 {
 public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
 }
	}
}

16 changes: 0 additions & 16 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,22 +178,6 @@ public static partial class Paths
 public static string CoreClrAppRuntimeAndroidX86 => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 public static string CoreClrAppRuntimeAndroidX86_64 => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));

 public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
 );

 public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");

 public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
 XAPackagesDir,
 $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
 ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
 );

 public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");

 public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);

 public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");
Expand Down

3 changes: 0 additions & 3 deletions
build-tools/xaprepare/xaprepare/Main.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ sealed class ParsedOptions
 public string? Configuration { get; set; }
 public bool AutoProvision { get; set; }
 public bool AutoProvisionUsesSudo { get; set; }
 public string? LocalDotNetSdkArchive { get; set; }
 }

 public static int Main (string[] args)
Expand DownExpand Up@@ -98,7 +97,6 @@ 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)},
 {"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 DownExpand Up@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
 Context.Instance.AutoProvision = parsedOptions.AutoProvision;
 Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
 Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

 if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)

 protected override void AddSteps (Context context)
 {
 Steps.Add (new Step_InstallDotNetPreview ());

 // disable installation of missing programs...
 context.SetCondition (KnownConditions.AllowProgramInstallation, false);

Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 if (context == null)
 throw new ArgumentNullException (nameof (context));

 Steps.Add (new Step_InstallDotNetPreview ());
 Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 Steps.Add (new Step_GenerateCGManifest ());
 }
Expand Down
Loading
Loading