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.

Sign up for GitHub

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

Jump to bottom

Bump to mono:2019-10 #7192

Merged
merged 42 commits into from
Dec 4, 2019
Merged

Bump to mono:2019-10 #7192

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
daf601a
Bump to mono:2019-10
directhex Oct 8, 2019
b9f1a4e
Fixing
thaystg Oct 8, 2019
03a51a4
Changing the name of the method that is used from linker. Because of …
thaystg Oct 8, 2019
3a9195a
Adding OutputException.cs file on mtouch.csproj.
thaystg Oct 8, 2019
b77c350
Bump mono.
thaystg Oct 11, 2019
ae6a398
Removing enter_gc_safe and exit_gc_safe because now it's already gc_s…
thaystg Oct 15, 2019
588ad3f
Adding another known exception to LLVM exception list.
thaystg Oct 16, 2019
1d2931e
Bump mono
thaystg Oct 16, 2019
c107c9e
Adding another known exception to LLVM exception list.
thaystg Oct 16, 2019
9878608
Merge branch 'master' into mono-2019-10
thaystg Oct 17, 2019
7fac28c
Needs this ifdef because of this https://github.com/mono/mono/pull/17…
thaystg Oct 17, 2019
192258f
Adding another known exception to LLVM exception list.
thaystg Oct 18, 2019
531bd8e
Enabling again System.Net.Security.Tests.
thaystg Oct 21, 2019
2163fd3
Bump mono
thaystg Oct 21, 2019
c64bf2b
Merge branch 'master' into mono-2019-10
thaystg Oct 21, 2019
61b14a9
Disabling again System.Net.Security.Tests.
thaystg Oct 22, 2019
4c4e81c
Bump mono
thaystg Oct 23, 2019
e0ab67b
Bump mono
thaystg Oct 24, 2019
82b57b7
Bump mono
thaystg Oct 25, 2019
bed9f2e
Bump mono
thaystg Oct 29, 2019
0ee9486
Bump mono
thaystg Nov 1, 2019
aa7c88e
Bump mono
thaystg Nov 6, 2019
7cbfa3a
Bring HttpClient from CoreFX. (#7346)
Nov 6, 2019
c708900
Fix wrong url from merge.
mandel-macaque Nov 6, 2019
0c78868
Remove space.
mandel-macaque Nov 6, 2019
3603c30
Merge branch 'master' into mono-2019-10
mandel-macaque Nov 6, 2019
0c7fc04
[Tests] Ignore tests that fail on 32b.
mandel-macaque Nov 7, 2019
db7c4d3
Merge branch 'master' into mono-2019-10
mandel-macaque Nov 8, 2019
42b3b16
Merge branch 'master' into mono-2019-10
mandel-macaque Nov 11, 2019
04e8742
Merge branch 'master' into mono-2019-10
mandel-macaque Nov 12, 2019
5880014
Bump mono.
mandel-macaque Nov 12, 2019
0a79672
bump mono.
thaystg Nov 21, 2019
0195d2c
[tests] Ignore a couple of tests causing OOM.
rolfbjarne Dec 2, 2019
43b0fc1
bump mono.
thaystg Dec 2, 2019
359410f
Merge remote-tracking branch 'origin/master' into mono-2019-10
rolfbjarne Dec 2, 2019
96f890a
Ignore MM0135 test on Catalina+ because it needs Xcode 9.4.
rolfbjarne Dec 3, 2019
fd39c25
Merge remote-tracking branch 'origin/master' into mono-2019-10
rolfbjarne Dec 3, 2019
e2d2f49
[monotouch-test] Add null checks for teardown when test didn't run be…
rolfbjarne Dec 3, 2019
7a0ba27
[CFNetwork]: Http 2.0 requires OS X 10.11 or later.
Dec 3, 2019
c51ef02
Remove accidental bump to macios-binaries
akoeplinger Dec 3, 2019
ec31e93
Fix logic
akoeplinger Dec 3, 2019
0c957d2
Put back skipping of test on OSX 10.10
akoeplinger Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ include $(TOP)/mk/mono.mk
MONO_HASH := $(NEEDED_MONO_VERSION)

# Minimum Mono version for building XI/XM
MIN_MONO_VERSION=6.6.0.117
MAX_MONO_VERSION=6.6.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-08/117/617f399efca133f357cb8207bc7f58b1120f12f1/MonoFramework-MDK-6.6.0.117.macos10.xamarin.universal.pkg

MIN_MONO_VERSION=6.8.0.0
MAX_MONO_VERSION=6.8.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-10/44/844a1d5127bede16a686bebd60a98169d8db1f10/MonoFramework-MDK-6.8.0.40.macos10.xamarin.universal.pkg

# Minimum Mono version for Xamarin.Mac apps using the system mono
MIN_XM_MONO_VERSION=6.4.0.94
Expand Down
5 changes: 3 additions & 2 deletions mk/mono.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
NEEDED_MONO_VERSION := b601371d5f0b853b133608be25a18ea37f7628ed
NEEDED_MONO_BRANCH := 2019-08
NEEDED_MONO_VERSION := 844a1d5127bede16a686bebd60a98169d8db1f10
NEEDED_MONO_BRANCH := 2019-10


MONO_DIRECTORY := mono
MONO_MODULE := https://github.com/mono/mono
2 changes: 0 additions & 2 deletions runtime/monotouch-main.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,7 @@ - (void) memoryWarning: (NSNotification *) sender

mono_domain_set_config (mono_domain_get (), base_dir, config_file_name);

MONO_ENTER_GC_SAFE;
rv = xamarin_extension_main (argc, argv);
MONO_EXIT_GC_SAFE;
break;
case XamarinLaunchModeApp:
rv = mono_jit_exec (mono_domain_get (), assembly, managed_argc, managed_argv);
Expand Down
4 changes: 4 additions & 0 deletions src/Foundation/NSUrlSessionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,11 @@ protected override void Dispose (bool disposing)
base.Dispose (disposing);
}

#if __WATCHOS__
protected override Task SerializeToStreamAsync (Stream stream, TransportContext context)
#else
protected internal override Task SerializeToStreamAsync (Stream stream, TransportContext context)
#endif
{
if (contentCopied) {
if (!content.CanSeek) {
Expand Down
2 changes: 1 addition & 1 deletion tests/bcl-test/macOSModern-xammac_net_4_5_System_xunit-test.dll.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ System.Net.Security.Tests.ApmSslStreamSystemDefaultTest.ClientAndServer_OneOrBot
System.Net.Security.Tests.ClientDefaultEncryptionTest.ClientDefaultEncryption_ServerRequireEncryption_ConnectWithEncryption
System.Net.Security.Tests.ClientDefaultEncryptionTest.ClientDefaultEncryption_ServerAllowNoEncryption_ConnectWithEncryption
System.Net.Security.Tests.ServerAllowNoEncryptionTest.ServerAllowNoEncryption_ClientAllowNoEncryption_ConnectWithEncryption
KLASS:System.Net.Security.Tests.SslStreamSniTest
Copy link
Member

Choose a reason for hiding this comment

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

LOVE all this red. LOVE IT.

KLASS:System.Net.Security.Tests.SslStreamSniTest
13 changes: 13 additions & 0 deletions tests/mtouch/SdkTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,23 @@ static string [] GetWatchOSAssemblies ()
"LLVM failed for '<SendFrameFallbackAsync>d__56.MoveNext': non-finally/catch/fault clause.",
"LLVM failed for '<ReceiveAsyncPrivate>d__61`2.MoveNext': non-finally/catch/fault clause.",
"LLVM failed for '<ReceiveAsyncPrivate>d__61`2.MoveNext': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.Read': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.Write': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.BeginRead': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.EndRead': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.BeginWrite': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.EndWrite': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.ReadAsync': non-finally/catch/fault clause.",
"LLVM failed for 'NetworkStream.WriteAsync': non-finally/catch/fault clause.",
}) },
{ "System.Core.dll", new Tuple<int, string[]> (0, new string [] {
"LLVM failed for 'EnterTryCatchFinallyInstruction.Run': non-finally/catch/fault clause.",
}) },
{ "System.Net.Http.dll", new Tuple<int, string[]> (0, new string [] {
"LLVM failed for 'HttpContent.CopyToAsync': non-finally/catch/fault clause.",
"LLVM failed for 'HttpContent.LoadIntoBufferAsync': non-finally/catch/fault clause.",
"LLVM failed for '<CopyToAsyncCore>d__47.MoveNext': non-finally/catch/fault clause.",
}) },
{ "mscorlib.dll", new Tuple<int, string[]> (0, new string [] {
"LLVM failed for 'Console.Write': opcode arglist",
"LLVM failed for 'Console.WriteLine': opcode arglist",
Expand Down
4 changes: 2 additions & 2 deletions tools/linker/MobileSweepStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ protected void SweepMainModule (ModuleDefinition main)
// or they can point to nothing which will break later (e.g. when re-loading for stripping IL)
// reference: https://bugzilla.xamarin.com/show_bug.cgi?id=36577
if (main.HasExportedTypes)
SweepCollectionNonAttributable (main.ExportedTypes);
SweepCollectionMetadata (main.ExportedTypes);
// only when linking should we remove module references, if we (re)save the assembly then
// the entrypoints (for p/invokes) will be required later
// reference: https://bugzilla.xamarin.com/show_bug.cgi?id=35372
if (main.HasModuleReferences && (CurrentAction == AssemblyAction.Link))
SweepCollectionNonAttributable (main.ModuleReferences);
SweepCollectionMetadata (main.ModuleReferences);
}
}
}
3 changes: 3 additions & 0 deletions tools/mmp/mmp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\XApiReader.cs">
<Link>Linker\XApiReader.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OutputException.cs">
<Link>Linker\OutputException.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
<Link>Linker.Steps\BaseStep.cs</Link>
</Compile>
Expand Down
3 changes: 3 additions & 0 deletions tools/mtouch/mtouch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodAction.cs">
<Link>Linker\MethodAction.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OutputException.cs">
<Link>Linker\OutputException.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
<Link>Linker.Steps\BaseStep.cs</Link>
</Compile>
Expand Down