diff --git a/sources/engine/Stride.Assets/StrideConfig.cs b/sources/engine/Stride.Assets/StrideConfig.cs
index 3dab2730a6..c7b4e53d4c 100644
--- a/sources/engine/Stride.Assets/StrideConfig.cs
+++ b/sources/engine/Stride.Assets/StrideConfig.cs
@@ -23,15 +23,15 @@ public sealed class StrideConfig
         private static readonly Version VS2015Version = new Version(14, 0);
         private static readonly Version VSAnyVersion = new Version(int.MaxValue, int.MaxValue, int.MaxValue, int.MaxValue);
 
-        internal static readonly Dictionary<Version, string> XamariniOSComponents = new Dictionary<Version, string>
+        internal static readonly Dictionary<Version, string> DotNetForiOSComponents = new Dictionary<Version, string>
         {
-            { VSAnyVersion, @"Component.Xamarin" },
+            { VSAnyVersion, @"Microsoft.VisualStudio.Workload.NetCrossPlat" },
             { VS2015Version, @"MSBuild\Xamarin\iOS\Xamarin.iOS.CSharp.targets" }
         };
 
-        internal static readonly Dictionary<Version, string> XamarinAndroidComponents = new Dictionary<Version, string>
+        internal static readonly Dictionary<Version, string> DotNetForAndroidComponents = new Dictionary<Version, string>
         {
-            { VSAnyVersion, @"Component.Xamarin" },
+            { VSAnyVersion, @"Microsoft.VisualStudio.Workload.NetCrossPlat" },
             { VS2015Version, @"MSBuild\Xamarin\Android\Xamarin.Android.CSharp.targets" }
         };
 
@@ -143,7 +143,7 @@ internal static void RegisterSolutionPlatforms()
                 Name = PlatformType.Android.ToString(),
                 Type = PlatformType.Android,
                 TargetFramework = "net10.0-android",
-                IsAvailable = IsVSComponentAvailableAnyVersion(XamarinAndroidComponents)
+                IsAvailable = IsVSComponentAvailableAnyVersion(DotNetForAndroidComponents)
             };
             androidPlatform.DefineConstants.Add("STRIDE_PLATFORM_MONO_MOBILE");
             androidPlatform.DefineConstants.Add("STRIDE_PLATFORM_ANDROID");
@@ -170,7 +170,7 @@ internal static void RegisterSolutionPlatforms()
                 SolutionName = "iPhone", // For iOS, we need to use iPhone as a solution name
                 Type = PlatformType.iOS,
                 TargetFramework = "net10.0-ios",
-                IsAvailable = IsVSComponentAvailableAnyVersion(XamariniOSComponents)
+                IsAvailable = IsVSComponentAvailableAnyVersion(DotNetForiOSComponents)
             };
             iphonePlatform.PlatformsPart.Add(new SolutionPlatformPart("iPhoneSimulator"));
             iphonePlatform.DefineConstants.Add("STRIDE_PLATFORM_MONO_MOBILE");
@@ -240,12 +240,19 @@ internal static bool IsVSComponentAvailableAnyVersion(IDictionary<Version, strin
             {
                 if (pair.Key == VS2015Version)
                 {
-                    return IsFileInProgramFilesx86Exist(pair.Value);
+                    if (IsFileInProgramFilesx86Exist(pair.Value))
+                    {
+                        return true;
+                    }
+                    continue;
                 }
 
-                return VisualStudioVersions.AvailableInstances.Any(
+                if (VisualStudioVersions.AvailableInstances.Any(
                     ideInfo => ideInfo.PackageVersions.ContainsKey(pair.Value)
-                );
+                ))
+                {
+                    return true;
+                }
             }
             return false;
         }