Skip to content

Commit

Permalink
fix: Adjust support for custom target frameworks
Browse files Browse the repository at this point in the history
(cherry picked from commit 03b787c)
  • Loading branch information
jeromelaban authored and mergify[bot] committed Apr 2, 2024
1 parent 7050d24 commit e7dac5f
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion src/Uno.Wasm.Bootstrap/ShellTask.cs
Expand Up @@ -907,12 +907,16 @@ private void RunPackager()

var extraEmccFlagsPararm = string.Join(" ", extraEmccFlags).Replace("\\", "\\\\");

// Handle the `net8.0-browserwasm` case. The target framework is only
// used to generate the temporary aot classes, so the base TF is enough.
var baseTargetFramework = GetBaseTargetFramework();

packagerParams.Add(appDirParm);
packagerParams.Add(debugOption);
packagerParams.Add(monovmparams);
packagerParams.Add("--zlib");
packagerParams.Add($"--illinker-path=\"{_linkerBinPath}\"");
packagerParams.Add($"--target-framework=\"{TargetFramework}\"");
packagerParams.Add($"--target-framework=\"{baseTargetFramework}\"");
packagerParams.Add("--enable-fs ");
packagerParams.Add($"--extra-emccflags=\"{extraEmccFlagsPararm} -l idbfs.js\" ");
packagerParams.Add($"--extra-linkerflags=\"{extraLinkerFlags}\"");
Expand Down Expand Up @@ -1057,6 +1061,16 @@ private void RunPackager()
}
}

private string GetBaseTargetFramework()
{
var platformIndex = TargetFramework.IndexOf("-");
var baseTargetFramework = platformIndex > -1
? TargetFramework.Substring(0, platformIndex)
: TargetFramework;

return baseTargetFramework;
}

private void CleanupLinkerRemovedFiles(string workAotPath)
{
// Debugger.Launch();
Expand Down

0 comments on commit e7dac5f

Please sign in to comment.