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

[corlib] Enable machine.config dependant version of CryptoConfig for net_4_x profile only #7871

Merged
merged 2 commits into from Apr 3, 2018

Conversation

marek-safar
Copy link
Member

Fixes #7716

#if FULL_AOT_DESKTOP // TODO: why is this special cased? we could use AesManaged like other full AOT profiles
name = "System.Security.Cryptography.AesCryptoServiceProvider, System.Core";
#else
#if MONOTOUCH || XAMMAC
Copy link
Member

Choose a reason for hiding this comment

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

this would need to add XAMMAC_4_5 to keep the previous meaning. But I think we should just go with AesManaged on all !FEATURE_CRYPTO_CONFIGURABLE platforms.

Copy link
Member Author

Choose a reason for hiding this comment

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

The file was not used before with XAMMAC_4_5 and it returned null for the value (that's another bug).

.NET returns AesCryptoServiceProvider and I don't think we need to break the compatibility here. My preference would be to remove if MONOTOUCH || XAMMAC instead but that needs more work

Copy link
Member

Choose a reason for hiding this comment

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

Oh right, I got confused by all the conditions here :)

@marek-safar
Copy link
Member Author

@monojenkins backport 2018-02

@marek-safar
Copy link
Member Author

@monojenkins commit apidiff

monojenkins added a commit to mono/api-snapshot that referenced this pull request Mar 29, 2018
@luhenry
Copy link
Contributor

luhenry commented Mar 29, 2018

@monojenkins build Linux i386 Coop GC

@luhenry
Copy link
Contributor

luhenry commented Mar 29, 2018

@monojenkins build Windows i386

@marek-safar marek-safar closed this Apr 3, 2018
@marek-safar marek-safar reopened this Apr 3, 2018
@marek-safar
Copy link
Member Author

@monojenkins backport 2018-04

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.

mono's mscorlib.xml descriptor file seems incomplete for Xamarin.Mac
3 participants