[Port] [6000.4] SRP Core utils - Make sure the folder separator is the same for all the platforms.

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs

@@ -1838,32 +1838,48 @@ public static IEnumerable<T> LoadAllAssets<T>(string extension = "asset", bool a
             }
         }
 
+        const char k_DirectorySeparatorChar = '/';
+
         /// <summary>
         /// Create any missing folders in the file path given.
         /// </summary>
-        /// <param name="filePath">File or folder (ending with '/') path to ensure existence of each subfolder in. </param>
+        /// <param name="filePath">File or folder (ending with '/') path to ensure existence of each subfolder in.</param>
         public static void EnsureFolderTreeInAssetFilePath(string filePath)
         {
-            var path = filePath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
-            if (!path.StartsWith("Assets" + Path.DirectorySeparatorChar, StringComparison.CurrentCultureIgnoreCase))
-                throw new ArgumentException($"Path should start with \"Assets/\". Got {filePath}.", filePath);
+            if (string.IsNullOrEmpty(filePath))
+                return;
+
+            // Normalize to forward slashes (Unity standard)
+            var path = filePath.Replace('\\', k_DirectorySeparatorChar);
+
+            if (!path.StartsWith("Assets/", StringComparison.Ordinal))
+                throw new ArgumentException($"Path should start with \"Assets/\". Got {filePath}.", nameof(filePath));
 
             var folderPath = Path.GetDirectoryName(path);
 
-            if (!UnityEditor.AssetDatabase.IsValidFolder(folderPath))
+            if (string.IsNullOrEmpty(folderPath))
+                return;
+
+            // GetDirectoryName may reintroduce backslashes on Windows
+            folderPath = folderPath.Replace('\\', k_DirectorySeparatorChar);
+
+            // Early exit if folder already exists
+            if (AssetDatabase.IsValidFolder(folderPath))
+                return;
+
+            var folderNames = folderPath.Split(k_DirectorySeparatorChar);
+            string currentPath = "Assets";
+
+            for (int i = 1; i < folderNames.Length; ++i)
             {
-                var folderNames = folderPath.Split(Path.DirectorySeparatorChar);
-                string rootPath = "";
-                foreach (var folderName in folderNames)
-                {
-                    var newPath = rootPath + folderName;
-                    if (!UnityEditor.AssetDatabase.IsValidFolder(newPath))
-                        UnityEditor.AssetDatabase.CreateFolder(rootPath.TrimEnd(Path.DirectorySeparatorChar), folderName);
-                    rootPath = newPath + Path.DirectorySeparatorChar;
-                }
+                string nextPath = currentPath + k_DirectorySeparatorChar + folderNames[i];
+                if (!UnityEditor.AssetDatabase.IsValidFolder(nextPath))
+                    UnityEditor.AssetDatabase.CreateFolder(currentPath, folderNames[i]);
+                currentPath = nextPath;
             }
         }
 
+
         /// <summary>
         /// Returns the icon for the given type if it has an IconAttribute.
         /// </summary>

Packages/com.unity.render-pipelines.core/Tests/Editor/CoreUtils.Tests.EnsureFolderTreeInAssetFilePath.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 using NUnit.Framework;
 using UnityEngine.Rendering;
 
@@ -23,7 +24,13 @@ partial class CoreUtilsTests
         [TestCase("Assets/TestFolder/Folder#Test/SubFolder/", TestName = "Folder name containing a hash character")]
         [TestCase("Assets/TestFolder/Folder@Test/SubFolder/File.txt", TestName = "File name containing @ character")]
         [TestCase("Assets/TestFolder/Folder\\SubFolder/File", TestName = "File without extension")]
-
+        [TestCase("Assets/TestFolder//DoubleSlash/File.txt", TestName = "Path with double slashes")]
+        [TestCase("Assets/TestFolder///TripleSlash/File.txt", TestName = "Path with triple slashes")]
+        [TestCase("Assets/TestFolder/Mixed\\Separators/File.txt", TestName = "Mixed forward and backslashes")]
+        [TestCase("Assets/TestFolder/A/B/C/D/E/F/G/H/I/J/Deep.txt", TestName = "Deep nested path (10 levels)")]
+        [TestCase("Assets/TestFolder/Unicode文件夹/File.txt", TestName = "Unicode characters in folder name")]
+        [TestCase("Assets/TestFolder/Émojis😀/File.txt", TestName = "Emoji in folder name")]
+        [TestCase("Assets/TestFolder/VeryLongFolderNameThatExceedsNormalLength123456789012345678901234567890/File.txt", TestName = "Very long folder name")]
         public void EnsureFolderTreeInAssetFilePath(string path)
         {
             string folderPath = Path.GetDirectoryName(path);
@@ -34,15 +41,31 @@ public void EnsureFolderTreeInAssetFilePath(string path)
         [Test]
         [TestCase("Assets", TestName = "Just Assets and not Assets/")]
         [TestCase("NotAssetsFolder/TestFolder/", TestName = "FilePath does not start with Assets/")]
+        [TestCase("assets/TestFolder/", TestName = "Lowercase assets (case sensitivity)")]
+        [TestCase("ASSETS/TestFolder/", TestName = "Uppercase ASSETS")]
+        [TestCase("FileName.txt", TestName = "FileName.txt")]
+        [TestCase("C:\\Filename.txt", TestName = "C:\\Filename.txt")]
         public void EnsureFolderTreeInAssetFilePathThrows(string folderPath)
         {
             Assert.Throws<ArgumentException>(() => CoreUtils.EnsureFolderTreeInAssetFilePath(folderPath));
         }
 
+        [Test]
+        public void EnsureFolderTreeInAssetFilePath_NullOrEmpty_DoesNotThrow()
+        {
+            Assert.DoesNotThrow(() => CoreUtils.EnsureFolderTreeInAssetFilePath(null));
+            Assert.DoesNotThrow(() => CoreUtils.EnsureFolderTreeInAssetFilePath(""));
+            Assert.DoesNotThrow(() => CoreUtils.EnsureFolderTreeInAssetFilePath(string.Empty));
+        }
+
         [TearDown]
         public void TearDown()
         {
-            AssetDatabase.DeleteAsset("Assets/TestFolder");
+            if (AssetDatabase.IsValidFolder("Assets/TestFolder"))
+            {
+                AssetDatabase.DeleteAsset("Assets/TestFolder");
+            }
+            AssetDatabase.Refresh();
         }
     }
 }