From c10090095e272d2fe6dd7bd3bc2a1a82380fa18d Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 15 Feb 2018 19:17:22 +0000 Subject: [PATCH 1/2] Imported Upstream version 5.10.0.116 Former-commit-id: 8f2f8afd053f1b5b4b35b0827e7a9424613038ae --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/cecil/Mono.Cecil.Tests.props | 13 ++++++---- external/cecil/Mono.Cecil.props | 11 ++++---- external/cecil/Test/Mono.Cecil.Tests.csproj | 4 +-- .../Test/Mono.Cecil.Tests/AssemblyTests.cs | 14 ++++++++++ .../Resources/assemblies/SQLite-net.dll.mdb | Bin 0 -> 22513 bytes mcs/build/common/Consts.cs | 2 +- .../Mono.Debugger.Soft/Test/dtest-app.cs | 19 ++++++++++++++ .../Test/dtest.cs.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- .../xbuild/data/deniedAssembliesList.txt | 18 +++++-------- mono/metadata/image.c | 24 ++++++++++-------- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/aot-runtime.c.REMOVED.git-id | 2 +- mono/mini/aot-runtime.h | 13 +++++++--- mono/mini/debugger-agent.c.REMOVED.git-id | 2 +- mono/mini/mini-llvm.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 48 files changed, 115 insertions(+), 73 deletions(-) create mode 100644 external/cecil/Test/Resources/assemblies/SQLite-net.dll.mdb diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index afdfe8bd2e..62ad3a0188 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -df960e3f494b0d30d808c1bd44ee0be557e4ca67 \ No newline at end of file +1ec1f13b23336e839dceed8ccd6731dd02720915 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 638b0e110d..e82c460b03 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -0da7de0818f03e991729bf29ede5a6c90311c912 \ No newline at end of file +3d0bab926f5da4bfa2c3b38e7dad08f280c2228b \ No newline at end of file diff --git a/external/cecil/Mono.Cecil.Tests.props b/external/cecil/Mono.Cecil.Tests.props index e4a4031565..49c1a386f1 100644 --- a/external/cecil/Mono.Cecil.Tests.props +++ b/external/cecil/Mono.Cecil.Tests.props @@ -5,10 +5,13 @@ true - + true - + + false + + 3.7.1 @@ -17,9 +20,9 @@ 3.8.0 - + - + False $(MSBuildThisFileDirectory)\Test\libs\nunit-2.6.2\nunit.core.dll @@ -37,7 +40,7 @@ + Condition="$(AutoGenerateBindingRedirects)"> true diff --git a/external/cecil/Mono.Cecil.props b/external/cecil/Mono.Cecil.props index 366603e2a9..aef3a98a3f 100644 --- a/external/cecil/Mono.Cecil.props +++ b/external/cecil/Mono.Cecil.props @@ -14,6 +14,7 @@ $(MSBuildToolsPath)\Microsoft.CSharp.targets true false + false true @@ -42,13 +43,13 @@ v4.0 $(DefineConstants);NET_4_0; - - netcoreapp2.0 - netstandard1.3 + + netcoreapp2.0 + netstandard1.3 - + - + diff --git a/external/cecil/Test/Mono.Cecil.Tests.csproj b/external/cecil/Test/Mono.Cecil.Tests.csproj index a8c4d0eac6..45856234a3 100644 --- a/external/cecil/Test/Mono.Cecil.Tests.csproj +++ b/external/cecil/Test/Mono.Cecil.Tests.csproj @@ -6,7 +6,7 @@ Mono.Cecil.Tests Mono.Cecil.Tests - + 4.3.0 @@ -50,5 +50,5 @@ - + \ No newline at end of file diff --git a/external/cecil/Test/Mono.Cecil.Tests/AssemblyTests.cs b/external/cecil/Test/Mono.Cecil.Tests/AssemblyTests.cs index af45a3c4c4..0b7c7c1f3b 100644 --- a/external/cecil/Test/Mono.Cecil.Tests/AssemblyTests.cs +++ b/external/cecil/Test/Mono.Cecil.Tests/AssemblyTests.cs @@ -89,5 +89,19 @@ namespace Mono.Cecil.Tests { Assert.AreEqual (module.AssemblyReferences [0], module.TypeSystem.CoreLibrary); }, verify: !Platform.OnMono); } + + [Test] + public void MismatchedLibraryAndSymbols_DoNotThrow () + { + // SQLite-net.dll (from nuget) shiped with mismatched symbol files, but throwIfNoSymbol did not prevent it from throwing + var readerParms = new ReaderParameters { + ReadSymbols = true, + SymbolReaderProvider = new Cil.DefaultSymbolReaderProvider (throwIfNoSymbol: false) + }; + + using (var module = GetResourceModule ("SQLite-net.dll", readerParms)) { + Assert.Null (module.SymbolReader); + } + } } } diff --git a/external/cecil/Test/Resources/assemblies/SQLite-net.dll.mdb b/external/cecil/Test/Resources/assemblies/SQLite-net.dll.mdb new file mode 100644 index 0000000000000000000000000000000000000000..8b3583a29df22044672c999e0b4e6abbb20550c5 GIT binary patch literal 22513 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 0 && args [0] == "step-out-void-async") { + var wait = new ManualResetEvent (false); + step_out_void_async (wait); + wait.WaitOne ();//Don't exist until step_out_void_async is executed... + return 0; + } assembly_load (); breakpoints (); single_stepping (); @@ -1726,6 +1732,19 @@ public class Tests : TestsBase, ITest2 { UninitializedClass.Call();//Breakpoint here and step in } + + [MethodImplAttribute (MethodImplOptions.NoInlining)] + static async void step_out_void_async (ManualResetEvent wait) + { + await Task.Yield (); + step_out_void_async_2 (); + wait.Set (); + } + + [MethodImplAttribute (MethodImplOptions.NoInlining)] + static void step_out_void_async_2 () + { + } } public class SentinelClass : MarshalByRefObject { diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id index 6a81faf8ff..999b3070f0 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id @@ -1 +1 @@ -baa41091ff26fd05cb8ef05525565e96e4d31f82 \ No newline at end of file +6e48d3edd50a7737adc6ec6d9325e46139ed8ffc \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index ea80fa1871..d1c84aeb8b 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bcddfd5f8af86e0b05fd9c450ea4edada90bb493 \ No newline at end of file +3528a4d084d9db2620ae927a78704f2fdc4dde09 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index 018eeb69a8..6b397c94f9 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5 \ No newline at end of file +d09b9a3a1574069b1e574798dbd6483681665184 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index 4055b1ede9..8b1a9686df 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7d093351bb4b8ff663b2f39fa536221188341b25 \ No newline at end of file +598dca2f70bb95b4532acc6da208566dc4893deb \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index f1475299b9..67d09dc45e 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -647964d71fe4b956b19eea16d85d62a6a31d0214 \ No newline at end of file +38f717388041bdb3e62229118e44818753615a33 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index 20adc3282c..5ea7387559 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ce49c39b40d2ff5525da2fc5badbdfeed1ad5766 \ No newline at end of file +126bb76fe92fca40a38be6608587a58a3257b9a6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index cbe5770f18..0d0f4bf6a6 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -f78e411b0e0ef98a22b4d4e0092347189395dcf8 \ No newline at end of file +6862f39b66c913f59d89f0548ee8df36a44c18ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index f1bd6e787e..e771919ac1 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1c80cfd07f438371c803270dfa1d3df05d5565b5 \ No newline at end of file +4d4451e4c348d6415ad163198098b22ccfc16145 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index ea80fa1871..d1c84aeb8b 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bcddfd5f8af86e0b05fd9c450ea4edada90bb493 \ No newline at end of file +3528a4d084d9db2620ae927a78704f2fdc4dde09 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index 018eeb69a8..6b397c94f9 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5 \ No newline at end of file +d09b9a3a1574069b1e574798dbd6483681665184 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index 4055b1ede9..8b1a9686df 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7d093351bb4b8ff663b2f39fa536221188341b25 \ No newline at end of file +598dca2f70bb95b4532acc6da208566dc4893deb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index f1475299b9..67d09dc45e 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -647964d71fe4b956b19eea16d85d62a6a31d0214 \ No newline at end of file +38f717388041bdb3e62229118e44818753615a33 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index 20adc3282c..5ea7387559 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ce49c39b40d2ff5525da2fc5badbdfeed1ad5766 \ No newline at end of file +126bb76fe92fca40a38be6608587a58a3257b9a6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index cbe5770f18..0d0f4bf6a6 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -f78e411b0e0ef98a22b4d4e0092347189395dcf8 \ No newline at end of file +6862f39b66c913f59d89f0548ee8df36a44c18ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index f1bd6e787e..e771919ac1 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1c80cfd07f438371c803270dfa1d3df05d5565b5 \ No newline at end of file +4d4451e4c348d6415ad163198098b22ccfc16145 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index ea80fa1871..d1c84aeb8b 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bcddfd5f8af86e0b05fd9c450ea4edada90bb493 \ No newline at end of file +3528a4d084d9db2620ae927a78704f2fdc4dde09 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index 018eeb69a8..6b397c94f9 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5 \ No newline at end of file +d09b9a3a1574069b1e574798dbd6483681665184 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index 4055b1ede9..8b1a9686df 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7d093351bb4b8ff663b2f39fa536221188341b25 \ No newline at end of file +598dca2f70bb95b4532acc6da208566dc4893deb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index f1475299b9..67d09dc45e 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -647964d71fe4b956b19eea16d85d62a6a31d0214 \ No newline at end of file +38f717388041bdb3e62229118e44818753615a33 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index 20adc3282c..5ea7387559 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ce49c39b40d2ff5525da2fc5badbdfeed1ad5766 \ No newline at end of file +126bb76fe92fca40a38be6608587a58a3257b9a6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index cbe5770f18..0d0f4bf6a6 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -f78e411b0e0ef98a22b4d4e0092347189395dcf8 \ No newline at end of file +6862f39b66c913f59d89f0548ee8df36a44c18ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index f1bd6e787e..e771919ac1 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1c80cfd07f438371c803270dfa1d3df05d5565b5 \ No newline at end of file +4d4451e4c348d6415ad163198098b22ccfc16145 \ No newline at end of file diff --git a/mcs/tools/xbuild/data/deniedAssembliesList.txt b/mcs/tools/xbuild/data/deniedAssembliesList.txt index 3f65aab987..721fc12ef9 100644 --- a/mcs/tools/xbuild/data/deniedAssembliesList.txt +++ b/mcs/tools/xbuild/data/deniedAssembliesList.txt @@ -5,6 +5,13 @@ System.Runtime.InteropServices.RuntimeInformation.dll,F580BAAC-12BD-4716-B486-C0 System.Threading.Overlapped.dll,212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD,4,1,0,0 System.Runtime.InteropServices.RuntimeInformation.dll,33D296D9-EE6D-404E-BF9F-432A429FF5DA,4,0,2,0 System.Runtime.InteropServices.RuntimeInformation.dll,E5AE3324-2100-4F77-9E41-AEEF226C9649,4,0,2,0 +System.Globalization.Extensions.dll,28006E9A-74DB-45AC-8A8D-030CEBAA272A,4,1,0,0 +System.IO.Compression.dll,1332CE2F-1517-4BD7-93FD-7D4BCFBAED66,4,2,0,0 +System.Net.Http.dll,8E2F55F3-D010-417B-A742-21386EDDD388,4,2,0,0 +System.Runtime.InteropServices.RuntimeInformation.dll,6D334D4D-0149-4D07-9DEF-CC52213145CE,4,0,2,0 +System.Threading.Overlapped.dll,F4FFC4A6-E694-49D9-81B2-12F2C9A29652,4,1,0,0 +System.Runtime.InteropServices.RuntimeInformation.dll,CA2D23DE-55E1-45D8-9720-0EBE3EEC1DF2,4,0,2,0 +System.Runtime.InteropServices.RuntimeInformation.dll,0C4BCFB3-F609-4631-93A6-17B19C69D9B6,4,0,2,0 System.Globalization.Extensions.dll,FC1439FC-C1B8-4DB1-914D-165CCFA77002,4,1,0,0 System.IO.Compression.dll,05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4,4,2,0,0 System.Net.Http.dll,DB06A592-E332-44A1-8B85-20CAB3C3C147,4,2,0,0 @@ -16,17 +23,6 @@ System.IO.Compression.dll,C786B28D-0850-4D4C-AED9-FE6B86EE7C31,4,2,0,0 System.Net.Http.dll,903A137B-BB3F-464A-94D4-780B89EE5580,4,2,0,0 System.Threading.Overlapped.dll,3336A2A3-1772-4EF9-A74B-AFDC80A8B21E,4,1,0,0 System.Runtime.InteropServices.RuntimeInformation.dll,D87389D8-6E9C-48CF-B128-3637018577AF,4,0,2,0 -System.Globalization.Extensions.dll,B9BA8638-25D2-4A3B-B91F-16B3D3799861,4,1,0,0 -System.IO.Compression.dll,35DD20B5-8766-476B-B5D2-0EA16EF0A946,4,2,0,0 -System.Net.Http.dll,27BBDD4C-EAF0-4A95-B172-EE502D76A725,4,2,0,0 -System.Runtime.InteropServices.RuntimeInformation.dll,E46BA45E-6A63-47CD-AF70-2C3016AFF75A,4,0,2,0 -System.Threading.Overlapped.dll,A0439CB6-A5E6-4813-A76C-13F92ADDDED5,4,1,0,0 -System.Runtime.InteropServices.RuntimeInformation.dll,488CE209-4E5D-40E7-BE8C-F81F2B99F13A,4,0,2,0 -System.Globalization.Extensions.dll,1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B,4,1,0,0 -System.IO.Compression.dll,8DBD1669-97BC-4190-9BD8-738561193741,4,2,0,0 -System.Net.Http.dll,41ACE450-8F44-455A-97AC-0679E5462071,4,2,0,0 -System.Threading.Overlapped.dll,82D565AC-E41C-4E29-9939-C031C88EDBDD,4,1,0,0 -System.Runtime.InteropServices.RuntimeInformation.dll,FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2,4,0,2,0 System.Globalization.Extensions.dll,475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1,4,0,0,0 System.Globalization.Extensions.dll,5FCD54F0-4B97-4259-875D-30E481F02EA2,4,0,1,0 System.Globalization.Extensions.dll,E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC,4,0,2,0 diff --git a/mono/metadata/image.c b/mono/metadata/image.c index e531a5ef35..06993ca652 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1159,6 +1159,13 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x79F6E37F, SYS_THREADING_OVERLAPPED, "212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD", "15.5.0-preview-20171027-2 net461"), IGNORED_ASSEMBLY (0xA3BFE786, SYS_RT_INTEROP_RUNTIME_INFO, "33D296D9-EE6D-404E-BF9F-432A429FF5DA", "15.5.0-preview-20171027-2 net462"), IGNORED_ASSEMBLY (0x74EA304F, SYS_RT_INTEROP_RUNTIME_INFO, "E5AE3324-2100-4F77-9E41-AEEF226C9649", "15.5.0-preview-20171027-2 net47"), + IGNORED_ASSEMBLY (0x4CC79B26, SYS_GLOBALIZATION_EXT, "28006E9A-74DB-45AC-8A8D-030CEBAA272A", "2.0.0-preview3-20170622-1 net461"), + IGNORED_ASSEMBLY (0xC8D00759, SYS_IO_COMPRESSION, "1332CE2F-1517-4BD7-93FD-7D4BCFBAED66", "2.0.0-preview3-20170622-1 net461"), + IGNORED_ASSEMBLY (0x2706B80, SYS_NET_HTTP, "8E2F55F3-D010-417B-A742-21386EDDD388", "2.0.0-preview3-20170622-1 net461"), + IGNORED_ASSEMBLY (0xA2E8EC53, SYS_RT_INTEROP_RUNTIME_INFO, "6D334D4D-0149-4D07-9DEF-CC52213145CE", "2.0.0-preview3-20170622-1 net461"), + IGNORED_ASSEMBLY (0x90772EB6, SYS_THREADING_OVERLAPPED, "F4FFC4A6-E694-49D9-81B2-12F2C9A29652", "2.0.0-preview3-20170622-1 net461"), + IGNORED_ASSEMBLY (0x16BCA997, SYS_RT_INTEROP_RUNTIME_INFO, "CA2D23DE-55E1-45D8-9720-0EBE3EEC1DF2", "2.0.0-preview3-20170622-1 net462"), + IGNORED_ASSEMBLY (0x786145B9, SYS_RT_INTEROP_RUNTIME_INFO, "0C4BCFB3-F609-4631-93A6-17B19C69D9B6", "2.0.0-preview3-20170622-1 net47"), IGNORED_ASSEMBLY (0xF9D06E1E, SYS_GLOBALIZATION_EXT, "FC1439FC-C1B8-4DB1-914D-165CCFA77002", "2.1.0-preview1-62414-02 net461"), IGNORED_ASSEMBLY (0x1EA951BB, SYS_IO_COMPRESSION, "05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4", "2.1.0-preview1-62414-02 net461"), IGNORED_ASSEMBLY (0x96B5F0BA, SYS_NET_HTTP, "DB06A592-E332-44A1-8B85-20CAB3C3C147", "2.1.0-preview1-62414-02 net461"), @@ -1170,17 +1177,6 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x9DBB28A2, SYS_NET_HTTP, "903A137B-BB3F-464A-94D4-780B89EE5580", "2.1.0-preview1-62414-02 net471"), IGNORED_ASSEMBLY (0xD00F7419, SYS_THREADING_OVERLAPPED, "3336A2A3-1772-4EF9-A74B-AFDC80A8B21E", "2.1.0-preview1-62414-02 net471"), IGNORED_ASSEMBLY (0x17A113, SYS_RT_INTEROP_RUNTIME_INFO, "D87389D8-6E9C-48CF-B128-3637018577AF", "2.1.0-preview1-62414-02 net47"), - IGNORED_ASSEMBLY (0x1FB3F8E8, SYS_GLOBALIZATION_EXT, "B9BA8638-25D2-4A3B-B91F-16B3D3799861", "2.1.0-preview1-62516-03 net461"), - IGNORED_ASSEMBLY (0x6AE7C015, SYS_IO_COMPRESSION, "35DD20B5-8766-476B-B5D2-0EA16EF0A946", "2.1.0-preview1-62516-03 net461"), - IGNORED_ASSEMBLY (0x4E906129, SYS_NET_HTTP, "27BBDD4C-EAF0-4A95-B172-EE502D76A725", "2.1.0-preview1-62516-03 net461"), - IGNORED_ASSEMBLY (0x765A8E04, SYS_RT_INTEROP_RUNTIME_INFO, "E46BA45E-6A63-47CD-AF70-2C3016AFF75A", "2.1.0-preview1-62516-03 net461"), - IGNORED_ASSEMBLY (0x66CEDA9, SYS_THREADING_OVERLAPPED, "A0439CB6-A5E6-4813-A76C-13F92ADDDED5", "2.1.0-preview1-62516-03 net461"), - IGNORED_ASSEMBLY (0xD3ABE53A, SYS_RT_INTEROP_RUNTIME_INFO, "488CE209-4E5D-40E7-BE8C-F81F2B99F13A", "2.1.0-preview1-62516-03 net462"), - IGNORED_ASSEMBLY (0xE16ECCCD, SYS_GLOBALIZATION_EXT, "1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B", "2.1.0-preview1-62516-03 net471"), - IGNORED_ASSEMBLY (0xE758DAD4, SYS_IO_COMPRESSION, "8DBD1669-97BC-4190-9BD8-738561193741", "2.1.0-preview1-62516-03 net471"), - IGNORED_ASSEMBLY (0xA99E866F, SYS_NET_HTTP, "41ACE450-8F44-455A-97AC-0679E5462071", "2.1.0-preview1-62516-03 net471"), - IGNORED_ASSEMBLY (0x8BFCB05D, SYS_THREADING_OVERLAPPED, "82D565AC-E41C-4E29-9939-C031C88EDBDD", "2.1.0-preview1-62516-03 net471"), - IGNORED_ASSEMBLY (0xFC67D3A7, SYS_RT_INTEROP_RUNTIME_INFO, "FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2", "2.1.0-preview1-62516-03 net47"), IGNORED_ASSEMBLY (0x1136045D, SYS_GLOBALIZATION_EXT, "475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1", "4.0.0 net46"), IGNORED_ASSEMBLY (0x358C9723, SYS_GLOBALIZATION_EXT, "5FCD54F0-4B97-4259-875D-30E481F02EA2", "4.0.1 net46"), IGNORED_ASSEMBLY (0x450A096A, SYS_GLOBALIZATION_EXT, "E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC", "4.3.0 net46"), @@ -1219,20 +1215,26 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = { IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 0, 0), IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 1, 0), IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 2, 0), + IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 1, 0, 0), IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 1, 0, 0), IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 1, 2, 0), + IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 2, 0, 0), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 0, 0), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 0, 1), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 0), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 1), + IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 2), + IGNORED_ASM_VER (SYS_NET_HTTP, 4, 2, 0, 0), IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 0, 0), IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 1, 0), + IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 2, 0), IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 1, 0), IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0), IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 1, 0, 0), IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 0, 0), IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 1, 0), IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 2, 0), + IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 1, 0, 0) }; gboolean diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id index 264bcd0f32..0be3eaccff 100644 --- a/mono/mini/aot-compiler.c.REMOVED.git-id +++ b/mono/mini/aot-compiler.c.REMOVED.git-id @@ -1 +1 @@ -cd6627f9a22c75f14f3aa10c7487987f5c1df67d \ No newline at end of file +10ad19bb2cc2d7117c89b2c35d77608b30dc2c6e \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 45a7c1669e..82d629bc30 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -baa8be474684ba194394e3441dd3c936b1a7ffce \ No newline at end of file +e31719bf87ac644309f75387f00b04a3ee48cdab \ No newline at end of file diff --git a/mono/mini/aot-runtime.h b/mono/mini/aot-runtime.h index 8be8862058..09bf404641 100644 --- a/mono/mini/aot-runtime.h +++ b/mono/mini/aot-runtime.h @@ -82,6 +82,7 @@ typedef enum { MONO_AOT_TABLE_LLVM_GOT_INFO_OFFSETS, MONO_AOT_TABLE_EXTRA_METHOD_INFO_OFFSETS, MONO_AOT_TABLE_EXTRA_METHOD_TABLE, + MONO_AOT_TABLE_WEAK_FIELD_INDEXES, MONO_AOT_TABLE_NUM } MonoAotFileTable; @@ -109,6 +110,11 @@ typedef struct MonoAotFileInfo gpointer jit_code_start; gpointer jit_code_end; gpointer method_addresses; + + /* + * Data tables. + * One pointer for each entry in MonoAotFileTable. + */ /* Data blob */ gpointer blob; gpointer class_name_table; @@ -120,6 +126,9 @@ typedef struct MonoAotFileInfo gpointer got_info_offsets; gpointer llvm_got_info_offsets; gpointer image_table; + /* Points to an array of weak field indexes */ + gpointer weak_field_indexes; + gpointer mem_end; /* The GUID of the assembly which the AOT image was generated from */ gpointer assembly_guid; @@ -148,9 +157,7 @@ typedef struct MonoAotFileInfo gpointer unbox_trampolines_end; /* Points to a table of unbox trampoline addresses/offsets */ gpointer unbox_trampoline_addresses; - /* Points to an array of weak field indexes */ - gpointer weak_field_indexes; -#define MONO_AOT_FILE_INFO_LAST_SYMBOL weak_field_indexes +#define MONO_AOT_FILE_INFO_LAST_SYMBOL unbox_trampoline_addresses /* Scalars */ /* The index of the first GOT slot used by the PLT */ diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 18af3bec13..401f48d97e 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -b7db383454d406058bfe7f22d01e972e9e532f13 \ No newline at end of file +e335cd7336eaa9e4f3244dc41f09db17bb90b3f2 \ No newline at end of file diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index 8d0c9c7035..99f37d60a5 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -d823ffb6c5408a2f77f56e4884fe823dc07f79eb \ No newline at end of file +1f777878668f30a90f030b7e0a061a93b283535c \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index d86a12b52b..b31483b730 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/a0af42a" +#define FULL_VERSION "explicit/d0c1e9d" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 11f5cd85d65e989fe3fe55edb021da00d4904082..3dfe42d4121cba4a46251428aa50052aa2b2c3d3 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK>1w#uf6U)tSxQw^}O3em= delta 20 bcmbQIHBW29Q!aKB1w%_KBeTtKxQw^}N~#8Y diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index ff68ab9b45..e241f86622 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -bc010bb587374a6f3e89fa6eafada32b21696d73 \ No newline at end of file +7fe0de82571e3ea6b5eb5de9efe456e4faf046ff \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 9d0392bbb656ff41d69d3d50c114c5c13132e700..c9384d63f79eb513debd815f0fd25516c7189072 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)cf}w?#iRETf#VK+CQSAn| delta 20 bcmX?Ef3kjqo+7)6f}y3Ak=bTb#VK+CQOX9g diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 64dc38bd99..4670886ecb 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -5e0e8217bedaebbe399236d2375b7d34cef39ea5 \ No newline at end of file +525bf967e5dc6faa384793e8c393748f83c5373c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 1a5b1fd05b306088bf9c63a3737d147f353f9cb5..fb28888a0a72959a04d6c81920f07420fe86d1a8 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?4}Ba7FH&foB7oXv;bj02NM7Q delta 22 dcmeyri1Gg-#tj_m>?R6^mR3e)oB7oXv;bio2Mz!L diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index da6a4b2e80..f36db5aef9 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -ef8077dbf75103a8106ca15de92c5a577fedf46a \ No newline at end of file +9e1e3e4be04e8d7f74afa714010451fbef7f1b5f \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index c54a7ed0e6..fe71558af7 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.0.107\n" +"Project-Id-Version: mono 5.10.0.116\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-02-14 19:26+0000\n" +"POT-Creation-Date: 2018-02-15 18:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 91fc66f8a28b608d15efbbb0a7eb28d69168b742..ca28c902180561c6262c4a622f08781f71538570 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*-aG;Ev!r|H>XZzYzF{tHVBCT delta 22 ecmaF1gXP%{mJM-J*-aD-Ev<~qHm6QyYzF{t69|L= diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index fa0f7c3a94..d90e7534ac 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -73da5ec3a76a3ca59029c7388f2de35e58a4ff9c \ No newline at end of file +46fc12c742c4131938bca1dd0d795d745e85891a \ No newline at end of file From 7cb3128b07aee5091c0f8dd7e42b671f21d4e2f1 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 15 Feb 2018 19:26:56 +0000 Subject: [PATCH 2/2] Finalize changelog Former-commit-id: 36f4b86f72a98f2185266b7e4cc4b33a0005fb90 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index be82dc558b..3df8477015 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mono (5.10.0.116-0xamarin1) alpha; urgency=medium + + * New release - mono-5.10.0.116.tar.bz2 + + -- Xamarin Public Jenkins (auto-signing) Thu, 15 Feb 2018 19:26:55 +0000 + mono (5.10.0.107-0xamarin1) alpha; urgency=medium * New release - mono-5.10.0.107.tar.bz2