Skip to content

[browser] Fix ConvertDllsToWebCil stack dump on bad input to be error message with input path #101162

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
danmoseley merged 5 commits into from
May 4, 2024
Merged

[browser] Fix ConvertDllsToWebCil stack dump on bad input to be error message with input path #101162

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d42fec
Fix ConvertDllsToWebCil message
danmoseley Apr 17, 2024
9d15d5d
Add basic tests
danmoseley Apr 17, 2024
5801429
Revert "Add basic tests"
danmoseley Apr 30, 2024
4d0a556
Merge branch 'main' into fixwebcilex
lewing May 3, 2024
44f4e9f
Merge branch 'main' into fixwebcilex
danmoseley May 4, 2024
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
89 changes: 52 additions & 37 deletions src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Build.Framework;
Expand Down Expand Up @@ -59,52 +60,66 @@ public override bool Execute()
continue;
}

var dllFilePath = candidate.ItemSpec;
var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
: OutputPath;

string finalWebcil = Path.Combine(candidatePath, webcilFileName);

if (Utils.IsNewerThan(dllFilePath, finalWebcil))
try
{
var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
var logAdapter = new LogAdapter(Log);
var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: logAdapter);
webcilWriter.ConvertToWebcil();

if (!Directory.Exists(candidatePath))
Directory.CreateDirectory(candidatePath);

if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
else
Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
TaskItem webcilItem = ConvertDll(tmpDir, candidate);
webCilCandidates.Add(webcilItem);
}
else
catch (Exception ex)
{
Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
Log.LogError($"Failed to convert '{candidate.ItemSpec}' to webcil: {ex.Message}");
return false;
}
}

WebCilCandidates = webCilCandidates.ToArray();
return true;
}

_fileWrites.Add(finalWebcil);
private TaskItem ConvertDll(string tmpDir, ITaskItem candidate)
{
var dllFilePath = candidate.ItemSpec;
var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
: OutputPath;

var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
string finalWebcil = Path.Combine(candidatePath, webcilFileName);

if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
{
string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
webcilItem.SetMetadata("RelatedAsset", relatedAsset);
Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
}
if (Utils.IsNewerThan(dllFilePath, finalWebcil))
{
var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
var logAdapter = new LogAdapter(Log);
var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: logAdapter);
webcilWriter.ConvertToWebcil();

webCilCandidates.Add(webcilItem);
if (!Directory.Exists(candidatePath))
Directory.CreateDirectory(candidatePath);

if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
else
Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
}
else
{
Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
}

WebCilCandidates = webCilCandidates.ToArray();
return true;
_fileWrites.Add(finalWebcil);

var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
{
string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
webcilItem.SetMetadata("RelatedAsset", relatedAsset);
Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
}

return webcilItem;
}
}