Imported Upstream version 6.0.0.197

Former-commit-id: ce8df4f105a5e534ae52c5975c6525634631b55b
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-04-25 08:34:32 +00:00
parent b8f7d9129e
commit 91848d672d
62 changed files with 72 additions and 47 deletions

View File

@ -1 +1 @@
03e14029783aba15abb306f217d0e7248879d1a7 83c0c15449e686f77a3888c04ba3b7942733bb25

View File

@ -1,4 +1,6 @@
check-roslyn: check-roslyn:
@echo "Runnning roslyn tests using mono from PATH:"
mono --version
@$(MAKE) validate-roslyn RESET_VERSIONS=1 @$(MAKE) validate-roslyn RESET_VERSIONS=1
cd $(ROSLYN_PATH); \ cd $(ROSLYN_PATH); \
./build.sh --restore --build --test --mono || exit; \ ./build.sh --restore --build --test --mono || exit; \

View File

@ -1 +1 @@
73e8c9d278acfcd5e39a2e522cbcfc96598a7d01 88ae40fc58a5310e60c827d644a6ae69ac155d4e

View File

@ -1 +1 @@
acd5c22d85e3db995bbb3bcfa3b6b4d9d7c4af96 0346879ad8ae4821c830eca067aaa7e6b3c03ea9

View File

@ -315,12 +315,14 @@ namespace System.IO.Tests
Assert.False(Exists(component)); Assert.False(Exists(component));
} }
#if !MONODROID
[Theory, [Theory,
MemberData(nameof(UncPathsWithoutShareName))] MemberData(nameof(UncPathsWithoutShareName))]
public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component) public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component)
{ {
Assert.False(Exists(component)); Assert.False(Exists(component));
} }
#endif
[Fact] [Fact]
[PlatformSpecific(TestPlatforms.Windows)] // max directory length not fixed on Unix [PlatformSpecific(TestPlatforms.Windows)] // max directory length not fixed on Unix

View File

@ -905,6 +905,7 @@ namespace System.IO.Tests
}); });
} }
#if !MONODROID
[Fact] [Fact]
[PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-invalid search patterns throws no exception [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-invalid search patterns throws no exception
public void UnixSearchPatternInvalid() public void UnixSearchPatternInvalid()
@ -912,6 +913,7 @@ namespace System.IO.Tests
GetEntries(TestDirectory, "\0"); GetEntries(TestDirectory, "\0");
GetEntries(TestDirectory, string.Format("te{0}st", "\0".ToString())); GetEntries(TestDirectory, string.Format("te{0}st", "\0".ToString()));
} }
#endif
[Fact] [Fact]
[PlatformSpecific(TestPlatforms.Windows)] // ? in search pattern returns results [PlatformSpecific(TestPlatforms.Windows)] // ? in search pattern returns results
@ -986,6 +988,7 @@ namespace System.IO.Tests
} }
} }
#if !MONODROID
[Theory, [Theory,
InlineData(" "), InlineData(" "),
InlineData(" "), InlineData(" "),
@ -1024,6 +1027,7 @@ namespace System.IO.Tests
Assert.Contains(Path.Combine(testDir.FullName, valid), GetEntries(testDir.FullName, valid)); Assert.Contains(Path.Combine(testDir.FullName, valid), GetEntries(testDir.FullName, valid));
} }
} }
#endif
#endregion #endregion
} }

View File

@ -8,12 +8,14 @@ namespace System.IO.Tests
{ {
public class DirectoryInfo_Name : FileSystemTest public class DirectoryInfo_Name : FileSystemTest
{ {
#if !MONODROID
[Fact] [Fact]
public void CurrentDirectory() public void CurrentDirectory()
{ {
var info = new DirectoryInfo("."); var info = new DirectoryInfo(".");
Assert.Equal(Path.GetFileName(Directory.GetCurrentDirectory()), info.Name); Assert.Equal(Path.GetFileName(Directory.GetCurrentDirectory()), info.Name);
} }
#endif
[Fact] [Fact]
public void UNCShareName() public void UNCShareName()

View File

@ -247,12 +247,14 @@ namespace System.IO.Tests
Assert.False(Exists(component)); Assert.False(Exists(component));
} }
#if !MONODROID
[Theory, [Theory,
MemberData(nameof(UncPathsWithoutShareName))] MemberData(nameof(UncPathsWithoutShareName))]
public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component) public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component)
{ {
Assert.False(Exists(component)); Assert.False(Exists(component));
} }
#endif
[Theory, [Theory,
MemberData(nameof(PathsWithComponentLongerThanMaxComponent))] MemberData(nameof(PathsWithComponentLongerThanMaxComponent))]

View File

@ -130,6 +130,7 @@ namespace System.IO.Tests
Assert.Equal(0, File.ReadAllBytes(path).Length); Assert.Equal(0, File.ReadAllBytes(path).Length);
} }
#if !MONODROID
[Theory] [Theory]
[PlatformSpecific(TestPlatforms.Linux)] [PlatformSpecific(TestPlatforms.Linux)]
[InlineData("/proc/cmdline")] [InlineData("/proc/cmdline")]
@ -173,5 +174,6 @@ namespace System.IO.Tests
{ {
Assert.InRange(File.ReadAllBytes(path).Length, 1, int.MaxValue); Assert.InRange(File.ReadAllBytes(path).Length, 1, int.MaxValue);
} }
#endif
} }
} }

View File

@ -144,6 +144,7 @@ namespace System.IO.Tests
Assert.Equal(0, (await File.ReadAllBytesAsync(path)).Length); Assert.Equal(0, (await File.ReadAllBytesAsync(path)).Length);
} }
#if !MONODROID
[Theory] [Theory]
[PlatformSpecific(TestPlatforms.Linux)] [PlatformSpecific(TestPlatforms.Linux)]
[InlineData("/proc/cmdline")] [InlineData("/proc/cmdline")]
@ -187,5 +188,6 @@ namespace System.IO.Tests
{ {
Assert.InRange((await File.ReadAllBytesAsync(path)).Length, 1, int.MaxValue); Assert.InRange((await File.ReadAllBytesAsync(path)).Length, 1, int.MaxValue);
} }
#endif
} }
} }

View File

@ -29,6 +29,7 @@ namespace System.IO.Tests
Assert.False(File.Exists(fileName)); Assert.False(File.Exists(fileName));
} }
#if !MONODROID
[Fact] [Fact]
public void FileShareDeleteNewRename() public void FileShareDeleteNewRename()
{ {
@ -42,6 +43,7 @@ namespace System.IO.Tests
Assert.True(File.Exists(newFileName)); Assert.True(File.Exists(newFileName));
} }
} }
#endif
[Fact] [Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "CoreFX FileStream not yet imported")] [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "CoreFX FileStream not yet imported")]
@ -67,6 +69,7 @@ namespace System.IO.Tests
Assert.False(File.Exists(fileName)); Assert.False(File.Exists(fileName));
} }
#if !MONODROID
[Fact] [Fact]
public void FileShareDeleteExistingRename() public void FileShareDeleteExistingRename()
{ {
@ -86,6 +89,7 @@ namespace System.IO.Tests
Assert.True(File.Exists(newFileName)); Assert.True(File.Exists(newFileName));
} }
} }
#endif
[Fact] [Fact]
[PlatformSpecific(TestPlatforms.Windows)] // file sharing restriction limitations on Unix [PlatformSpecific(TestPlatforms.Windows)] // file sharing restriction limitations on Unix

View File

@ -218,6 +218,7 @@ namespace System.Reflection.Tests
public static IEnumerable<object[]> Methods => public static IEnumerable<object[]> Methods =>
Module.GetMethods().Select(m => new object[] { m }); Module.GetMethods().Select(m => new object[] { m });
#if !MONODROID
[Theory] [Theory]
[MemberData(nameof(Methods))] [MemberData(nameof(Methods))]
[SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Module.Resolve apis not supported on UapAot.")] [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Module.Resolve apis not supported on UapAot.")]
@ -225,6 +226,7 @@ namespace System.Reflection.Tests
{ {
Assert.Equal(t, Module.ResolveMethod(t.MetadataToken)); Assert.Equal(t, Module.ResolveMethod(t.MetadataToken));
} }
#endif
public static IEnumerable<object[]> BadResolveMethods => public static IEnumerable<object[]> BadResolveMethods =>
new[] new[]
@ -248,6 +250,7 @@ namespace System.Reflection.Tests
public static IEnumerable<object[]> Fields => public static IEnumerable<object[]> Fields =>
Module.GetFields().Select(f => new object[] { f }); Module.GetFields().Select(f => new object[] { f });
#if !MONODROID
[Theory] [Theory]
[MemberData(nameof(Fields))] [MemberData(nameof(Fields))]
[SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Module.Resolve apis not supported on UapAot.")] [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Module.Resolve apis not supported on UapAot.")]
@ -255,6 +258,7 @@ namespace System.Reflection.Tests
{ {
Assert.Equal(t, Module.ResolveField(t.MetadataToken)); Assert.Equal(t, Module.ResolveField(t.MetadataToken));
} }
#endif
public static IEnumerable<object[]> BadResolveFields => public static IEnumerable<object[]> BadResolveFields =>
new[] new[]

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "6.0.0.190"; public const string MonoVersion = "6.0.0.197";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -180,7 +180,7 @@ namespace MonoTests.Mono.Security.Cryptography {
} }
catch (CryptographicException ce) { catch (CryptographicException ce) {
// not everyone can write to the machine store // not everyone can write to the machine store
if (!(ce.InnerException is UnauthorizedAccessException)) if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw; throw;
Assert.Ignore ("Access denied to key containers files."); Assert.Ignore ("Access denied to key containers files.");
} }
@ -208,7 +208,7 @@ namespace MonoTests.Mono.Security.Cryptography {
} }
catch (CryptographicException ce) { catch (CryptographicException ce) {
// not everyone can write to the machine store // not everyone can write to the machine store
if (!(ce.InnerException is UnauthorizedAccessException)) if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw; throw;
Assert.Ignore ("Access denied to key containers files."); Assert.Ignore ("Access denied to key containers files.");
} }

View File

@ -850,7 +850,7 @@ public class DSACryptoServiceProviderTest {
catch (CryptographicException ce) { catch (CryptographicException ce) {
// only root can create the required directory (if inexistant) // only root can create the required directory (if inexistant)
// afterward anyone can use (read from) it // afterward anyone can use (read from) it
if (!(ce.InnerException is UnauthorizedAccessException)) if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw; throw;
} }
catch (UnauthorizedAccessException) { catch (UnauthorizedAccessException) {

View File

@ -1 +1 @@
c9011cb41f6f9a37736eb9d0ba9e89d39e203b67 181cf71935494b79c12bbaaf91e3e070add5033e

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a 7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1 573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
ab35bec467401fde399b5f27fac9b8d6df19eaca 61c024d204a54a55f550964baa702d5517a1a4c0

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a 7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1 573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
ab35bec467401fde399b5f27fac9b8d6df19eaca 61c024d204a54a55f550964baa702d5517a1a4c0

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a 7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1 573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
ab35bec467401fde399b5f27fac9b8d6df19eaca 61c024d204a54a55f550964baa702d5517a1a4c0

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
aa583f56071869bac3062f01221b9ef640d162f3 193d4bb6e5f0a0a27f21b67f27b055e90baa524e

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a 7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1 573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
6d4a7658061b515788cbb55e8a8ba9ef7396f14e 2b575d9d26085da4c65dd293c405e04300a3ed5f

View File

@ -1 +1 @@
8baf43efa6b35e2c1ad22ffa1a4d4ae485856265 e336b682d079a24db251bce9846dd56faea26341

View File

@ -346,6 +346,7 @@ OPDEF(MINT_BOX_VT, "box.vt", 3, MintOpTwoShorts)
OPDEF(MINT_UNBOX, "unbox", 2, MintOpClassToken) OPDEF(MINT_UNBOX, "unbox", 2, MintOpClassToken)
OPDEF(MINT_LDTOKEN, "ldtoken", 2, MintOpClassToken) /* not really */ OPDEF(MINT_LDTOKEN, "ldtoken", 2, MintOpClassToken) /* not really */
OPDEF(MINT_LDFTN, "ldftn", 2, MintOpMethodToken) OPDEF(MINT_LDFTN, "ldftn", 2, MintOpMethodToken)
OPDEF(MINT_LDFTN_DYNAMIC, "ldftn.dynamic", 1, MintOpMethodToken)
OPDEF(MINT_LDVIRTFTN, "ldvirtftn", 2, MintOpMethodToken) OPDEF(MINT_LDVIRTFTN, "ldvirtftn", 2, MintOpMethodToken)
OPDEF(MINT_CPOBJ, "cpobj", 2, MintOpClassToken) OPDEF(MINT_CPOBJ, "cpobj", 2, MintOpClassToken)
OPDEF(MINT_CPOBJ_VT, "cpobj.vt", 2, MintOpClassToken) OPDEF(MINT_CPOBJ_VT, "cpobj.vt", 2, MintOpClassToken)

View File

@ -1 +1 @@
fe3e8d1819d68b99735d4819b0466ec70edcac5f 56efbb6a33b62665d83673bfdedbbd9df80360b8

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/a418e94" #define FULL_VERSION "explicit/c7ae311"

View File

@ -1442,10 +1442,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local: @CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local: @HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

Binary file not shown.

View File

@ -1 +1 @@
d27845252900e7a29f889367c914886e5057ea85 e39b0993abc1a46d646dd618f0b44c75c5bb68b8

Binary file not shown.

View File

@ -1 +1 @@
bba3dea7a4d70b097345d73c850b78d19e6cf5fc 7cfb4b19643ac25f379b14c7ddfc9b313b2fac0c

Binary file not shown.

View File

@ -1 +1 @@
866fcf80050b130aa1b16bdaba078529f581b45e 9e382306678f9606244ff855babac1bccc131914

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.0.0.190\n" "Project-Id-Version: mono 6.0.0.197\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-04-22 21:43+0000\n" "POT-Creation-Date: 2019-04-25 08:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
682f1c0e11f965de2ef79f60fd6dbde3f0cced8f 5e28ab9b9e9b7e836e81ef2899fee5f7ca7802d3