From 2f9cc12618add4d16c5a2d3e04ed1e31f1ae0fa9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2019 21:06:46 +0200
Subject: [PATCH] [master] Update dependencies from dotnet/arcade
 dotnet/core-setup dotnet/corefx (mono/mono#17458)

* Update dependencies from https://github.com/dotnet/arcade build 20191018.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19518.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19518.2

* Update dependencies from https://github.com/dotnet/core-setup build 20191021.2

- Microsoft.NETCore.App - 5.0.0-alpha1.19521.2

* Update dependencies from https://github.com/dotnet/corefx build 20191020.7

- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha1.19520.7

* Update dependencies from https://github.com/dotnet/arcade build 20191023.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19523.3

* Update dependencies from https://github.com/dotnet/core-setup build 20191023.10

- Microsoft.NETCore.App - 5.0.0-alpha1.19523.10

* Update dependencies from https://github.com/dotnet/corefx build 20191023.8

- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha1.19523.8

* Disable a file system watcher test on mac

See https://github.com/mono/mono/issues/17547

* Reenable tests that were fixed


Commit migrated from https://github.com/mono/mono/commit/a7287bdae54c0539a74fdbe87eb73ba268a95ed6
---
 src/mono/netcore/CoreFX.issues.rsp     | 6 ------
 src/mono/netcore/CoreFX.issues_mac.rsp | 2 ++
 src/mono/netcore/Makefile              | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 src/mono/netcore/CoreFX.issues_mac.rsp

diff --git a/src/mono/netcore/CoreFX.issues.rsp b/src/mono/netcore/CoreFX.issues.rsp
index 0b6bc20..ab93e85 100644
--- a/src/mono/netcore/CoreFX.issues.rsp
+++ b/src/mono/netcore/CoreFX.issues.rsp
@@ -943,9 +943,3 @@
 # Requires NativeLibrary implementation
 -nomethod System.Net.Tests.HttpWebRequestTest.ServicePoint_GetValue_ExpectedResult
 
-# Remove once we get https://github.com/dotnet/corefx/pull/41924 through Arcade
--nomethod System.Tests.BufferTests.BlockCopy_Invalid
-# Remove once we get https://github.com/dotnet/corefx/pull/41851 through Arcade
--nomethod System.Text.Tests.DecoderConvert2.PosTest6
-# Remove once we get https://github.com/dotnet/corefx/pull/41926 through Arcade
--nomethod System.Security.Cryptography.DeriveBytesTests.PasswordDeriveBytesTests.GetBytes_ZeroLength
diff --git a/src/mono/netcore/CoreFX.issues_mac.rsp b/src/mono/netcore/CoreFX.issues_mac.rsp
new file mode 100644
index 0000000..d9eacab
--- /dev/null
+++ b/src/mono/netcore/CoreFX.issues_mac.rsp
@@ -0,0 +1,2 @@
+# https://github.com/mono/mono/issues/17547
+-nomethod System.IO.Tests.FileSystemWatcherTests_netstandard17.DroppedWatcher_Collectible
diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile
index c0bcc5a..8a490ac 100644
--- a/src/mono/netcore/Makefile
+++ b/src/mono/netcore/Makefile
@@ -32,7 +32,7 @@ PLATFORM_AOT_SUFFIX := .dylib
 PLATFORM_AOT_PREFIX := lib
 NETCORESDK_EXT = tar.gz
 UNZIPCMD = tar -xvf
-XUNIT_FLAGS = -notrait category=nonosxtests
+XUNIT_FLAGS = -notrait category=nonosxtests @../../../../CoreFX.issues_mac.rsp
 TESTS_PLATFORM = OSX.x64
 DOTNET := $(shell ./init-tools.sh | tail -1)
 endif
-- 
2.7.4