Merge branch 'upstream'
Former-commit-id: 033de8947651ef8ae6f309788621c072924a5f4b
This commit is contained in:
commit
4d357e4763
@ -1 +1 @@
|
||||
f2037875ecd61870511a2e60ffffd0cbdb39d2fa
|
||||
bcffcf6b4c5309d813b4b46871ba956735c27879
|
@ -1 +1 @@
|
||||
dec26df169059aaa7b4d0b3b1e0561156c7d42e6
|
||||
1cef2f5fb1ed63b6ab6623490aeae8d2afeffe53
|
@ -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";
|
||||
|
@ -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 ()
|
||||
{
|
||||
|
@ -1 +1 @@
|
||||
c4ee6b219b4f97491eef3b0ea52624f011b451c3
|
||||
69db36141ee7598d392ce104784ac4436739b72f
|
@ -1 +1 @@
|
||||
a68867a935d1320fbaed4463cecfea9d75f002fe
|
||||
ab01f899865bde8b626e9f2b8a1a27d716e5d673
|
@ -1 +1 @@
|
||||
1c771697816752b2af37c9017c441c97ce944480
|
||||
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
|
@ -1 +1 @@
|
||||
5bf996311bed2de1460b028f6c368d1d5d105f8f
|
||||
3b79f4a1b828157eb520b1dab3775f83638aea7a
|
@ -1 +1 @@
|
||||
3427faaa056ac3350ecf548cf6d524462e81de65
|
||||
95d9adff629742018c7f612156b0388f7e5927b3
|
@ -1 +1 @@
|
||||
bdfc56b377e8d944e6576cb6f29fed51145c386f
|
||||
9d4653def9f72effb65325d25cdf475fac1bcaa7
|
@ -1 +1 @@
|
||||
6ab3760aa406d5ccb844b3fcf719d6f68966af51
|
||||
374d292eeecf1f65a8e4565a3ac9202f58c03c23
|
@ -1 +1 @@
|
||||
c4ee6b219b4f97491eef3b0ea52624f011b451c3
|
||||
69db36141ee7598d392ce104784ac4436739b72f
|
@ -1 +1 @@
|
||||
a68867a935d1320fbaed4463cecfea9d75f002fe
|
||||
ab01f899865bde8b626e9f2b8a1a27d716e5d673
|
@ -1 +1 @@
|
||||
1c771697816752b2af37c9017c441c97ce944480
|
||||
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
|
@ -1 +1 @@
|
||||
5bf996311bed2de1460b028f6c368d1d5d105f8f
|
||||
3b79f4a1b828157eb520b1dab3775f83638aea7a
|
@ -1 +1 @@
|
||||
3427faaa056ac3350ecf548cf6d524462e81de65
|
||||
95d9adff629742018c7f612156b0388f7e5927b3
|
@ -1 +1 @@
|
||||
bdfc56b377e8d944e6576cb6f29fed51145c386f
|
||||
9d4653def9f72effb65325d25cdf475fac1bcaa7
|
@ -1 +1 @@
|
||||
4944eae00d60647ba30ba204a17cd48b96a2577d
|
||||
c487126a2703279c4b6914c879564e280611876b
|
@ -1 +1 @@
|
||||
6ab3760aa406d5ccb844b3fcf719d6f68966af51
|
||||
374d292eeecf1f65a8e4565a3ac9202f58c03c23
|
@ -1 +1 @@
|
||||
c4ee6b219b4f97491eef3b0ea52624f011b451c3
|
||||
69db36141ee7598d392ce104784ac4436739b72f
|
@ -1 +1 @@
|
||||
a68867a935d1320fbaed4463cecfea9d75f002fe
|
||||
ab01f899865bde8b626e9f2b8a1a27d716e5d673
|
@ -1 +1 @@
|
||||
1c771697816752b2af37c9017c441c97ce944480
|
||||
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
|
@ -1 +1 @@
|
||||
5bf996311bed2de1460b028f6c368d1d5d105f8f
|
||||
3b79f4a1b828157eb520b1dab3775f83638aea7a
|
@ -1 +1 @@
|
||||
3427faaa056ac3350ecf548cf6d524462e81de65
|
||||
95d9adff629742018c7f612156b0388f7e5927b3
|
@ -1 +1 @@
|
||||
bdfc56b377e8d944e6576cb6f29fed51145c386f
|
||||
9d4653def9f72effb65325d25cdf475fac1bcaa7
|
@ -1 +1 @@
|
||||
4944eae00d60647ba30ba204a17cd48b96a2577d
|
||||
c487126a2703279c4b6914c879564e280611876b
|
@ -1 +1 @@
|
||||
6ab3760aa406d5ccb844b3fcf719d6f68966af51
|
||||
374d292eeecf1f65a8e4565a3ac9202f58c03c23
|
@ -1 +1 @@
|
||||
c4ee6b219b4f97491eef3b0ea52624f011b451c3
|
||||
69db36141ee7598d392ce104784ac4436739b72f
|
@ -1 +1 @@
|
||||
a68867a935d1320fbaed4463cecfea9d75f002fe
|
||||
ab01f899865bde8b626e9f2b8a1a27d716e5d673
|
@ -1 +1 @@
|
||||
a31d61bca651110a0ae6536f1b8875df494c7bac
|
||||
5fa3256cb9bd642221e9c59c6fd58e5b88ffd7bb
|
@ -1 +1 @@
|
||||
5bf996311bed2de1460b028f6c368d1d5d105f8f
|
||||
3b79f4a1b828157eb520b1dab3775f83638aea7a
|
@ -1 +1 @@
|
||||
3427faaa056ac3350ecf548cf6d524462e81de65
|
||||
95d9adff629742018c7f612156b0388f7e5927b3
|
@ -1 +1 @@
|
||||
bdfc56b377e8d944e6576cb6f29fed51145c386f
|
||||
9d4653def9f72effb65325d25cdf475fac1bcaa7
|
@ -1 +1 @@
|
||||
4944eae00d60647ba30ba204a17cd48b96a2577d
|
||||
c487126a2703279c4b6914c879564e280611876b
|
@ -1 +1 @@
|
||||
c2e1b25962e1c4e2c8053359cef2ee0f162686bb
|
||||
32f849fcf8fcfc98a6b909c9891210bfdbe45ec0
|
@ -1 +1 @@
|
||||
184165554a9e418d4201192d10f7a6d528021834
|
||||
8cbb86307813bcb4b8fb90738bc3cf0954b20bde
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/4a85530"
|
||||
#define FULL_VERSION "explicit/e6d44f7"
|
||||
|
@ -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
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fef8aec33aec9695b8957d4c7b9025c8d94d3f56
|
||||
0b36fc25a69d0b43d973007f898ddf081fe9a38d
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
201a6e4eca8508ed4b140a497f0522b81d03c5be
|
||||
f609f2875bfc5edaee627feeebc9085a65975e19
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3f2163d934a111f46261c6869655eb582d1d4105
|
||||
c780bf8a25d0cef6b6c189d7fc6af67f0cc673ca
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.4.0.169\n"
|
||||
"Project-Id-Version: mono 6.4.0.170\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-08-15 08:06+0000\n"
|
||||
"POT-Creation-Date: 2019-08-17 08:10+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
47ac10d37affec9ea994dd886de1349cf3d6a4a2
|
||||
57902ef092fe73be748bea8677d22d78f36cd3dc
|
Loading…
x
Reference in New Issue
Block a user