Skip to content
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.

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

Created new XamlModuleCatalog #2175

Merged
merged 8 commits into from
Aug 22, 2020
Merged

Created new XamlModuleCatalog #2175

merged 8 commits into from
Aug 22, 2020

Conversation

brianlagunas
Copy link
Member

@brianlagunas brianlagunas commented Aug 22, 2020

Description of Change

Created a new XamlModuleCatalog for WPF. This fixed a number of issues with trying to use a XAML resource file as a module catalog in .NET Core and by placing modules in subdirectories.

Bugs Fixed

API Changes

Changed from this:

        protected override IModuleCatalog CreateModuleCatalog()
        {
            return ModuleCatalog.CreateFromXaml(new Uri("/Modules;component/ModuleCatalog.xaml", UriKind.Relative));
        }

To this:

        protected override IModuleCatalog CreateModuleCatalog()
        {
            return new XamlModuleCatalog("ModuleCatalog.xaml");
        }

Behavioral Changes

This will be a breaking change as I have removed the old crappy way of creating a XAML module catalog.

PR Checklist

  • Has tests (if omitted, state reason in description)
  • Rebased on top of master at time of PR
  • Changes adhere to coding standard

this will not only fix the XAML resource catalog bugs, but makes it easier to implement.
@brianlagunas brianlagunas changed the title CReated new XamlModuleCatalog Created new XamlModuleCatalog Aug 22, 2020
@brianlagunas brianlagunas added DO-NOT-MERGE-!!! 🛑 Pull Request should not be merged in it's current state WPF labels Aug 22, 2020
@brianlagunas brianlagunas removed the DO-NOT-MERGE-!!! 🛑 Pull Request should not be merged in it's current state label Aug 22, 2020
@Coder-Nut
Copy link

Great job!!

@dansiegel dansiegel merged commit 463d18a into master Aug 22, 2020
@dansiegel dansiegel deleted the xaml-catalog branch August 22, 2020 18:21
@dansiegel dansiegel added this to the Prism 8.0 milestone Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants