Skip to content

[xaprepare] better cleanup past .NET 6 installs #5918

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 1 commit into from
May 6, 2021
Merged

[xaprepare] better cleanup past .NET 6 installs #5918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 32 additions & 3 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,26 @@ protected override async Task<bool> Execute (Context context)
// Delete any custom Microsoft.Android packs that may have been installed by test runs. Other ref/runtime packs will be ignored.
var packsPath = Path.Combine (dotnetPath, "packs");
if (Directory.Exists (packsPath)) {
foreach (var packToRemove in Directory.EnumerateDirectories (packsPath).Where (p => new DirectoryInfo (p).Name.Contains ("Android"))) {
Log.StatusLine ($"Removing Android pack: {packToRemove}");
Utilities.DeleteDirectory (packToRemove);
foreach (var packToRemove in Directory.EnumerateDirectories (packsPath)) {
var info = new DirectoryInfo (packToRemove);
if (info.Name.IndexOf ("Android", StringComparison.OrdinalIgnoreCase) != -1) {
Log.StatusLine ($"Removing Android pack: {packToRemove}");
Utilities.DeleteDirectory (packToRemove);
}
}
}

// Delete Workload manifests, such as sdk-manifests/6.0.100/Microsoft.NET.Sdk.Android
var sdkManifestsPath = Path.Combine (dotnetPath, "sdk-manifests");
if (Directory.Exists (sdkManifestsPath)) {
foreach (var versionBand in Directory.EnumerateDirectories (sdkManifestsPath)) {
foreach (var workloadManifestDirectory in Directory.EnumerateDirectories (versionBand)) {
var info = new DirectoryInfo (workloadManifestDirectory);
if (info.Name.IndexOf ("Android", StringComparison.OrdinalIgnoreCase) != -1) {
Log.StatusLine ($"Removing Android manifest directory: {workloadManifestDirectory}");
Utilities.DeleteDirectory (workloadManifestDirectory);
}
}
}
}

Expand All @@ -39,6 +56,18 @@ protected override async Task<bool> Execute (Context context)
}
}

// Delete Android template-packs
var templatePacksPath = Path.Combine (dotnetPath, "template-packs");
if (Directory.Exists (templatePacksPath)) {
foreach (var templateToRemove in Directory.EnumerateFiles (templatePacksPath)) {
var name = Path.GetFileName (templateToRemove);
if (name.IndexOf ("Android", StringComparison.OrdinalIgnoreCase) != -1) {
Log.StatusLine ($"Removing Android template: {templateToRemove}");
Utilities.DeleteFile (templateToRemove);
}
}
}

if (File.Exists (dotnetTool)) {
if (!TestDotNetSdk (dotnetTool)) {
Log.WarningLine ($"Attempt to run `dotnet --version` failed, reinstalling the SDK.");
Expand Down