Skip to content

Commit ebe42e0

Browse files
[xaprepare] don't install microsoft-net-runtime-android workload
Context: dotnet#6112 (review) The .NET Preview 7 bump is failing with: Running: /Users/builder/Library/Android/dotnet/dotnet "workload" "install" "microsoft-net-runtime-android" "--skip-manifest-update" "--verbosity" "diag" stderr | Workload with id microsoft-net-runtime-android is not recognized. However, it was a bug in the `dotnet workload install` command that we were even able to install this workload in the first place! The concept behind "abstract" workloads is they are not user visible in any way. They're meant to be an implementation detail. In 0150bbb, I setup `xaprepare` to install `microsoft-net-runtime-android`, but we don't actually even need to do this. We can simply update the `sdk-manifest` for this pack, so the version matches `$(DotNetRuntimePacksVersion)`. `microsoft-net-runtime-android` will get installed later during the `ExtractWorkloadPacks` target: https://github.com/xamarin/xamarin-android/blob/c1a2ee70214e86757541b5759c9ed54941bd4680/build-tools/create-packs/Directory.Build.targets#L119-L122 Since `android` and `android-aot` extend `microsoft-net-runtime-android`, this step will install it.
1 parent c1a2ee7 commit ebe42e0

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ protected override async Task<bool> Execute (Context context)
5151
Utilities.CopyFileToDir (file, destination);
5252
}
5353

54-
// Install the microsoft-net-runtime-android workload
55-
if (!Utilities.RunCommand (dotnetTool, BuildPaths.XamarinAndroidSourceRoot, ignoreEmptyArguments: false, new [] { "workload", "install", "microsoft-net-runtime-android", "--skip-manifest-update", "--verbosity", "diag" })) {
56-
Log.ErrorLine ($"dotnet workload install failed.");
57-
return false;
58-
}
59-
6054
return true;
6155
}
6256

0 commit comments

Comments
 (0)