Skip to content

[browser] Use regex to match boot config placeholder #114897

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
merged 4 commits into from
Apr 23, 2025
Merged

[browser] Use regex to match boot config placeholder #114897

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cc3a11
Use regex to match boot config placeholder
maraf Apr 22, 2025
d278e14
Use generated regex
maraf Apr 22, 2025
85295d7
Revert "Use generated regex"
maraf Apr 22, 2025
c086039
Disable warning
maraf Apr 22, 2025
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 src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonBuilderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using Microsoft.Build.Utilities;

namespace Microsoft.NET.Sdk.WebAssembly
{
public class BootJsonBuilderHelper(TaskLoggingHelper Log, string DebugLevel, bool IsMultiThreaded, bool IsPublish)
{
#pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
internal static readonly Regex mergeWithPlaceholderRegex = new Regex(@"/\*!\s*dotnetBootConfig\s*\*/\s*{}");
#pragma warning restore SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.

private static readonly string[] coreAssemblyNames = [
"System.Private.CoreLib",
"System.Runtime.InteropServices.JavaScript",
Expand Down Expand Up @@ -56,7 +61,7 @@ public void WriteConfigToFile(BootJsonData config, string outputPath, string? ou
if (mergeWith != null)
{
string existingContent = File.ReadAllText(mergeWith);
output = existingContent.Replace("/*! dotnetBootConfig */{}", $"/*json-start*/{output}/*json-end*/");
output = mergeWithPlaceholderRegex.Replace(existingContent, e => $"/*json-start*/{output}/*json-end*/");
if (existingContent.Equals(output))
Log.LogError($"Merging boot config into '{mergeWith}' failed to find the placeholder.");
}
Expand Down
Loading