Skip to content

Bump mono and Xamarin.MacDev to head of their branches - #3736

Merged
spouliot merged 2 commits into
dotnet:d15-7from
spouliot:d15-7-mono-bump-20180313
Mar 14, 2018
Merged

Bump mono and Xamarin.MacDev to head of their branches#3736
spouliot merged 2 commits into
dotnet:d15-7from
spouliot:d15-7-mono-bump-20180313

Conversation

@spouliot

@spouliot spouliot commented Mar 13, 2018

Copy link
Copy Markdown
Contributor

Commit list for xamarin/Xamarin.MacDev:

Diff: dotnet/macios-devtools@2cff0d7...e79c9d0

Commit list for mono/mono:

Diff: mono/mono@ef8ab49...131c3dd

edit: second mono bump
Commit list for mono/mono:

Diff: mono/mono@131c3dd...a7adb18

Commit list for xamarin/Xamarin.MacDev:

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

Diff: dotnet/macios-devtools@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. (dotnet#7529) (dotnet#7564)

Diff: mono/mono@ef8ab49...131c3dd
@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

@lewurm

lewurm commented Mar 13, 2018

Copy link
Copy Markdown
Contributor

mono build failure should be fixed by mono/mono#7605

Commit list for mono/mono:

* mono/mono@a7adb18ce2f only target macOS, HOST_DARWIN includes iOS etc. as well

Diff: mono/mono@131c3dd...a7adb18
@spouliot

Copy link
Copy Markdown
Contributor Author

build

@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

1 similar comment
@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

@spouliot

Copy link
Copy Markdown
Contributor Author

random NRE in mac's DSACryptoServiceProviderTest.Persistence_PersistKeyInCsp_False -> https://github.com/xamarin/maccore/issues/640

@spouliot
spouliot merged commit 9ff86d8 into dotnet:d15-7 Mar 14, 2018
@spouliot
spouliot deleted the d15-7-mono-bump-20180313 branch March 14, 2018 16:12
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.

6 participants