74642 change isostorage path

src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj

@@ -10,6 +10,10 @@
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''">
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFile.cs" />
+    <Compile Condition="'$(TargetPlatformIdentifier)' == 'Android' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'MacCatalyst' or '$(TargetPlatformIdentifier)' == 'tvOS'"
+             Include="System\IO\IsolatedStorage\IsolatedStorageFile.AnyMobile.cs" />
+    <Compile Condition="'$(TargetPlatformIdentifier)' != 'Android' and '$(TargetPlatformIdentifier)' != 'iOS' and '$(TargetPlatformIdentifier)' != 'MacCatalyst' and '$(TargetPlatformIdentifier)' != 'tvOS'"
+             Include="System\IO\IsolatedStorage\IsolatedStorageFile.NonMobile.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFileStream.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorage.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageScope.cs" />

src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFile.AnyMobile.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.IO.IsolatedStorage
+{
+    public sealed partial class IsolatedStorageFile : IsolatedStorage, IDisposable
+    {
+        private string GetIsolatedStorageRoot()
+        {
+            return Helper.GetRootDirectory(Scope);
+        }
+    }
+}

src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFile.NonMobile.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text;
+
+namespace System.IO.IsolatedStorage
+{
+    public sealed partial class IsolatedStorageFile : IsolatedStorage, IDisposable
+    {
+        private string GetIsolatedStorageRoot()
+        {
+            StringBuilder root = new StringBuilder(Helper.GetRootDirectory(Scope));
+            root.Append(SeparatorExternal);
+            root.Append(IdentityHash);
+
+            return root.ToString();
+        }
+    }
+}

src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFile.cs

@@ -43,9 +43,7 @@ internal IsolatedStorageFile(IsolatedStorageScope scope)
             // InitStore will set up the IdentityHash
             InitStore(scope, null, null);
 
-            StringBuilder sb = new StringBuilder(Helper.GetRootDirectory(scope));
-            sb.Append(SeparatorExternal);
-            sb.Append(IdentityHash);
+            StringBuilder sb = new StringBuilder(GetIsolatedStorageRoot());
             sb.Append(SeparatorExternal);
 
             if (Helper.IsApplication(scope))

src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj

@@ -51,6 +51,10 @@
     <Compile Include="System\IO\IsolatedStorage\MoveFileTests.cs" />
     <Compile Include="System\IO\IsolatedStorage\OpenFileTests.cs" />
     <Compile Include="System\IO\IsolatedStorage\TestHelper.cs" />
+    <Compile Condition="'$(TargetPlatformIdentifier)' == 'Android' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'MacCatalyst' or '$(TargetPlatformIdentifier)' == 'tvOS'"
+             Include="System\IO\IsolatedStorage\TestHelper.AnyMobile.cs" />
+    <Compile Condition="'$(TargetPlatformIdentifier)' != 'Android' and '$(TargetPlatformIdentifier)' != 'iOS' and '$(TargetPlatformIdentifier)' != 'MacCatalyst' and '$(TargetPlatformIdentifier)' != 'tvOS'"
+             Include="System\IO\IsolatedStorage\TestHelper.NonMobile.cs" />
     <Compile Include="System\IO\IsolatedStorage\RemoveTests.cs" />
   </ItemGroup>
   <ItemGroup>

src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/TestHelper.AnyMobile.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace System.IO.IsolatedStorage
+{
+    public static partial class TestHelper
+    {
+        private static List<string> GetRoots()
+        {
+            List<string> roots = new List<string>();
+            string userRoot = Helper.GetDataDirectory(IsolatedStorageScope.User);
+            string randomUserRoot = Helper.GetRandomDirectory(userRoot, IsolatedStorageScope.User);
+            roots.Add(randomUserRoot);
+
+            // Application scope doesn't go under a random dir
+            roots.Add(userRoot);
+        }
+    }
+}

src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/TestHelper.NonMobile.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace System.IO.IsolatedStorage
+{
+    public static partial class TestHelper
+    {
+        private static List<string> GetRoots()
+        {
+            string hash;
+            object identity;
+            Helper.GetDefaultIdentityAndHash(out identity, out hash, '.');
+            List<string> roots = new List<string>();
+            string userRoot = Helper.GetDataDirectory(IsolatedStorageScope.User);
+            string randomUserRoot = Helper.GetRandomDirectory(userRoot, IsolatedStorageScope.User);
+
+            roots.Add(Path.Combine(randomUserRoot, hash));
+            // Application scope doesn't go under a random dir
+            roots.Add(Path.Combine(userRoot, hash));
+
+            // https://github.com/dotnet/runtime/issues/2092
+            // https://github.com/dotnet/runtime/issues/21742
+            if (OperatingSystem.IsWindows()
+                && !PlatformDetection.IsInAppContainer)
+            {
+                roots.Add(Helper.GetDataDirectory(IsolatedStorageScope.Machine));
+            }
+
+            return roots;
+        }
+    }
+}
+

src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/TestHelper.cs

@@ -8,7 +8,7 @@
 
 namespace System.IO.IsolatedStorage
 {
-    public static class TestHelper
+    public static partial class TestHelper
     {
         private static PropertyInfo s_rootDirectoryProperty;
         private static List<string> s_roots;
@@ -17,27 +17,8 @@ static TestHelper()
         {
             s_rootDirectoryProperty = typeof(IsolatedStorageFile).GetProperty("RootDirectory", BindingFlags.NonPublic | BindingFlags.Instance);
 
-            s_roots = new List<string>();
-
-            string hash;
-            object identity;
-            Helper.GetDefaultIdentityAndHash(out identity, out hash, '.');
-
-            string userRoot = Helper.GetDataDirectory(IsolatedStorageScope.User);
-            string randomUserRoot = Helper.GetRandomDirectory(userRoot, IsolatedStorageScope.User);
-            s_roots.Add(Path.Combine(randomUserRoot, hash));
-
-            // Application scope doesn't go under a random dir
-            s_roots.Add(Path.Combine(userRoot, hash));
-
-            // https://github.com/dotnet/runtime/issues/2092
-            // https://github.com/dotnet/runtime/issues/21742
-            if (OperatingSystem.IsWindows()
-                && !PlatformDetection.IsInAppContainer)
-            {
-                s_roots.Add(Helper.GetDataDirectory(IsolatedStorageScope.Machine));
-            }
-
+            s_roots = GetRoots();
+
             // We don't expose Roaming yet
             // Helper.GetDataDirectory(IsolatedStorageScope.Roaming);
         }