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

Upgrade to SharpDX 4.0.1 #5949

Merged
merged 2 commits into from
Sep 21, 2017
Merged

Upgrade to SharpDX 4.0.1 #5949

merged 2 commits into from
Sep 21, 2017

Conversation

Jjagg
Copy link
Contributor

@Jjagg Jjagg commented Sep 20, 2017

Not much to do here apart from upgrading the references and dependencies. The dll's are the ones that target .NET Standard 1.1 so we can use them for both DX and UWP. I did need the .NET 4.5 dll for MediaFoundation because CreateSampleGrabberSinkActivate is only available on Desktop and thus not in the .NET Standard assembly.

@SimonDarksideJ
Copy link
Contributor

Woot, that was quick @Jjagg
I seem to recall you mentioning something last time we tried to update to SharpDX4, regarding some renderer fix that might be needed?

@Jjagg
Copy link
Contributor Author

Jjagg commented Sep 20, 2017

I don't really remember, but all porting issues were resolved with the 3.x upgrade.

EDIT: It seems the build bot won't run tests (I guess because no code changed), but everything passes locally :)

@tomspilman
Copy link
Member

@Jjagg - Doesn't this depend on MonoGame/MonoGame.Dependencies#111 ?

@Jjagg
Copy link
Contributor Author

Jjagg commented Sep 20, 2017

Yes, it does. Sorry, forgot to mention that 😅
Not sure how this is even building without it. I guess the build bot doesn't clear out bin folders and Protobuild only warns about missing dependencies, not error on them?

@SimonDarksideJ
Copy link
Contributor

So is this good to go @Jjagg assuming the other PR is merged as well. Or is it worth closing the other PR and bringing the changes in to this PR?

@KonajuGames
Copy link
Contributor

Dependencies PR is merged.

@tomspilman
Copy link
Member

@Jjagg - Go ahead and update the dependencies now that it is merged.

@SimonDarksideJ
Copy link
Contributor

Woot, this is certainly something to shout about.

@SimonDarksideJ
Copy link
Contributor

This will just need merging now once #5951 is merged. TO keep the SharpDX upgrade aligned

@tomspilman
Copy link
Member

This seems good to merge now... thanks @Jjagg !

@tomspilman tomspilman added this to the 3.7 Release milestone Sep 21, 2017
@tomspilman tomspilman merged commit 4f65829 into MonoGame:develop Sep 21, 2017
nkast pushed a commit to nkast/MonoGame that referenced this pull request Jun 26, 2018
* Upgrade SharpDX dependencies

* Upgrade references
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.

4 participants