Skip to content

Commit 1b1a2ff

Browse files
committed
[wasm] WBT: workload installation cleanup
1 parent b6b8beb commit 1b1a2ff

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,14 @@ public override bool Execute()
9797
}
9898

9999
string cachePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
100+
string lastTargetPath = string.Empty;
100101
foreach (InstallWorkloadRequest req in selectedRequests)
101102
{
102-
Log.LogMessage(MessageImportance.High, $"** Installing workload {req.WorkloadId} in {req.TargetPath} **");
103+
if (req.TargetPath != lastTargetPath)
104+
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Preparing {req.TargetPath} **");
105+
lastTargetPath = req.TargetPath;
106+
107+
Log.LogMessage(MessageImportance.High, $" - {req.WorkloadId}: Installing workload");
103108
if (!req.Validate(Log))
104109
return false;
105110

@@ -159,11 +164,11 @@ private bool InstallAllManifests()
159164

160165
if (manifestsInstalled.Contains(req.ManifestName))
161166
{
162-
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Manifests for workload {req.WorkloadId} are already installed **{Environment.NewLine}");
167+
Log.LogMessage(MessageImportance.High, $"** {req.WorkloadId}: Manifests are already installed **");
163168
continue;
164169
}
165170

166-
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Installing manifests for workload {req.WorkloadId} **");
171+
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** {req.WorkloadId}: Installing manifests **");
167172
if (!InstallWorkloadManifest(workload,
168173
req.ManifestName,
169174
req.Version,
@@ -230,13 +235,13 @@ private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents
230235
Path.Combine(req.TargetPath, "dotnet"),
231236
$"workload install --skip-manifest-update --no-cache --configfile \"{nugetConfigPath}\" {req.WorkloadId}",
232237
workingDir: Path.GetTempPath(),
233-
silent: false,
234238
logStdErrAsMessage: req.IgnoreErrors,
235-
debugMessageImportance: MessageImportance.High);
239+
debugMessageImportance: MessageImportance.Normal);
236240
if (exitCode != 0)
237241
{
238242
if (req.IgnoreErrors)
239243
{
244+
Log.LogMessage(MessageImportance.High, output);
240245
Log.LogMessage(MessageImportance.High,
241246
$"{Environment.NewLine} ** Ignoring workload installation failure exit code {exitCode}. **{Environment.NewLine}");
242247
}
@@ -245,6 +250,7 @@ private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents
245250
Log.LogError($"workload install failed with exit code {exitCode}: {output}");
246251
}
247252

253+
Log.LogMessage(MessageImportance.Low, $"List of the relevant paths in {req.TargetPath}");
248254
foreach (string dir in Directory.EnumerateDirectories(Path.Combine(req.TargetPath, "sdk-manifests"), "*", SearchOption.AllDirectories))
249255
Log.LogMessage(MessageImportance.Low, $"\t{Path.Combine(req.TargetPath, "sdk-manifests", dir)}");
250256

@@ -257,7 +263,7 @@ private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents
257263

258264
private void UpdateAppRef(string sdkPath, string version)
259265
{
260-
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Updating Targeting pack **{Environment.NewLine}");
266+
Log.LogMessage(MessageImportance.Normal, $" - Updating Targeting pack");
261267

262268
string pkgPath = Path.Combine(LocalNuGetsPath, $"Microsoft.NETCore.App.Ref.{version}.nupkg");
263269
if (!File.Exists(pkgPath))
@@ -291,7 +297,7 @@ private string GetNuGetConfig()
291297

292298
private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string version, string sdkDir, string nugetConfigContents, bool stopOnMissing)
293299
{
294-
Log.LogMessage(MessageImportance.High, $" ** Installing manifest: {name}/{version}");
300+
Log.LogMessage(MessageImportance.High, $" - Installing manifest: {name}/{version}");
295301

296302
// Find any existing directory with the manifest name, ignoring the case
297303
// Multiple directories for a manifest, differing only in case causes

0 commit comments

Comments
 (0)