Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[Xaml] still load Xaml from old assemblies... #1224

Merged
merged 1 commit into from
Oct 24, 2017

Conversation

StephaneDelcroix
Copy link
Member

@StephaneDelcroix StephaneDelcroix commented Oct 24, 2017

Description of Change

if the project references an assembly that was generated using a Xamlg version not creating XamlResourceId, we need to fallback to the old logic to load xaml controls from those assemblies.

Bugs Fixed

  • not reported yet

API Changes

/

Behavioral Changes

/

PR Checklist

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

@@ -154,7 +154,7 @@ static string GetXamlForType(Type type)
var assembly = typeInfo.Assembly;
var resourceId = typeInfo.GetCustomAttribute<XamlResourceIdAttribute>()?.ResourceId;
if (resourceId == null)
return null;
return LegacyGetXamlForType(type);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this were I should add a Task.Delay(1000); to force new adoption

@StephaneDelcroix StephaneDelcroix merged commit 932b543 into master Oct 24, 2017
@StephaneDelcroix StephaneDelcroix deleted the restoreXamlLoading branch October 24, 2017 11:29
@samhouts samhouts added this to the 3.0.0 milestone May 5, 2018
@samhouts samhouts modified the milestones: 3.0.0, 2.5.0 Aug 23, 2019
@samhouts samhouts modified the milestones: 3.0.0, 2.5.0 Oct 29, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants