Requested changes from Alex

src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Xunit;
-using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -21,7 +20,6 @@ public abstract class FileCleanupTestBase : IDisposable
         /// <summary>Initialize the test class base.  This creates the associated test directory.</summary>
         protected FileCleanupTestBase(string tempDirectory = null)
         {
-            //tempDirectory ??= PlatformDetection.IsNotAppleMobile ? Path.GetTempPath() : Environment.GetFolderPath(Environment.SpecialFolder.InternetCache);
             tempDirectory ??= Path.GetTempPath();
 
             // Use a unique test directory per test class.  The test directory lives in the user's temp directory,

src/libraries/Native/Unix/System.Native/pal_searchpath.m

@@ -14,7 +14,7 @@
 
 const char* SystemNative_SearchPath_TempDirectory()
 {
-    NSString* iosPath = NSTemporaryDirectory();
-    const char *path = [iosPath UTF8String];
+    NSString* tempPath = NSTemporaryDirectory();
+    const char *path = [tempPath UTF8String];
     return path == NULL ? NULL : strdup (path);
 }

src/mono/System.Private.CoreLib/src/System/Environment.iOS.cs

@@ -34,22 +34,16 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio
 
         private static string? GetSpecialFolder(SpecialFolder folder)
         {
-#if TARGET_TVOS
-        string? DocumentsSearchPath = CombineAndCreateSearchPath(NSSearchPathDirectory.NSLibraryDirectory, Path.Combine("Caches", "Documents"));
-#else
-        string? DocumentsSearchPath = Interop.Sys.SearchPath(NSSearchPathDirectory.NSDocumentDirectory);
-#endif
-
             switch (folder)
             {
                 case SpecialFolder.Personal:
                 case SpecialFolder.LocalApplicationData:
-                    return DocumentsSearchPath;
+                    return CombineDocumentDirectory(string.Empty);
 
                 case SpecialFolder.ApplicationData:
                     // note: at first glance that looked like a good place to return NSLibraryDirectory
                     // but it would break isolated storage for existing applications
-                    return DocumentsSearchPath != null ? Path.Combine(DocumentsSearchPath, ".config") : string.Empty;
+                    return CombineDocumentDirectory(".config");
 
                 case SpecialFolder.Resources:
                     return Interop.Sys.SearchPath(NSSearchPathDirectory.NSLibraryDirectory); // older (8.2 and previous) would return String.Empty
@@ -65,7 +59,7 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio
                     return Path.Combine(GetFolderPathCore(SpecialFolder.Personal, SpecialFolderOption.None), "Pictures");
 
                 case SpecialFolder.Templates:
-                    return DocumentsSearchPath != null ? Path.Combine(DocumentsSearchPath, "Templates") : string.Empty;
+                    return CombineDocumentDirectory("Templates");
 
                 case SpecialFolder.MyVideos:
                     return Path.Combine(GetFolderPathCore(SpecialFolder.Personal, SpecialFolderOption.None), "Videos");
@@ -74,7 +68,7 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio
                     return "/usr/share/templates";
 
                 case SpecialFolder.Fonts:
-                    return DocumentsSearchPath != null ? Path.Combine(DocumentsSearchPath, ".fonts") : string.Empty;
+                    return CombineDocumentDirectory(".fonts");
 
                 case SpecialFolder.Favorites:
                     return CombineSearchPath(NSSearchPathDirectory.NSLibraryDirectory, "Favorites");
@@ -103,20 +97,22 @@ static string CombineSearchPath(NSSearchPathDirectory searchPath, string subdire
                     string.Empty;
             }
 
-#if TARGET_TVOS
-            // Special version of CombineSearchPath which creates the path if needed.
-            // This isn't needed for "real" search paths which always exist, but on tvOS
-            // the base path is really a subdirectory we define rather than an OS directory.
-            // In order to not treat Directory.Exists(SpecialFolder.ApplicationData) differently
-            // on tvOS, guarantee that it exists by creating it here
-            static string CombineAndCreateSearchPath(NSSearchPathDirectory searchPath, string subdirectory)
+            static string CombineDocumentDirectory(string subdirectory)
             {
-                string path = CombineSearchPath(searchPath, subdirectory);
+#if TARGET_TVOS
+                string? path = CombineSearchPath(NSSearchPathDirectory.NSLibraryDirectory, Path.Combine("Caches", "Documents", subdirectory));
+                // Special version of CombineSearchPath which creates the path if needed.
+                // This isn't needed for "real" search paths which always exist, but on tvOS
+                // the base path is really a subdirectory we define rather than an OS directory.
+                // In order to not treat Directory.Exists(SpecialFolder.ApplicationData) differently
+                // on tvOS, guarantee that it exists by creating it here
                 if (!Directory.Exists (path))
                     Directory.CreateDirectory (path);
+#else
+                string? path = CombineSearchPath(NSSearchPathDirectory.NSDocumentDirectory, subdirectory);
+#endif
                 return path;
             }
-#endif
         }
     }
 }