From ed4e4efa643ab9ea90670572ce8ae51b36a2d1ce Mon Sep 17 00:00:00 2001 From: Jonathan Chambers Date: Fri, 13 Aug 2021 15:13:48 -0400 Subject: [PATCH] Exclude more types from unityaot profile. --- mcs/class/System/System.IO/FileSystemWatcher.cs | 2 ++ mcs/class/System/linux_unityaot_System.dll.sources | 2 +- mcs/class/System/macos_unityaot_System.dll.sources | 2 +- mcs/class/System/unityaot_fsw.sources | 6 ++++++ mcs/class/System/win32_unityaot_System.dll.sources | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 mcs/class/System/unityaot_fsw.sources diff --git a/mcs/class/System/System.IO/FileSystemWatcher.cs b/mcs/class/System/System.IO/FileSystemWatcher.cs index 33b1d0c8403e..2f1ae15a5cd2 100644 --- a/mcs/class/System/System.IO/FileSystemWatcher.cs +++ b/mcs/class/System/System.IO/FileSystemWatcher.cs @@ -198,9 +198,11 @@ internal string MangledFilter { internal SearchPattern2 Pattern { get { if (pattern == null) { +#if !UNITY_AOT if (watcher?.GetType () == typeof (KeventWatcher)) pattern = new SearchPattern2 (MangledFilter, true); //assume we want to ignore case (OS X) else +#endif pattern = new SearchPattern2 (MangledFilter); } return pattern; diff --git a/mcs/class/System/linux_unityaot_System.dll.sources b/mcs/class/System/linux_unityaot_System.dll.sources index 98dd9f0cd923..e47af5c8ebe0 100644 --- a/mcs/class/System/linux_unityaot_System.dll.sources +++ b/mcs/class/System/linux_unityaot_System.dll.sources @@ -5,7 +5,7 @@ System.CodeDom/CodeCompileUnit.cs System.CodeDom/CodeTypeDeclaration.cs -#include mono_fsw.sources +#include unityaot_fsw.sources ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.UnknownUnix.cs diff --git a/mcs/class/System/macos_unityaot_System.dll.sources b/mcs/class/System/macos_unityaot_System.dll.sources index 79e50a7b5907..f0f5fa1c4bcd 100644 --- a/mcs/class/System/macos_unityaot_System.dll.sources +++ b/mcs/class/System/macos_unityaot_System.dll.sources @@ -4,7 +4,7 @@ ../System.Web/System.Web.Util/HttpEncoder.cs System.CodeDom/CodeCompileUnit.cs System.CodeDom/CodeTypeDeclaration.cs -#include mono_fsw.sources +#include unityaot_fsw.sources ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.UnknownUnix.cs diff --git a/mcs/class/System/unityaot_fsw.sources b/mcs/class/System/unityaot_fsw.sources new file mode 100644 index 000000000000..7b791837da8a --- /dev/null +++ b/mcs/class/System/unityaot_fsw.sources @@ -0,0 +1,6 @@ +System.IO/DefaultWatcher.cs +System.IO/NullFileWatcher.cs +System.IO/FileAction.cs +System.IO/FileSystemWatcher.cs +System.IO/IFileWatcher.cs +System.IO/SearchPattern.cs diff --git a/mcs/class/System/win32_unityaot_System.dll.sources b/mcs/class/System/win32_unityaot_System.dll.sources index 95119bfed4db..4938dbc4db90 100644 --- a/mcs/class/System/win32_unityaot_System.dll.sources +++ b/mcs/class/System/win32_unityaot_System.dll.sources @@ -11,7 +11,7 @@ System.Net.NetworkInformation/Win32UnixFactoryPal.cs System.CodeDom/CodeCompileUnit.cs System.CodeDom/CodeTypeDeclaration.cs -#include mono_fsw.sources +#include unityaot_fsw.sources ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs ../../../external/corefx-bugfix/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.UnknownUnix.cs