diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index b141a287e5..1b9b77cda6 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -842bd0c99a63529d11a45b65a4788407bb7f14b9 \ No newline at end of file +54cea42c8c6bfe077b1977bc3905769ad937e124 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index f5bc4e97df..8537c3848f 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -7631f31003484344dec75a864d26cb06d71338b2 \ No newline at end of file +3ac346edc244dc2c78aa095b77807d043420bd49 \ No newline at end of file diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index 314b93442a..36e732dee6 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -73,7 +73,7 @@ namespace System.IO.Compression } public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => - TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); + TaskToApm.Begin(ReadAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); public override int EndRead(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 9e2d6379f6..89d281207c 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,11 +34,11 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.0.0.0"; + public const string MonoVersion = "5.0.1.1"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; - public const int MonoCorlibVersion = 1050000000; + public const int MonoCorlibVersion = 1050001000; #if MOBILE // Versions of .NET Framework for Silverlight 4.0 diff --git a/mcs/class/lib/monolite/1050000000/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/Mono.Security.dll.REMOVED.git-id deleted file mode 100644 index 15ea3d42df..0000000000 --- a/mcs/class/lib/monolite/1050000000/Mono.Security.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -57dc7c8710eff65e001422fa45f6a6dbd2bfd72d \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/System.Configuration.dll.REMOVED.git-id deleted file mode 100644 index eafd296683..0000000000 --- a/mcs/class/lib/monolite/1050000000/System.Configuration.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -828fda966378b61781182e4f32e294e601e77cbb \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/System.Security.dll.REMOVED.git-id deleted file mode 100644 index daa7cbcc62..0000000000 --- a/mcs/class/lib/monolite/1050000000/System.Security.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0263a50f2563d4cbe8a965a0ab14325a0cb9ac67 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/System.Xml.dll.REMOVED.git-id deleted file mode 100644 index 078b9f9762..0000000000 --- a/mcs/class/lib/monolite/1050000000/System.Xml.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9140637cf6c1aaf8f2d6248e669fe5f9cd6c7a6b \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id deleted file mode 100644 index 7c390d0036..0000000000 --- a/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -215823960c76ebda8def72ae00467821f3710a94 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/mcs.exe.REMOVED.git-id deleted file mode 100644 index dddfd84c26..0000000000 --- a/mcs/class/lib/monolite/1050000000/mcs.exe.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -809f32ad5e07a59159c963ad49ed2a2d6d1d7f4f \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/mscorlib.dll.REMOVED.git-id deleted file mode 100644 index 3cd99304d8..0000000000 --- a/mcs/class/lib/monolite/1050000000/mscorlib.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -320d4a5e541cb9f48bd256bfb8f3f98ddbcbc1d6 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Collections.Concurrent.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Collections.Concurrent.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Collections.Concurrent.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Collections.Concurrent.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Collections.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Collections.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Collections.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Collections.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.Debug.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.Debug.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.Debug.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.Debug.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.FileVersionInfo.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.FileVersionInfo.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.FileVersionInfo.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.FileVersionInfo.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.Tools.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.Tools.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Diagnostics.Tools.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Diagnostics.Tools.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Dynamic.Runtime.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Dynamic.Runtime.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Dynamic.Runtime.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Dynamic.Runtime.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Globalization.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Globalization.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Globalization.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Globalization.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.IO.FileSystem.Primitives.dll b/mcs/class/lib/monolite/1050001000/Facades/System.IO.FileSystem.Primitives.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.IO.FileSystem.Primitives.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.IO.FileSystem.Primitives.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.IO.FileSystem.dll b/mcs/class/lib/monolite/1050001000/Facades/System.IO.FileSystem.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.IO.FileSystem.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.IO.FileSystem.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.IO.dll b/mcs/class/lib/monolite/1050001000/Facades/System.IO.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.IO.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.IO.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Linq.Expressions.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Linq.Expressions.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Linq.Expressions.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Linq.Expressions.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Linq.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Linq.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Linq.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Linq.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Reflection.Extensions.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Reflection.Extensions.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Reflection.Extensions.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Reflection.Extensions.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Reflection.Primitives.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Reflection.Primitives.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Reflection.Primitives.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Reflection.Primitives.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Reflection.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Reflection.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Reflection.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Reflection.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Resources.ResourceManager.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Resources.ResourceManager.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Resources.ResourceManager.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Resources.ResourceManager.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Runtime.Extensions.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Runtime.Extensions.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Runtime.Extensions.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Runtime.Extensions.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Runtime.InteropServices.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Runtime.InteropServices.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Runtime.InteropServices.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Runtime.InteropServices.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Runtime.Numerics.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Runtime.Numerics.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Runtime.Numerics.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Runtime.Numerics.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Runtime.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Runtime.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Runtime.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Runtime.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Security.Cryptography.Algorithms.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Security.Cryptography.Algorithms.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Security.Cryptography.Algorithms.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Security.Cryptography.Algorithms.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Security.Cryptography.Primitives.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Security.Cryptography.Primitives.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Security.Cryptography.Primitives.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Security.Cryptography.Primitives.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.CodePages.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.CodePages.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.CodePages.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.CodePages.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.Extensions.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.Extensions.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.Extensions.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.Extensions.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Text.Encoding.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Text.Encoding.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Threading.Tasks.Parallel.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Threading.Tasks.Parallel.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Threading.Tasks.Parallel.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Threading.Tasks.Parallel.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Threading.Tasks.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Threading.Tasks.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Threading.Tasks.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Threading.Tasks.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Threading.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Threading.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Threading.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Threading.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.ValueTuple.dll b/mcs/class/lib/monolite/1050001000/Facades/System.ValueTuple.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.ValueTuple.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.ValueTuple.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Xml.ReaderWriter.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Xml.ReaderWriter.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Xml.ReaderWriter.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Xml.ReaderWriter.dll diff --git a/mcs/class/lib/monolite/1050000000/Facades/System.Xml.XDocument.dll b/mcs/class/lib/monolite/1050001000/Facades/System.Xml.XDocument.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/Facades/System.Xml.XDocument.dll rename to mcs/class/lib/monolite/1050001000/Facades/System.Xml.XDocument.dll diff --git a/mcs/class/lib/monolite/1050001000/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/Mono.Security.dll.REMOVED.git-id new file mode 100644 index 0000000000..ec0fd44fa6 --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/Mono.Security.dll.REMOVED.git-id @@ -0,0 +1 @@ +8941aa7c243dc332e45664e102f069a7773c65ad \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050001000/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.Configuration.dll.REMOVED.git-id new file mode 100644 index 0000000000..834028ddcd --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/System.Configuration.dll.REMOVED.git-id @@ -0,0 +1 @@ +4e4482f3c6428fd7c673a247cb524c457e737e12 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.Core.dll.REMOVED.git-id similarity index 100% rename from mcs/class/lib/monolite/1050000000/System.Core.dll.REMOVED.git-id rename to mcs/class/lib/monolite/1050001000/System.Core.dll.REMOVED.git-id diff --git a/mcs/class/lib/monolite/1050000000/System.Numerics.dll b/mcs/class/lib/monolite/1050001000/System.Numerics.dll similarity index 100% rename from mcs/class/lib/monolite/1050000000/System.Numerics.dll rename to mcs/class/lib/monolite/1050001000/System.Numerics.dll diff --git a/mcs/class/lib/monolite/1050000000/System.Runtime.InteropServices.RuntimeInformation.dll b/mcs/class/lib/monolite/1050001000/System.Runtime.InteropServices.RuntimeInformation.dll similarity index 98% rename from mcs/class/lib/monolite/1050000000/System.Runtime.InteropServices.RuntimeInformation.dll rename to mcs/class/lib/monolite/1050001000/System.Runtime.InteropServices.RuntimeInformation.dll index 1af45dfbda..7bc11fa795 100644 Binary files a/mcs/class/lib/monolite/1050000000/System.Runtime.InteropServices.RuntimeInformation.dll and b/mcs/class/lib/monolite/1050001000/System.Runtime.InteropServices.RuntimeInformation.dll differ diff --git a/mcs/class/lib/monolite/1050001000/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.Security.dll.REMOVED.git-id new file mode 100644 index 0000000000..1344551d74 --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/System.Security.dll.REMOVED.git-id @@ -0,0 +1 @@ +9ea5e947656534c3b851f2999d1d0ebdb2f23afa \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050000000/System.Xml.Linq.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.Xml.Linq.dll.REMOVED.git-id similarity index 100% rename from mcs/class/lib/monolite/1050000000/System.Xml.Linq.dll.REMOVED.git-id rename to mcs/class/lib/monolite/1050001000/System.Xml.Linq.dll.REMOVED.git-id diff --git a/mcs/class/lib/monolite/1050001000/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.Xml.dll.REMOVED.git-id new file mode 100644 index 0000000000..078df3be09 --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/System.Xml.dll.REMOVED.git-id @@ -0,0 +1 @@ +a1b21928f356f2289a10701ed85fb8e4ffbe8727 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050001000/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/System.dll.REMOVED.git-id new file mode 100644 index 0000000000..6936f292dc --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/System.dll.REMOVED.git-id @@ -0,0 +1 @@ +cbe6b854c413bb68fe42f25da8ab27097f1ee2e0 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050001000/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/mcs.exe.REMOVED.git-id new file mode 100644 index 0000000000..473bfe8ac4 --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/mcs.exe.REMOVED.git-id @@ -0,0 +1 @@ +233ed8ea90cf630fd057f3007cdfdcd9705a16ef \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050001000/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050001000/mscorlib.dll.REMOVED.git-id new file mode 100644 index 0000000000..2bc575322b --- /dev/null +++ b/mcs/class/lib/monolite/1050001000/mscorlib.dll.REMOVED.git-id @@ -0,0 +1 @@ +b93d17e8fdae04e06131e6245cbfc0b168a7345f \ No newline at end of file diff --git a/mcs/tools/pdb2mdb/Driver.cs b/mcs/tools/pdb2mdb/Driver.cs index 5aa1fcf0b5..7039503407 100644 --- a/mcs/tools/pdb2mdb/Driver.cs +++ b/mcs/tools/pdb2mdb/Driver.cs @@ -28,20 +28,21 @@ namespace Pdb2Mdb { public static void Convert (string filename) { - var asm = AssemblyDefinition.ReadAssembly (filename); + using (var asm = AssemblyDefinition.ReadAssembly (filename)) { - var pdb = asm.Name.Name + ".pdb"; - pdb = Path.Combine (Path.GetDirectoryName (filename), pdb); + var pdb = asm.Name.Name + ".pdb"; + pdb = Path.Combine (Path.GetDirectoryName (filename), pdb); - if (!File.Exists (pdb)) - throw new FileNotFoundException ("PDB file doesn't exist: " + pdb); + if (!File.Exists (pdb)) + throw new FileNotFoundException ("PDB file doesn't exist: " + pdb); - using (var stream = File.OpenRead (pdb)) { - if (IsPortablePdb (stream)) - throw new PortablePdbNotSupportedException (); + using (var stream = File.OpenRead (pdb)) { + if (IsPortablePdb (stream)) + throw new PortablePdbNotSupportedException (); - var funcs = PdbFile.LoadFunctions (stream, true); - Converter.Convert (asm, funcs, new MonoSymbolWriter (filename)); + var funcs = PdbFile.LoadFunctions (stream, true); + Converter.Convert (asm, funcs, new MonoSymbolWriter (filename)); + } } } diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile index 841528dc93..6d0d964bad 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -93,16 +93,10 @@ install-pcl-targets: done install-web-targets: - $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications - $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications - $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications - $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications - $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications - $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications - $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications - $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications - $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications - $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications + for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0; do \ + $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ + $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ + done NUGET_BUILDTASKS_REPO_DIR=$(topdir)/../external/nuget-buildtasks diff --git a/mono/metadata/icall.c.REMOVED.git-id b/mono/metadata/icall.c.REMOVED.git-id index 15acdbf345..98a3d6f2d6 100644 --- a/mono/metadata/icall.c.REMOVED.git-id +++ b/mono/metadata/icall.c.REMOVED.git-id @@ -1 +1 @@ -5e597cadd4c3564aa2f2b50a6135f9798d726bbd \ No newline at end of file +a99091700d3ceaf606120aaa2e0ec655b0df75e9 \ No newline at end of file diff --git a/mono/metadata/image.c b/mono/metadata/image.c index 39ddf9cf6c..58b7953202 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1114,8 +1114,7 @@ typedef enum { SYS_IO_COMPRESSION = 2, //System.IO.Compression SYS_NET_HTTP = 3, //System.Net.Http SYS_TEXT_ENC_CODEPAGES = 4, //System.Text.Encoding.CodePages - SYS_REF_DISP_PROXY = 5, //System.Reflection.DispatchProxy - SYS_VALUE_TUPLE = 6, //System.ValueTuple + SYS_REF_DISP_PROXY = 5 //System.Reflection.DispatchProxy } IgnoredAssemblyNames; typedef struct { @@ -1136,7 +1135,6 @@ const char *ignored_assemblies_file_names[] = { "System.Net.Http.dll", "System.Text.Encoding.CodePages.dll", "System.Reflection.DispatchProxy.dll", - "System.ValueTuple.dll" }; #define IGNORED_ASSEMBLY(HASH, NAME, GUID, VER_STR) { .hash = HASH, .assembly_name = NAME, .guid = GUID } @@ -1158,7 +1156,6 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0xD07383BB, SYS_RT_INTEROP_RUNTIME_INFO, "DD91439F-3167-478E-BD2C-BF9C036A1395", "4.3.0 net45"), IGNORED_ASSEMBLY (0x911D9EC3, SYS_TEXT_ENC_CODEPAGES, "C142254F-DEB5-46A7-AE43-6F10320D1D1F", "4.0.1 net46"), IGNORED_ASSEMBLY (0xFA686A38, SYS_TEXT_ENC_CODEPAGES, "FD178CD4-EF4F-44D5-9C3F-812B1E25126B", "4.3.0 net46"), - IGNORED_ASSEMBLY (0x75B4B041, SYS_VALUE_TUPLE, "F81A4140-A898-4E2B-B6E9-55CE78C273EC", "4.3.0 netstandard1.0"), }; @@ -1168,8 +1165,7 @@ const char *ignored_assemblies_names[] = { "System.IO.Compression", "System.Net.Http", "System.Text.Encoding.CodePages", - "System.Reflection.DispatchProxy", - "System.ValueTuple" + "System.Reflection.DispatchProxy" }; #define IGNORED_ASM_VER(NAME, MAJOR, MINOR, BUILD, REVISION) { .assembly_name = NAME, .major = MAJOR, .minor = MINOR, .build = BUILD, .revision = REVISION } @@ -1189,8 +1185,7 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = { 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_TEXT_ENC_CODEPAGES, 4, 0, 1, 0), - IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0), - IGNORED_ASM_VER (SYS_VALUE_TUPLE, 4, 0, 1, 0), + IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0) }; gboolean diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 1ddb08757a..f09c6c770b 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -1882,10 +1882,12 @@ _mono_reflection_get_type_from_info (MonoTypeNameParse *info, MonoImage *image, static MonoType* mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase, MonoError *error) { + HANDLE_FUNCTION_ENTER (); MonoClass *klass; GList *mod; int modval; gboolean bounded = FALSE; + MonoType* type = NULL; mono_error_init (error); if (!image) @@ -1900,7 +1902,7 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT klass = mono_class_from_name_checked (image, info->name_space, info->name, error); if (!klass) - return NULL; + goto leave; for (mod = info->nested; mod; mod = mod->next) { gpointer iter = NULL; @@ -1960,7 +1962,7 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT break; } if (!klass) - return NULL; + goto leave; if (info->type_arguments) { MonoType **type_args = g_new0 (MonoType *, info->type_arguments->len); @@ -1974,20 +1976,20 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT type_args [i] = _mono_reflection_get_type_from_info (subinfo, rootimage, ignorecase, error); if (!type_args [i]) { g_free (type_args); - return NULL; + goto leave; } } the_type = mono_type_get_object_handle (mono_domain_get (), &klass->byval_arg, error); if (!is_ok (error) || MONO_HANDLE_IS_NULL (the_type)) - return NULL; + goto leave; instance = mono_reflection_bind_generic_parameters ( the_type, info->type_arguments->len, type_args, error); g_free (type_args); if (!instance) - return NULL; + goto leave; klass = mono_class_from_mono_type (instance); } @@ -1995,7 +1997,8 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT for (mod = info->modifiers; mod; mod = mod->next) { modval = GPOINTER_TO_UINT (mod->data); if (!modval) { /* byref: must be last modifier */ - return &klass->this_arg; + type = &klass->this_arg; + goto leave; } else if (modval == -1) { klass = mono_ptr_class_get (&klass->byval_arg); } else if (modval == -2) { @@ -2005,7 +2008,10 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT } } - return &klass->byval_arg; + type = &klass->byval_arg; + +leave: + HANDLE_FUNCTION_RETURN_VAL (type); } /* diff --git a/mono/metadata/sre-encode.c b/mono/metadata/sre-encode.c index 143ece00c1..1922e41f7f 100644 --- a/mono/metadata/sre-encode.c +++ b/mono/metadata/sre-encode.c @@ -770,6 +770,7 @@ guint32 mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *type, gboolean try_typespec) { MONO_REQ_GC_UNSAFE_MODE; + HANDLE_FUNCTION_ENTER (); MonoDynamicTable *table; guint32 *values; @@ -778,10 +779,10 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType * /* if the type requires a typespec, we must try that first*/ if (try_typespec && (token = create_typespec (assembly, type))) - return token; + goto leave; token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->typeref, type)); if (token) - return token; + goto leave; klass = mono_class_from_mono_type (type); MonoReflectionTypeBuilderHandle tb = MONO_HANDLE_CAST (MonoReflectionTypeBuilder, mono_class_get_ref_info (klass)); @@ -792,7 +793,7 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType * (type->type != MONO_TYPE_MVAR)) { token = MONO_TYPEDEFORREF_TYPEDEF | (MONO_HANDLE_GETVAL (tb, table_idx) << MONO_TYPEDEFORREF_BITS); mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, tb)); - return token; + goto leave; } if (klass->nested_in) { @@ -815,7 +816,8 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType * g_hash_table_insert (assembly->typeref, type, GUINT_TO_POINTER(token)); table->next_idx ++; mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, tb)); - return token; +leave: + HANDLE_FUNCTION_RETURN_VAL (token); } /* diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 927c30ba9f..1f5488c2ba 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h + echo "#define FULL_VERSION \"2017-02/5077205\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 927c30ba9f..1f5488c2ba 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h + echo "#define FULL_VERSION \"2017-02/5077205\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index ee5e0eb4ba..52a534c7d3 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -66f0ba10fffc18d1a1795891c93bd0215029648d \ No newline at end of file +ad294261302cdc341ab12ee3c294521e59ca1caa \ No newline at end of file diff --git a/mono/mini/mini-amd64.c.REMOVED.git-id b/mono/mini/mini-amd64.c.REMOVED.git-id index de33a7c439..ae35737316 100644 --- a/mono/mini/mini-amd64.c.REMOVED.git-id +++ b/mono/mini/mini-amd64.c.REMOVED.git-id @@ -1 +1 @@ -1269d5d5c7c122af0ba55d290199ef934422fa52 \ No newline at end of file +949d4f5b27201115697b2d5f274b99facb326c8d \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index b37749cfd2..a703135e6a 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 5.0.0.100/9667aa6" +#define FULL_VERSION "2017-02/5077205" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index aef425e11a..5977553202 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index bf040d26b9..85565837dd 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -3089bb97fe1d4a69f524f176791f1b6ee6cf2019 \ No newline at end of file +70a24589a3373f232fec5cf21fa6a31fd24ff8c1 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 190677f89f..9e99fbe8e3 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 8fc49769eb..11859f4613 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -15401895df38271eec5257a5fb249eac88abc566 \ No newline at end of file +9d25177e0735ca66d9a34e618117d87685247bba \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index fd025a3e8c..10f0c828b2 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 5c9ecbf446..a932f62497 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -3b15d5428b6e609836cff776dcf081b9b3ff27e4 \ No newline at end of file +fac746c2f69f736f303c1e5f632fb9db9a434aa1 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 11650a8eae..4a0959ffdd 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.0.0\n" +"Project-Id-Version: mono 5.0.1.1\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-05-11 09:30+0000\n" +"POT-Creation-Date: 2017-05-24 10:40+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 ca82cad439..b4d5bc1afc 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 1072ad3459..9e66b83007 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -bc28821a824c253df2dcde1420bd66daee30b49a \ No newline at end of file +c455dba7a6ecbeb43ad3ef9577dec90d87e9b0e4 \ No newline at end of file diff --git a/tools/pedump/pedump.c b/tools/pedump/pedump.c index 4bbcc69933..6ae2a1e1e4 100644 --- a/tools/pedump/pedump.c +++ b/tools/pedump/pedump.c @@ -658,6 +658,7 @@ main (int argc, char *argv []) mono_perfcounters_init (); #endif mono_counters_init (); + mono_tls_init_runtime_keys (); mono_metadata_init (); mono_images_init (); mono_assemblies_init (); @@ -701,7 +702,7 @@ main (int argc, char *argv []) if (verify_pe || run_new_metadata_verifier) { run_new_metadata_verifier = 1; } - + if (run_new_metadata_verifier) { mono_verifier_set_mode (verifier_mode);