Update MonoGame.Framework/Content/ContentExtensions.cs #1293

Merged
merged 1 commit into from Feb 18, 2013

5 participants

@mooniscrazy

Old code will return static members as instance members.  This error will cause some xnb resource can't be loaded.

@mooniscrazy mooniscrazy Update MonoGame.Framework/Content/ContentExtensions.cs
Old code will return static members as instance members.  This error will cause some xnb resource can't be loaded.
f33585e
@tomspilman
MonoGame member

This looks ok... I need to give it a test first.

@mgbot
MonoGame member

Can one of the admins verify this patch?

@Aranda

This change looks good to me, but I'm not set up to manually test WINRT at the moment. I'm not sure if we have any unit tests that would cover this stuff (once the tests are back on line of course).

@tomspilman
MonoGame member

So a little complication here. We just applied the branch migration plans:

https://github.com/mono/MonoGame/wiki/Branch-Migration-Strategy

So the develop3d branch will stop being updated and eventually deleted. So that leaves you with a choice here:

  1. Close this PR and resubmit to the develop branch.
  2. Let me merge it with develop3d, but there will be a delay of a few days before it is moved into develop.
@tomspilman tomspilman merged commit 58a37cd into MonoGame:develop3d Feb 18, 2013

1 check passed

Details default Merged build finished.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment