Rewrite WPF pack-URIs found in CLR strings

[warappa]

Issue

I'm developing a WPF application which uses WPF.UI.

With the newest ILRepack version (2.0.36) the XAML/BAML rewrite works great!
But unfortunately, WPF.UI tends to use hardcoded pack-uris in its code behind files (normal CLR strings). Those are not found/detected by ILRepack.

Eg.
https://github.com/lepoco/wpfui/blob/397739b85cfa616315740a360279f301847fa59d/src/Wpf.Ui/Controls/ContextMenu/ContextMenuLoader.xaml.cs#L45-L51

ResourceDictionary resourceDict =
    new()
    {
        Source = new Uri("pack://application:,,,/Wpf.Ui;component/Controls/ContextMenu/ContextMenu.xaml")
    };

Expectation

Could you try to generally detect "pack:..." strings and rewrite those also (so not only specific to WPF.UI)?

Info

.NET Framework 4.8
ILRepack 2.0.36
WPF.UI 4.0.0-rc.3

[warappa]

I got a POC working:
In XamlResourcePathPatcherStep change/add the following:

public void Perform()
{
    var types = _repackContext.TargetAssemblyDefinition.Modules.SelectMany(m => m.Types);

    _logger.Verbose("Processing XAML resource paths ...");
    foreach (var type in types)
    {
        PatchIComponentConnector(type);
        PatchWpfToolkitVersionResourceDictionary(type);
        PatchWpfPackStrings(type); // <-- Add this line
    }
}

// Add this method
private void PatchWpfPackStrings(TypeDefinition type)
{
    foreach (var method in type.Methods.Where(x => x.HasBody))
    {
        PatchMethod(method);
    }
}

This already is enough to find and patch all pack-uris and the application does not crash anymore but works as intended!

[KirillOsenkov]

Once you finalize on a solution that works for you, consider sending the PR. Unfortunately I don't have the resources to do it myself, but I could help with merging the PR and shipping an update.

[KirillOsenkov]

This is done, right? Shall we close?

[ricaun]

This is done, right? Shall we close?

This should be closed with the release 2.0.38.

I already tested and looks really promising, still waiting for the official release.

[KirillOsenkov]

Published https://github.com/gluck/il-repack/releases/tag/2.0.38