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

fix: Improve reliability of embedded resources resolving #1564

Merged
merged 8 commits into from
May 14, 2021

Conversation

rouke-broersma
Copy link
Member

Fix #1501
Supersedes #1502

@FrankvdStam I tested and cleaned up the PR. Looks good to me! I noticed you branched off of v1 but since this is a fix it can go straight to master. I created a new branch to fix this and cherry-picked your fixes onto it.

FrankvdStam and others added 7 commits May 14, 2021 11:23
…er.cs, removed conditional compilation. First it tries to resolve the .NET core way, if that doesn't work it proceeds with the .NET framework way.

EmbeddedResourcesGenerator.cs now passes the added CustomAssemblyResolver to LoadModule call to override the default resolving behavior. This object is re-created for each call, maybe it can be instantiated once? Not sure what the lifecycle should be.
@sonarcloud
Copy link

sonarcloud bot commented May 14, 2021

@rouke-broersma rouke-broersma merged commit 6991b60 into master May 14, 2021
@rouke-broersma rouke-broersma deleted the 1502_fix_embedded_resources_resolving branch May 14, 2021 12:47
@rouke-broersma
Copy link
Member Author

@FrankvdStam This fix has been released in 0.22.4. Please go ahead and test if this works for your case :)

@FrankvdStam
Copy link
Contributor

I'll try but it'll be a while. Thanks anyway :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants