From 9763768dbec9582bea4ed408bdefcfbb3e85b477 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 17 Aug 2019 08:44:11 +0000 Subject: [PATCH] Imported Upstream version 6.4.0.170 Former-commit-id: f031c24abaef5cb0d46890da430be3a37c21eede --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../corlib/Test/System.IO/FileStreamTest.cs | 23 ++++++++++++++++++ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/w32file-unix.c.REMOVED.git-id | 2 +- mono/metadata/w32file.h | 1 + mono/mini/version.h | 2 +- msvc/Makefile.in | 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, 67 insertions(+), 43 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 50284023f6..5d7d1f763c 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -f2037875ecd61870511a2e60ffffd0cbdb39d2fa \ No newline at end of file +bcffcf6b4c5309d813b4b46871ba956735c27879 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d84a662c34..96db7aecb8 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -dec26df169059aaa7b4d0b3b1e0561156c7d42e6 \ No newline at end of file +1cef2f5fb1ed63b6ab6623490aeae8d2afeffe53 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index b688561e2d..4a9f8b5bc8 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.4.0.169"; + public const string MonoVersion = "6.4.0.170"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs index be65417fb7..3fa4a87e58 100644 --- a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs +++ b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs @@ -1650,6 +1650,29 @@ namespace MonoTests.System.IO } + // See https://github.com/mono/mono/issues/16032 + [Test] + public void DeleteOnCloseWithFileCopy () + { + string source = TempFolder + DSC + "source.txt"; + string target = TempFolder + DSC + "target.txt"; + + File.WriteAllText (source, "text"); + FileStream fs = new FileStream (source, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite, 2048, + FileOptions.DeleteOnClose); + + Assert.AreEqual (true, File.Exists (source), "DCFC#1"); + + try { + File.Copy (fs.Name, target, true); + } finally { + fs.Dispose(); + } + + Assert.AreEqual (false, File.Exists (source), "DCFC#2"); + Assert.AreEqual (true, File.Exists (target), "DCFC#3"); + } + [Test] public void OpenCharDeviceRepeatedly () { diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index ce5decde2e..372bc27ba1 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c4ee6b219b4f97491eef3b0ea52624f011b451c3 \ No newline at end of file +69db36141ee7598d392ce104784ac4436739b72f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d6d3420cf3..63688eb01d 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a68867a935d1320fbaed4463cecfea9d75f002fe \ No newline at end of file +ab01f899865bde8b626e9f2b8a1a27d716e5d673 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 3bf6b24f0a..1ab647136d 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -1c771697816752b2af37c9017c441c97ce944480 \ No newline at end of file +5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index bf952381e5..6915c458b6 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5bf996311bed2de1460b028f6c368d1d5d105f8f \ No newline at end of file +3b79f4a1b828157eb520b1dab3775f83638aea7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index ce4e7fa0e4..f5c230da92 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3427faaa056ac3350ecf548cf6d524462e81de65 \ No newline at end of file +95d9adff629742018c7f612156b0388f7e5927b3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index fcc4a4e749..a696db8610 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bdfc56b377e8d944e6576cb6f29fed51145c386f \ No newline at end of file +9d4653def9f72effb65325d25cdf475fac1bcaa7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 49c3a62900..595faa3954 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -6ab3760aa406d5ccb844b3fcf719d6f68966af51 \ No newline at end of file +374d292eeecf1f65a8e4565a3ac9202f58c03c23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index ce5decde2e..372bc27ba1 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c4ee6b219b4f97491eef3b0ea52624f011b451c3 \ No newline at end of file +69db36141ee7598d392ce104784ac4436739b72f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d6d3420cf3..63688eb01d 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a68867a935d1320fbaed4463cecfea9d75f002fe \ No newline at end of file +ab01f899865bde8b626e9f2b8a1a27d716e5d673 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 3bf6b24f0a..1ab647136d 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -1c771697816752b2af37c9017c441c97ce944480 \ No newline at end of file +5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index bf952381e5..6915c458b6 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5bf996311bed2de1460b028f6c368d1d5d105f8f \ No newline at end of file +3b79f4a1b828157eb520b1dab3775f83638aea7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index ce4e7fa0e4..f5c230da92 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3427faaa056ac3350ecf548cf6d524462e81de65 \ No newline at end of file +95d9adff629742018c7f612156b0388f7e5927b3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index fcc4a4e749..a696db8610 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bdfc56b377e8d944e6576cb6f29fed51145c386f \ No newline at end of file +9d4653def9f72effb65325d25cdf475fac1bcaa7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index f763b51272..91a85f002d 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4944eae00d60647ba30ba204a17cd48b96a2577d \ No newline at end of file +c487126a2703279c4b6914c879564e280611876b \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 49c3a62900..595faa3954 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -6ab3760aa406d5ccb844b3fcf719d6f68966af51 \ No newline at end of file +374d292eeecf1f65a8e4565a3ac9202f58c03c23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index ce5decde2e..372bc27ba1 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c4ee6b219b4f97491eef3b0ea52624f011b451c3 \ No newline at end of file +69db36141ee7598d392ce104784ac4436739b72f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d6d3420cf3..63688eb01d 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a68867a935d1320fbaed4463cecfea9d75f002fe \ No newline at end of file +ab01f899865bde8b626e9f2b8a1a27d716e5d673 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 3bf6b24f0a..1ab647136d 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -1c771697816752b2af37c9017c441c97ce944480 \ No newline at end of file +5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index bf952381e5..6915c458b6 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5bf996311bed2de1460b028f6c368d1d5d105f8f \ No newline at end of file +3b79f4a1b828157eb520b1dab3775f83638aea7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index ce4e7fa0e4..f5c230da92 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3427faaa056ac3350ecf548cf6d524462e81de65 \ No newline at end of file +95d9adff629742018c7f612156b0388f7e5927b3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index fcc4a4e749..a696db8610 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bdfc56b377e8d944e6576cb6f29fed51145c386f \ No newline at end of file +9d4653def9f72effb65325d25cdf475fac1bcaa7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index f763b51272..91a85f002d 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4944eae00d60647ba30ba204a17cd48b96a2577d \ No newline at end of file +c487126a2703279c4b6914c879564e280611876b \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 49c3a62900..595faa3954 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -6ab3760aa406d5ccb844b3fcf719d6f68966af51 \ No newline at end of file +374d292eeecf1f65a8e4565a3ac9202f58c03c23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index ce5decde2e..372bc27ba1 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c4ee6b219b4f97491eef3b0ea52624f011b451c3 \ No newline at end of file +69db36141ee7598d392ce104784ac4436739b72f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d6d3420cf3..63688eb01d 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a68867a935d1320fbaed4463cecfea9d75f002fe \ No newline at end of file +ab01f899865bde8b626e9f2b8a1a27d716e5d673 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index d5f11f144b..91b3fd93ad 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a31d61bca651110a0ae6536f1b8875df494c7bac \ No newline at end of file +5fa3256cb9bd642221e9c59c6fd58e5b88ffd7bb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index bf952381e5..6915c458b6 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5bf996311bed2de1460b028f6c368d1d5d105f8f \ No newline at end of file +3b79f4a1b828157eb520b1dab3775f83638aea7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index ce4e7fa0e4..f5c230da92 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3427faaa056ac3350ecf548cf6d524462e81de65 \ No newline at end of file +95d9adff629742018c7f612156b0388f7e5927b3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index fcc4a4e749..a696db8610 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bdfc56b377e8d944e6576cb6f29fed51145c386f \ No newline at end of file +9d4653def9f72effb65325d25cdf475fac1bcaa7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index f763b51272..91a85f002d 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4944eae00d60647ba30ba204a17cd48b96a2577d \ No newline at end of file +c487126a2703279c4b6914c879564e280611876b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 06914f2324..f84b681e94 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -c2e1b25962e1c4e2c8053359cef2ee0f162686bb \ No newline at end of file +32f849fcf8fcfc98a6b909c9891210bfdbe45ec0 \ No newline at end of file diff --git a/mono/metadata/w32file-unix.c.REMOVED.git-id b/mono/metadata/w32file-unix.c.REMOVED.git-id index 60e8d8beb6..c8e8f89e9f 100644 --- a/mono/metadata/w32file-unix.c.REMOVED.git-id +++ b/mono/metadata/w32file-unix.c.REMOVED.git-id @@ -1 +1 @@ -184165554a9e418d4201192d10f7a6d528021834 \ No newline at end of file +8cbb86307813bcb4b8fb90738bc3cf0954b20bde \ No newline at end of file diff --git a/mono/metadata/w32file.h b/mono/metadata/w32file.h index ac68571355..e85a6a9cd1 100644 --- a/mono/metadata/w32file.h +++ b/mono/metadata/w32file.h @@ -262,6 +262,7 @@ mono_filesize_from_fd (int fd); #define GENERIC_EXECUTE 0x20000000 #define GENERIC_ALL 0x10000000 +#define FILE_SHARE_NONE 0x00000000 #define FILE_SHARE_READ 0x00000001 #define FILE_SHARE_WRITE 0x00000002 #define FILE_SHARE_DELETE 0x00000004 diff --git a/mono/mini/version.h b/mono/mini/version.h index 5b6f8567d1..18c9e38d39 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/4a85530" +#define FULL_VERSION "explicit/e6d44f7" diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 8a179171f5..6f7912324c 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -520,8 +520,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@install-exec-local: +@ENABLE_MSVC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index ba5dfbaa9bb3d5801209fe8b85f7d80512c8dc71..fa25f629ec12eeb4b96f15adaf51cc6680f6be24 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aLM1p^B!Lxat4xQw^}N{|M2 delta 20 bcmbQIHBW29Q!aK>1p^B!1GCL\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 9493fb83d10374afe112302670e839c6544a0251..ad071c216b8599f7a51d023ab393e81ff9f99478 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J+07LUEUXL-Hm6QyYzF{s`3Qah delta 22 ecmaF1gXP%{mJM-J*-aG;EUXO7Hm6QyYzF{s{s@5p diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 2b77304dda..7aff00fafb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -47ac10d37affec9ea994dd886de1349cf3d6a4a2 \ No newline at end of file +57902ef092fe73be748bea8677d22d78f36cd3dc \ No newline at end of file