diff --git a/acceptance-tests/Makefile.in.REMOVED.git-id b/acceptance-tests/Makefile.in.REMOVED.git-id index d68587fc7b..6c0e239c2d 100644 --- a/acceptance-tests/Makefile.in.REMOVED.git-id +++ b/acceptance-tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -03e14029783aba15abb306f217d0e7248879d1a7 \ No newline at end of file +83c0c15449e686f77a3888c04ba3b7942733bb25 \ No newline at end of file diff --git a/acceptance-tests/roslyn.mk b/acceptance-tests/roslyn.mk index ab1a86652e..2458d372fa 100644 --- a/acceptance-tests/roslyn.mk +++ b/acceptance-tests/roslyn.mk @@ -1,4 +1,6 @@ check-roslyn: + @echo "Runnning roslyn tests using mono from PATH:" + mono --version @$(MAKE) validate-roslyn RESET_VERSIONS=1 cd $(ROSLYN_PATH); \ ./build.sh --restore --build --test --mono || exit; \ diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index bf950e082b..9d799c4ada 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -73e8c9d278acfcd5e39a2e522cbcfc96598a7d01 \ No newline at end of file +88ae40fc58a5310e60c827d644a6ae69ac155d4e \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d1a42d7c47..c2329523fc 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -acd5c22d85e3db995bbb3bcfa3b6b4d9d7c4af96 \ No newline at end of file +0346879ad8ae4821c830eca067aaa7e6b3c03ea9 \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs index 1db1170158..a837f8ec8e 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs @@ -315,12 +315,14 @@ namespace System.IO.Tests Assert.False(Exists(component)); } +#if !MONODROID [Theory, MemberData(nameof(UncPathsWithoutShareName))] public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component) { Assert.False(Exists(component)); } +#endif [Fact] [PlatformSpecific(TestPlatforms.Windows)] // max directory length not fixed on Unix diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs index 4a6bfdc7e5..024a98196c 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs @@ -905,6 +905,7 @@ namespace System.IO.Tests }); } +#if !MONODROID [Fact] [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-invalid search patterns throws no exception public void UnixSearchPatternInvalid() @@ -912,6 +913,7 @@ namespace System.IO.Tests GetEntries(TestDirectory, "\0"); GetEntries(TestDirectory, string.Format("te{0}st", "\0".ToString())); } +#endif [Fact] [PlatformSpecific(TestPlatforms.Windows)] // ? in search pattern returns results @@ -986,6 +988,7 @@ namespace System.IO.Tests } } +#if !MONODROID [Theory, InlineData(" "), InlineData(" "), @@ -1024,6 +1027,7 @@ namespace System.IO.Tests Assert.Contains(Path.Combine(testDir.FullName, valid), GetEntries(testDir.FullName, valid)); } } +#endif #endregion } diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Name.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Name.cs index d3aa9c4abd..6e85097e7f 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Name.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Name.cs @@ -8,12 +8,14 @@ namespace System.IO.Tests { public class DirectoryInfo_Name : FileSystemTest { +#if !MONODROID [Fact] public void CurrentDirectory() { var info = new DirectoryInfo("."); Assert.Equal(Path.GetFileName(Directory.GetCurrentDirectory()), info.Name); } +#endif [Fact] public void UNCShareName() diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs index 24eec6c5cb..1faf6f6418 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs @@ -247,12 +247,14 @@ namespace System.IO.Tests Assert.False(Exists(component)); } +#if !MONODROID [Theory, MemberData(nameof(UncPathsWithoutShareName))] public void UncPathWithoutShareNameAsPath_ReturnsFalse(string component) { Assert.False(Exists(component)); } +#endif [Theory, MemberData(nameof(PathsWithComponentLongerThanMaxComponent))] diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs index b92e5201bd..197e0f3319 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs @@ -130,6 +130,7 @@ namespace System.IO.Tests Assert.Equal(0, File.ReadAllBytes(path).Length); } +#if !MONODROID [Theory] [PlatformSpecific(TestPlatforms.Linux)] [InlineData("/proc/cmdline")] @@ -173,5 +174,6 @@ namespace System.IO.Tests { Assert.InRange(File.ReadAllBytes(path).Length, 1, int.MaxValue); } +#endif } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs index 3ca3eab7f1..25c874c6c3 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs @@ -144,6 +144,7 @@ namespace System.IO.Tests Assert.Equal(0, (await File.ReadAllBytesAsync(path)).Length); } +#if !MONODROID [Theory] [PlatformSpecific(TestPlatforms.Linux)] [InlineData("/proc/cmdline")] @@ -187,5 +188,6 @@ namespace System.IO.Tests { Assert.InRange((await File.ReadAllBytesAsync(path)).Length, 1, int.MaxValue); } +#endif } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs index 2bc83bda53..bc9c592f67 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs @@ -29,6 +29,7 @@ namespace System.IO.Tests Assert.False(File.Exists(fileName)); } +#if !MONODROID [Fact] public void FileShareDeleteNewRename() { @@ -42,6 +43,7 @@ namespace System.IO.Tests Assert.True(File.Exists(newFileName)); } } +#endif [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "CoreFX FileStream not yet imported")] @@ -67,6 +69,7 @@ namespace System.IO.Tests Assert.False(File.Exists(fileName)); } +#if !MONODROID [Fact] public void FileShareDeleteExistingRename() { @@ -86,6 +89,7 @@ namespace System.IO.Tests Assert.True(File.Exists(newFileName)); } } +#endif [Fact] [PlatformSpecific(TestPlatforms.Windows)] // file sharing restriction limitations on Unix diff --git a/external/corefx/src/System.Runtime/tests/System/Reflection/ModuleTests.cs b/external/corefx/src/System.Runtime/tests/System/Reflection/ModuleTests.cs index 498468cb2a..bdcafce9ef 100644 --- a/external/corefx/src/System.Runtime/tests/System/Reflection/ModuleTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Reflection/ModuleTests.cs @@ -218,6 +218,7 @@ namespace System.Reflection.Tests public static IEnumerable Methods => Module.GetMethods().Select(m => new object[] { m }); +#if !MONODROID [Theory] [MemberData(nameof(Methods))] [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)); } +#endif public static IEnumerable BadResolveMethods => new[] @@ -248,6 +250,7 @@ namespace System.Reflection.Tests public static IEnumerable Fields => Module.GetFields().Select(f => new object[] { f }); +#if !MONODROID [Theory] [MemberData(nameof(Fields))] [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)); } +#endif public static IEnumerable BadResolveFields => new[] diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 5c4b4ec8fa..5ddfb01f61 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.0.0.190"; + public const string MonoVersion = "6.0.0.197"; 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/Mono.Security/Test/Mono.Security.Cryptography/KeyPairPersistenceTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/KeyPairPersistenceTest.cs index 41b972bac5..d8050dbde7 100644 --- a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/KeyPairPersistenceTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/KeyPairPersistenceTest.cs @@ -180,7 +180,7 @@ namespace MonoTests.Mono.Security.Cryptography { } catch (CryptographicException ce) { // not everyone can write to the machine store - if (!(ce.InnerException is UnauthorizedAccessException)) + if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException)) throw; Assert.Ignore ("Access denied to key containers files."); } @@ -208,7 +208,7 @@ namespace MonoTests.Mono.Security.Cryptography { } catch (CryptographicException ce) { // not everyone can write to the machine store - if (!(ce.InnerException is UnauthorizedAccessException)) + if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException)) throw; Assert.Ignore ("Access denied to key containers files."); } diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs index ac005e2711..bc0d6994d5 100644 --- a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs @@ -850,7 +850,7 @@ public class DSACryptoServiceProviderTest { catch (CryptographicException ce) { // only root can create the required directory (if inexistant) // afterward anyone can use (read from) it - if (!(ce.InnerException is UnauthorizedAccessException)) + if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException)) throw; } catch (UnauthorizedAccessException) { diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs.REMOVED.git-id b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs.REMOVED.git-id index b0631e560e..ec8422255e 100644 --- a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs.REMOVED.git-id +++ b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs.REMOVED.git-id @@ -1 +1 @@ -c9011cb41f6f9a37736eb9d0ba9e89d39e203b67 \ No newline at end of file +181cf71935494b79c12bbaaf91e3e070add5033e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index b60e22537d..93cd0e607f 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file +6ea3ae9edc197662299ca0d3075e685019a7b8dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 37772ce4c7..0fababebcb 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file +f1a222b408068895f22724347ada81b5003d862f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 00f6a088ea..125135ddac 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file +e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index a53496affa..b12ed633c5 100644 Binary files a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index cce8725521..f74f5259c5 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file +7c33198f69feeb6579e3f58225e1f0e8ac7124ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 75f1e24d41..f57a1f4c02 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file +573311b27754edd7471b26643bd8eeffa55b5b89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 3cb61250ab..8fc3b39875 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file +e73142283b03345f330630803b4c58749bad9117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index d110c325ca..fe38a53ea6 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file +61c024d204a54a55f550964baa702d5517a1a4c0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index b60e22537d..93cd0e607f 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file +6ea3ae9edc197662299ca0d3075e685019a7b8dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 37772ce4c7..0fababebcb 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file +f1a222b408068895f22724347ada81b5003d862f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 00f6a088ea..125135ddac 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file +e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index a53496affa..b12ed633c5 100644 Binary files a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll and b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index cce8725521..f74f5259c5 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file +7c33198f69feeb6579e3f58225e1f0e8ac7124ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 75f1e24d41..f57a1f4c02 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file +573311b27754edd7471b26643bd8eeffa55b5b89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 3cb61250ab..8fc3b39875 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file +e73142283b03345f330630803b4c58749bad9117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index d110c325ca..fe38a53ea6 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file +61c024d204a54a55f550964baa702d5517a1a4c0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index b60e22537d..93cd0e607f 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file +6ea3ae9edc197662299ca0d3075e685019a7b8dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 37772ce4c7..0fababebcb 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file +f1a222b408068895f22724347ada81b5003d862f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 00f6a088ea..125135ddac 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file +e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index a53496affa..b12ed633c5 100644 Binary files a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll and b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index cce8725521..f74f5259c5 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file +7c33198f69feeb6579e3f58225e1f0e8ac7124ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 75f1e24d41..f57a1f4c02 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file +573311b27754edd7471b26643bd8eeffa55b5b89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 3cb61250ab..8fc3b39875 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file +e73142283b03345f330630803b4c58749bad9117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index d110c325ca..fe38a53ea6 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file +61c024d204a54a55f550964baa702d5517a1a4c0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index b60e22537d..93cd0e607f 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file +6ea3ae9edc197662299ca0d3075e685019a7b8dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 37772ce4c7..0fababebcb 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file +f1a222b408068895f22724347ada81b5003d862f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 70ae662fae..18561c5e95 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -aa583f56071869bac3062f01221b9ef640d162f3 \ No newline at end of file +193d4bb6e5f0a0a27f21b67f27b055e90baa524e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index a53496affa..b12ed633c5 100644 Binary files a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index cce8725521..f74f5259c5 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file +7c33198f69feeb6579e3f58225e1f0e8ac7124ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 75f1e24d41..f57a1f4c02 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file +573311b27754edd7471b26643bd8eeffa55b5b89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 3cb61250ab..8fc3b39875 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file +e73142283b03345f330630803b4c58749bad9117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index cc10b351be..c9d46b801d 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -6d4a7658061b515788cbb55e8a8ba9ef7396f14e \ No newline at end of file +2b575d9d26085da4c65dd293c405e04300a3ed5f \ No newline at end of file diff --git a/mono/mini/interp/interp.c.REMOVED.git-id b/mono/mini/interp/interp.c.REMOVED.git-id index 1171109ec4..3b7156e3f8 100644 --- a/mono/mini/interp/interp.c.REMOVED.git-id +++ b/mono/mini/interp/interp.c.REMOVED.git-id @@ -1 +1 @@ -8baf43efa6b35e2c1ad22ffa1a4d4ae485856265 \ No newline at end of file +e336b682d079a24db251bce9846dd56faea26341 \ No newline at end of file diff --git a/mono/mini/interp/mintops.def b/mono/mini/interp/mintops.def index d664dc52d0..3e332c78a7 100644 --- a/mono/mini/interp/mintops.def +++ b/mono/mini/interp/mintops.def @@ -346,6 +346,7 @@ OPDEF(MINT_BOX_VT, "box.vt", 3, MintOpTwoShorts) OPDEF(MINT_UNBOX, "unbox", 2, MintOpClassToken) OPDEF(MINT_LDTOKEN, "ldtoken", 2, MintOpClassToken) /* not really */ OPDEF(MINT_LDFTN, "ldftn", 2, MintOpMethodToken) +OPDEF(MINT_LDFTN_DYNAMIC, "ldftn.dynamic", 1, MintOpMethodToken) OPDEF(MINT_LDVIRTFTN, "ldvirtftn", 2, MintOpMethodToken) OPDEF(MINT_CPOBJ, "cpobj", 2, MintOpClassToken) OPDEF(MINT_CPOBJ_VT, "cpobj.vt", 2, MintOpClassToken) diff --git a/mono/mini/interp/transform.c.REMOVED.git-id b/mono/mini/interp/transform.c.REMOVED.git-id index b9bdbef3f3..a460247346 100644 --- a/mono/mini/interp/transform.c.REMOVED.git-id +++ b/mono/mini/interp/transform.c.REMOVED.git-id @@ -1 +1 @@ -fe3e8d1819d68b99735d4819b0466ec70edcac5f \ No newline at end of file +56efbb6a33b62665d83673bfdedbbd9df80360b8 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index e29889b922..163416d0c3 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/a418e94" +#define FULL_VERSION "explicit/c7ae311" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index fa36c48fae..4dc46b1f38 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1442,10 +1442,10 @@ 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." -@CROSS_COMPILE_TRUE@clean-local: -@HOST_WIN32_TRUE@clean-local: @CROSS_COMPILE_TRUE@test-local: @HOST_WIN32_TRUE@test-local: +@CROSS_COMPILE_TRUE@clean-local: +@HOST_WIN32_TRUE@clean-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 9e9f37875e..6d554fdc30 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 cb157e05ff..ae5867eb01 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -d27845252900e7a29f889367c914886e5057ea85 \ No newline at end of file +e39b0993abc1a46d646dd618f0b44c75c5bb68b8 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 5710133b23..f82891cc45 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 d90029fd65..7752ba0164 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -bba3dea7a4d70b097345d73c850b78d19e6cf5fc \ No newline at end of file +7cfb4b19643ac25f379b14c7ddfc9b313b2fac0c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 259317408e..42de670ba2 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 7efea7325d..7575db3e9a 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -866fcf80050b130aa1b16bdaba078529f581b45e \ No newline at end of file +9e382306678f9606244ff855babac1bccc131914 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index d44907985d..6c36a09bc7 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" 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" -"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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 71fbf6ab7d..24fdda6c03 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 c397274842..32f8b9dd4b 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -682f1c0e11f965de2ef79f60fd6dbde3f0cced8f \ No newline at end of file +5e28ab9b9e9b7e836e81ef2899fee5f7ca7802d3 \ No newline at end of file