mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 34821eaeb8913900219b044720fde8169552fbb2
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-04-25 08:59:08 +00:00
commit 3d7016fe2a
62 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acceptance-tests/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
03e14029783aba15abb306f217d0e7248879d1a7
83c0c15449e686f77a3888c04ba3b7942733bb25

2
acceptance-tests/roslyn.mk
View File

@ -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; \

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
73e8c9d278acfcd5e39a2e522cbcfc96598a7d01
88ae40fc58a5310e60c827d644a6ae69ac155d4e

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
acd5c22d85e3db995bbb3bcfa3b6b4d9d7c4af96
0346879ad8ae4821c830eca067aaa7e6b3c03ea9

2
external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs vendored
View File

@ -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

4
external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs vendored
View File

@ -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
}

2
external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Name.cs vendored
View File

@ -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()

2
external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs vendored
View File

@ -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))]

2
external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs vendored
View File

@ -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
}
}

2
external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs vendored
View File

@ -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
}
}

4
external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs vendored
View File

@ -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

4
external/corefx/src/System.Runtime/tests/System/Reflection/ModuleTests.cs vendored
View File

@ -218,6 +218,7 @@ namespace System.Reflection.Tests
public static IEnumerable<object[]> 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<object[]> BadResolveMethods =>
new[]
@ -248,6 +250,7 @@ namespace System.Reflection.Tests
public static IEnumerable<object[]> 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<object[]> BadResolveFields =>
new[]

2
mcs/build/common/Consts.cs
View File

@ -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";

4
mcs/class/Mono.Security/Test/Mono.Security.Cryptography/KeyPairPersistenceTest.cs
View File

@ -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.");
}

2
mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
View File

@ -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) {

2
mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs.REMOVED.git-id
View File

@ -1 +1 @@
c9011cb41f6f9a37736eb9d0ba9e89d39e203b67
181cf71935494b79c12bbaaf91e3e070add5033e

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77
6ea3ae9edc197662299ca0d3075e685019a7b8dd

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb
f1a222b408068895f22724347ada81b5003d862f

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

BIN
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More