Merge branch 'upstream'

Former-commit-id: 033de8947651ef8ae6f309788621c072924a5f4b
2019-08-17 09:11:57 +00:00
parent 76e1936091 9763768dbe
commit 4d357e4763
48 changed files with 67 additions and 43 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-f2037875ecd61870511a2e60ffffd0cbdb39d2fa
+bcffcf6b4c5309d813b4b46871ba956735c27879
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-dec26df169059aaa7b4d0b3b1e0561156c7d42e6
+1cef2f5fb1ed63b6ab6623490aeae8d2afeffe53
--- 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";
--- 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 ()
 		{
--- 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
+69db36141ee7598d392ce104784ac4436739b72f
--- 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
+ab01f899865bde8b626e9f2b8a1a27d716e5d673
--- 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
+5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
--- 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
+3b79f4a1b828157eb520b1dab3775f83638aea7a
--- 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
+95d9adff629742018c7f612156b0388f7e5927b3
--- 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
+9d4653def9f72effb65325d25cdf475fac1bcaa7
--- 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
+374d292eeecf1f65a8e4565a3ac9202f58c03c23
--- 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
+69db36141ee7598d392ce104784ac4436739b72f
--- 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
+ab01f899865bde8b626e9f2b8a1a27d716e5d673
--- 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
+5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
--- 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
+3b79f4a1b828157eb520b1dab3775f83638aea7a
--- 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
+95d9adff629742018c7f612156b0388f7e5927b3
--- 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
+9d4653def9f72effb65325d25cdf475fac1bcaa7
--- 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
+c487126a2703279c4b6914c879564e280611876b
--- 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
+374d292eeecf1f65a8e4565a3ac9202f58c03c23
--- 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
+69db36141ee7598d392ce104784ac4436739b72f
--- a/Show More
+++ b/Show More