Skip to content

Commit

Permalink
Bump mono and Xamarin.MacDev to head of their branches
Browse files Browse the repository at this point in the history 
Commit list for xamarin/Xamarin.MacDev:

* xamarin/Xamarin.MacDev@e79c9d0 Merge pull request xamarin#23 from xamarin/master-to-d15-7-cps
* xamarin/Xamarin.MacDev@cd2823e Add NFC entitlement key to EntitlementKeys (xamarin#22)
* xamarin/Xamarin.MacDev@df960c4 Add AllKeys property and GetEntitlementsKeys method (xamarin#20)
* xamarin/Xamarin.MacDev@f5e89be Add missing data protection entitlement key (xamarin#19)

Diff: xamarin/Xamarin.MacDev@2cff0d7...e79c9d0

Commit list for mono/mono:

* mono/mono@131c3dd6751 Add icall to configure MERP options / enable it
* mono/mono@c836aa14afe Add optional Microsoft Telemetry unmanaged dumper
* mono/mono@5dae72b19bd Update source file location from commit d4816ef1abcfc5b3dea41a87fe5a7a4c4a3781ed
* mono/mono@40506810988 [tests] Disable delegate-15.exe in the full-aot profile. (xamarin#7529) (xamarin#7564)

Diff: mono/mono@ef8ab49...131c3dd
  • Loading branch information
@spouliot
spouliot committed Mar 13, 2018
1 parent 98837db commit 6a7ef2e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion external/Xamarin.MacDev
Submodule Xamarin.MacDev updated 1 files
+29 −0 Xamarin.MacDev/EntitlementExtensions.cs
2 changes: 1 addition & 1 deletion external/mono
Submodule mono updated 11 files
+1 −1 configure.ac
+1 −1 mcs/class/System.XML/mobile_System.Xml.dll.sources
+25 −0 mcs/class/corlib/Mono/Runtime.cs
+3 −1 mono/metadata/icall-def.h
+23 −0 mono/metadata/icall.c
+22 −0 mono/mini/mini-exceptions.c
+1 −1 mono/mini/mini-runtime.c
+3 −0 mono/tests/Makefile.am
+2 −0 mono/utils/Makefile.am
+500 −0 mono/utils/mono-merp.c
+53 −0 mono/utils/mono-merp.h

0 comments on commit 6a7ef2e

Please sign in to comment.