Merge pull request #1231 from EOS-Contrib/release-6.0.0

[Public] Release 6.0.0

Author: DanF-ApexSystems

.github/README.md

@@ -69,9 +69,12 @@ There are many EOS features that do not require your player to have an Epic Game
 |[Voice with Lobbies](https://dev.epicgames.com/docs/game-services/voice#voicewithlobbies)   | ✅ | ["Lobbies"](/com.playeveryware.eos/Documentation~/scene_walkthrough/lobbies_walkthrough.md), [Information](/com.playeveryware.eos/Documentation~/enabling_voice.md)                            |  |
 |[Voice Trusted Server](https://dev.epicgames.com/docs/game-services/voice#voicewithatrustedserverapplication) | ❌ | NA                                                                                                           |  |
 
-Efforts will be made to add corresponding support to features as they are added to the Epic Online Services SDK. The table above reflects the features as of November 2023.
+Efforts will be made to add corresponding support to features as they are added to the Epic Online Services SDK. The table above reflects the features as of December 2025.
 
-[^2]: Overlay features aren't supported yet on mobile devices as of EOSSDK 1.17. That includes Social Overlay and Store Overlay.
+[^2]: As of EOS SDK 1.18.1.2, only the Store Overlay is supported on mobile. The Social Overlay isn't supported. 
+
+The mobile Epic Games Store is currently in closed beta. We’re excited to launch our self-publishing tools in the near future.
+Interested in joining our mobile store? Submit your game through our [Leads Intake form](https://e.acct.epicgames.com/click?EZWdzdG9yZS10ZWFtQGVwaWNnYW1lcy5jb20/CeyJtaWQiOiIxNzYzNTcxOTU3NDUzMTk2NTk2OGRjNzFiIiwiY3QiOiJlcGljLXR4LXByb2QtODI0ODA2ZmU0NDUwYjQ4ZTQ3MDVhODM3Y2Q4MzAwNGItMSIsInJkIjoiZXBpY2dhbWVzLmNvbSJ9/VaHR0cHM6Ly9mb3Jtcy51bnJlYWxlbmdpbmUuY29tL3MvZWdzLWxlYWQtaW50YWtlLWZvcm0/SWkhfYWNjdF9OTlRBTjExMTkyMDI1YzE4NjM3NjJiMQ/LYWUx/qP2xhbmd1YWdlPWVuX1VT/gaR35mw/JMTExOTIwMjVDMTg2Mzc2MkIx/s1v93de8f7c)
 
 ## Supported Platforms
 
@@ -83,6 +86,7 @@ We currently support the following platforms, details of each can be found on ou
 * Android
 * iOS
 * Nintendo Switch™
+* Nintendo Switch 2™
 * Xbox One
 * Xbox Series X|S
 * PlayStation®4

Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae602e95143c53fdde16671d45c8305eef62ec6b68f3c3354081b33d51a4ecc8
-size 26287120
+oid sha256:6313b4a6aff51216e778f1c86ca29a4ebb77c6e7e8558004e8ff0172f028fde8
+size 26666496

Assets/Plugins/Source/Editor/Build/EOSConfigBuildValidator.cs

@@ -0,0 +1,149 @@
+using PlayEveryWare.EpicOnlineServices;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+
+/// <summary>
+/// Validates platform-specific identifier and EOS-related configuration prior to starting a build.
+/// Implements <see cref="UnityEditor.Build.IPreprocessBuildWithReport"/> to run checks early in the
+/// build pipeline, preventing invalid builds and surfacing actionable diagnostics.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Responsibilities:<br/>
+/// - Verify that target platform has a valid deploy and sandbox ID.<br/>
+/// - Accumulate detected issues in <see cref="EOSConfigBuildValidator.ErrorCode"/> (via <c>errorCode</c>) and construct a
+///   human-readable summary using <c>BuildErrorMessage</c>.
+/// </para>
+/// <para>
+/// Behavior:<br/>
+/// - Runs during <see cref="OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport)"/>.<br/>
+/// - If any errors are detected, throws <see cref="UnityEditor.Build.BuildFailedException"/> with a
+///   detailed message to halt the build.<br/>
+/// - If no errors are present, the build continues normally.
+/// </para>
+/// <para>
+/// Notes:<br/>
+/// - Extend platform checks as needed (Android/iOS/Windows/macOS/PS4/PS5/XBox One/XBox Series)
+/// and align validation rules with your EOS Config.<br/>
+/// - Keep validations deterministic and side-effect free; this class should only read settings
+///   and report issues.
+/// </para>
+/// </remarks>
+public class EOSConfigBuildValidator : IPreprocessBuildWithReport
+{
+    /// <summary>
+    /// Error flags for the pre-build validation system.
+    /// Flags can be combined (bitwise) to represent multiple failures.
+    /// </summary>
+    [Flags]
+    private enum ErrorCode : uint
+    {
+        None = 0x0,
+        InvalidSandboxId = 0x1,
+        InvalidDeploymentId = 0x2,
+    }
+
+    /// <summary>
+    /// Maps Unity BuildTarget to PlatformManager.Platform
+    /// </summary>
+    private static readonly IDictionary<BuildTarget, PlatformManager.Platform> TargetToPlatformsMap =
+        new Dictionary<BuildTarget, PlatformManager.Platform>()
+        {
+                { BuildTarget.Android,             PlatformManager.Platform.Android     },
+                { BuildTarget.GameCoreXboxOne,     PlatformManager.Platform.XboxOne     },
+                { BuildTarget.GameCoreXboxSeries,  PlatformManager.Platform.XboxSeriesX },
+                { BuildTarget.iOS,                 PlatformManager.Platform.iOS         },
+                { BuildTarget.StandaloneLinux64,   PlatformManager.Platform.Linux       },
+                { BuildTarget.PS4,                 PlatformManager.Platform.PS4         },
+                { BuildTarget.PS5,                 PlatformManager.Platform.PS5         },
+                { BuildTarget.Switch,              PlatformManager.Platform.Switch      },
+                { BuildTarget.StandaloneOSX,       PlatformManager.Platform.macOS       },
+                { BuildTarget.StandaloneWindows,   PlatformManager.Platform.Windows     },
+                { BuildTarget.StandaloneWindows64, PlatformManager.Platform.Windows     },
+        };
+
+    /// <summary>
+    /// Returns the relative callback order for callbacks. Callbacks with lower values
+    /// are called before ones with higher values.
+    /// </summary>
+    public int callbackOrder => 0;
+
+    /// <summary>
+    /// Accumulates error flags detected during pre-build validation.
+    /// Uses bitwise combinations of <see cref="ErrorCode"/> to represent multiple issues in a single value.
+    /// </summary>
+    private ErrorCode errorCode = ErrorCode.None;
+
+    /// <summary>
+    /// Produces a human-readable message based on active error flags in <see cref = "errorCode" />.
+    /// Aggregates explanations and corrective actions for each flagged issue.
+    /// </summary>
+    /// <returns></returns>
+    private string BuildErrorMessage()
+    {
+        bool isInvalidSandbox = errorCode.HasFlag(ErrorCode.InvalidSandboxId);
+        bool isInvalidDeployment = errorCode.HasFlag(ErrorCode.InvalidDeploymentId);
+        if (isInvalidSandbox && isInvalidDeployment)
+        {
+            return "Both sandbox and deployment ID missing. Please configure a valid Deployment and Sandbox IDs in EOS Plugin->EOS Configuration.";
+        }
+
+        if (isInvalidDeployment)
+        {
+            return "Deployment ID is missing. Please configure a valid Deployment ID in EOS Plugin->EOS Configuration.";
+        }
+
+        return "Sandbox ID missing. Please configure a valid Sandbox ID in EOS Plugin->EOS Configuration.";
+    }
+
+    /// <summary>
+    /// Executes pre-build validations for platform-specific identifiers.
+    /// Verifies that target platform IDs are present and correctly formatted.
+    /// If inconsistencies or missing values are detected, the method
+    /// sets the corresponding flags in <see cref="errorCode"/> to block the build and notify the user.
+    /// </summary>
+    /// <param name="report">The BuildReport API gives you information about the Unity build process.</param>
+    /// <exception cref="BuildFailedException">An exception class that represents a failed build.</exception>
+    public void OnPreprocessBuild(BuildReport report)
+    {
+        errorCode = ErrorCode.None;
+        BuildTarget target = report.summary.platform;
+        if (!PlatformManager.TryGetConfigFilePath(target, out string configFilePath))
+        {
+            throw new BuildFailedException($"{target} not supported.");
+        }
+
+        if (!File.Exists(configFilePath))
+        {
+            throw new BuildFailedException($"{target} config file not found, Set EOS configuration.");
+        }
+
+        if (!TargetToPlatformsMap.TryGetValue(target, out PlatformManager.Platform supportedPlatform))
+        {
+            throw new BuildFailedException($"{target} not found on PlatformManager platforms.");
+        }
+
+        if (!PlatformManager.TryGetConfig(supportedPlatform, out PlatformConfig platformConfig))
+        {
+            throw new BuildFailedException("Platform manager was unable to obtain the platform configuration.");
+        }
+
+        if (String.IsNullOrEmpty(platformConfig.deployment.SandboxId.Value))
+        {
+            errorCode = errorCode | ErrorCode.InvalidSandboxId;
+        }
+        if (platformConfig.deployment.DeploymentId.Equals(Guid.Empty))
+        {
+            errorCode = errorCode | ErrorCode.InvalidDeploymentId;
+        }
+
+        if (errorCode != ErrorCode.None)
+        {
+            throw new BuildFailedException(BuildErrorMessage());
+        }
+    }
+}

…time/EOS_SDK/Generated/PageQuery.cs.meta …or/Build/EOSConfigBuildValidator.cs.metacom.playeveryware.eos/Runtime/EOS_SDK/Generated/PageQuery.cs.meta renamed to Assets/Plugins/Source/Editor/Build/EOSConfigBuildValidator.cs.meta com.playeveryware.eos/Runtime/EOS_SDK/Generated/PageQuery.cs.meta renamed to Assets/Plugins/Source/Editor/Build/EOSConfigBuildValidator.cs.meta

@@ -138,9 +138,6 @@ protected void AddProjectFileToBinaryMapping(string projectFile, params string[]
         /// <param name="report"></param>
         public virtual void PreBuild(BuildReport report)
         {
-            // Check to make sure that the platform configuration exists
-            CheckPlatformConfiguration();
-
             // Configure the version numbers per user defined preferences
             ConfigureVersion();
 
@@ -208,19 +205,6 @@ protected virtual void CheckPlatformBinaries()
             }
         }
 
-        /// <summary>
-        /// Checks to make sure that the platform configuration file exists where it is expected to be
-        /// TODO: Add configuration validation.
-        /// </summary>
-        private static void CheckPlatformConfiguration()
-        {
-            string configFilePath = PlatformManager.GetConfigFilePath();
-            if (!File.Exists(configFilePath))
-            {
-                throw new BuildFailedException($"Expected config file \"{configFilePath}\" for platform {PlatformManager.GetFullName(PlatformManager.CurrentPlatform)} does not exist.");
-            }
-        }
-
         /// <summary>
         /// Completes all configuration tasks.
         /// </summary>

Assets/Plugins/Source/Editor/Build/PlatformSpecificBuilder.cs

@@ -81,7 +81,7 @@ public class EOSSettingsWindow : EOSEditorWindow
             fontSize = 14,
             padding = new RectOffset(10, 10, 10, 10),
             alignment = TextAnchor.MiddleCenter,
-            fixedHeight = 40
+            fixedHeight = 60
         };
 
         public EOSSettingsWindow() : base("EOS Configuration") { }
@@ -137,6 +137,7 @@ private void ReloadClientCredentialsForPlatformConfigEditors(object sender,
                 // config within the PlatformConfigEditor.
                 platformConfigEditor.SetClientCredentials(platformConfigFromDisk.clientCredentials);
             }
+            Repaint();
         }
 
         // TODO: Refactor to reduce massive overlap between this function and 
@@ -168,13 +169,12 @@ private void ReloadDeploymentSettingsForPlatformConfigEditors(object sender, Pro
                 // within the PlatformConfigEditor.
                 platformConfigEditor.SetDeployment(platformConfigFromDisk.deployment);
             }
+            Repaint();
         }
 
         protected override async Task AsyncSetup()
         {
             await _productConfigEditor.LoadAsync();
-            
-            List<GUIContent> tabContents = new();
             int tabIndex = 0;
             foreach (PlatformManager.Platform platform in Enum.GetValues(typeof(PlatformManager.Platform)))
             {
@@ -209,8 +209,6 @@ protected override async Task AsyncSetup()
                 tabIndex++;
 
                 _platformConfigEditors.Add(editor);
-
-                tabContents.Add(new GUIContent($" {editor.GetLabelText()}", editor.GetPlatformIconTexture()));
             }
 
             // If (for some reason) a default platform was not selected, then
@@ -220,7 +218,7 @@ protected override async Task AsyncSetup()
                 _selectedTab = 0;
             }
 
-            _platformTabs = tabContents.ToArray();
+            _platformTabs = BuildPlatformTabsDynamic();
         }
 
         protected override void RenderWindow()
@@ -255,15 +253,104 @@ private void Save()
             // Save the product config editor
             _productConfigEditor.Save();
 
-            // reload the product config editor
-
+            //Update deployment in current platform
+            if(!ProductConfig.Get<ProductConfig>().Environments.TryGetFirstDefinedNamedDeployment(out var namedDep))
+            {
+                Debug.LogError($"{nameof(EOSSettingsWindow)} {nameof(Save)}: No named deployment found for current platform tab: {_platformConfigEditors[_selectedTab].GetPlatform()}");
+                return;
+            }
             // Save each of the platform config editors.
             foreach (IConfigEditor editor in _platformConfigEditors)
             {
                 editor.Save();
             }
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
+            _platformTabs = BuildPlatformTabsDynamic();
+            Repaint();
+        }
+
+        /// <summary>
+        /// Determines whether a Deployment object represents a valid and fully defined deployment.
+        /// </summary>
+        private static bool IsDeploymentSet(Deployment dep)
+        {
+            return dep.IsComplete && dep.DeploymentId != Guid.Empty;
+        }
+
+        /// <summary>
+        /// Produces a simple text label describing the deployment type based on its name.
+        /// </summary>
+        private static bool TryGetDeploymentDisplayName(ProductionEnvironments envs, Deployment target, out string displayName)
+        {
+            displayName = null;
+            if (envs == null || target.DeploymentId == Guid.Empty)
+            {
+                return false;
+            }
+
+            var named = envs.Deployments.FirstOrDefault(d => d != null && d.Value.DeploymentId == target.DeploymentId);
+
+            if (named != null)
+            {
+                displayName = named.Name;
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Converts a GUID into a shorter, UI-friendly representation.
+        /// Used only as a fallback when a deployment does not have a valid name.
+        /// </summary>
+        private static string ShortenGuid(Guid id)
+        {
+            var s = id.ToString("N");
+            return s.Length > 8 ? s.Substring(0, 8) : s;
+        }
+
+        /// <summary>
+        /// Builds the GUIContent array used for drawing the platform selection toolbar.
+        /// Unlike the static version initialized at window setup, this version refreshes
+        /// dynamically so that each platform tab displays the current deployment name
+        /// </summary>
+        private GUIContent[] BuildPlatformTabsDynamic()
+        {
+            var product = ProductConfig.Get<ProductConfig>();
+            var envs = product?.Environments;
+            var contents = new List<GUIContent>(_platformConfigEditors.Count);
+
+            foreach (var editor in _platformConfigEditors)
+            {
+                string platformLabel = editor.GetLabelText();
+                string deploymentName = "-";
+
+                if (PlatformManager.TryGetConfig(editor.GetPlatform(), out PlatformConfig cfg) && cfg != null)
+                {
+                    if (IsDeploymentSet(cfg.deployment))
+                    {
+                        if (TryGetDeploymentDisplayName(envs, cfg.deployment, out var displayName))
+                        {
+                            deploymentName = displayName;
+                        }
+                        else
+                        {
+                            deploymentName = ShortenGuid(cfg.deployment.DeploymentId);
+                        }
+                    }
+                    else
+                    {
+                        deploymentName = "nameless";
+                    }
+
+                }
+
+                string text = $" {platformLabel} \n [{deploymentName}]";
+                contents.Add(new GUIContent(text, editor.GetPlatformIconTexture()));
+            }
+
+            return contents.ToArray();
         }
     }
 }

Assets/Plugins/Source/Editor/EditorWindows/EOSSettingsWindow.cs

@@ -128,7 +128,7 @@ static public void UnzipFile(string pathToZipFile, string dest)
 
         protected override void Setup()
         {
-            pathToImportDescDirectory = Path.Combine(FileSystemUtility.GetProjectPath(), "etc/EOSImportDesriptions");
+            pathToImportDescDirectory = Path.Combine(FileSystemUtility.GetProjectPath(), "etc/EOSImportDescriptions");
             importInfoList = JsonUtility.FromJsonFile<PlatformImportInfoList>(Path.Combine(pathToImportDescDirectory, PlatformImportInfoListFileName));
         }