From d7674e6b7e812ca692f2a2daaa66b4acaeae0dd7 Mon Sep 17 00:00:00 2001
From: Aidas Motuzas <aidas@unity3d.com>
Date: Mon, 29 Jan 2024 12:44:45 +0200
Subject: [PATCH] Release 11.4.0

---
 com.unity.asset-store-tools/CHANGELOG.md      |  19 ++
 .../Editor/AssetStoreTools.cs                 |   7 +
 .../Editor/Uploader/AssetStoreUploader.cs     |   1 +
 .../Editor/Uploader/Scripts/AssetStoreAPI.cs  |  24 +-
 .../Uploader/Scripts/Data/ASAnalytics.cs      |  36 ++-
 .../Scripts/UI Elements/Upload/PackageView.cs |  21 ++
 .../Workflows/FolderUploadWorkflowView.cs     |   3 +-
 .../HybridPackageUploadWorkflowView.cs        |   3 +-
 .../Upload/Workflows/UploadWorkflowView.cs    |  30 +++
 .../Editor/Utility/ASToolsPreferences.cs      |  18 ++
 .../Editor/Utility/ASToolsUpdater.cs          | 251 ++++++++++++++++++
 .../Editor/Utility/ASToolsUpdater.cs.meta     |  11 +
 .../Editor/Utility/FileUtility.cs             | 101 ++++++-
 .../Editor/Utility/StyleSelector.cs           |  14 +-
 .../Editor/Utility/Styles.meta                |   8 +
 .../Editor/Utility/Styles/Updater.meta        |   8 +
 .../Utility/Styles/Updater/Updater_Dark.uss   |   7 +
 .../Styles/Updater/Updater_Dark.uss.meta      |  11 +
 .../Utility/Styles/Updater/Updater_Light.uss  |   7 +
 .../Styles/Updater/Updater_Light.uss.meta     |  11 +
 .../Utility/Styles/Updater/Updater_Main.uss   |  76 ++++++
 .../Styles/Updater/Updater_Main.uss.meta      |  11 +
 .../Editor/Validator/AssetStoreValidator.cs   |   4 +-
 .../Scripts/Tests/Check Animation Clips.asset |  26 ++
 .../Tests/Check Animation Clips.asset.meta    |   8 +
 .../Scripts/Tests/Check Audio Clipping.asset  |   3 +-
 .../Tests/Check Model Import Logs.asset       |  29 ++
 .../Tests/Check Model Import Logs.asset.meta  |   8 +
 .../Scripts/Tests/Check Package Size.asset    |  24 ++
 .../Tests/Check Package Size.asset.meta       |   8 +
 .../Tests/Test Methods/CheckAnimationClips.cs |  57 ++++
 .../Test Methods/CheckAnimationClips.cs.meta  |  11 +
 .../Tests/Test Methods/CheckDemoScenes.cs     |   9 +
 .../Test Methods/CheckModelImportLogs.cs      |  53 ++++
 .../Test Methods/CheckModelImportLogs.cs.meta |  11 +
 .../Tests/Test Methods/CheckPackageSize.cs    |  65 +++++
 .../Test Methods/CheckPackageSize.cs.meta     |  11 +
 .../Test Methods/CheckParticleSystems.cs      |   5 +
 .../Test Methods/Utility/ModelUtility.cs      | 143 ++++++++++
 .../Test Methods/Utility/ModelUtility.cs.meta |  11 +
 .../UI Elements/AutomatedTestElement.cs       |   7 +
 .../UI Elements/AutomatedTestsGroup.cs        |   3 +-
 com.unity.asset-store-tools/LICENSE.md        |   2 +-
 com.unity.asset-store-tools/package.json      |   2 +-
 44 files changed, 1165 insertions(+), 13 deletions(-)
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss
 create mode 100644 com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs.meta
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs
 create mode 100644 com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs.meta

diff --git a/com.unity.asset-store-tools/CHANGELOG.md b/com.unity.asset-store-tools/CHANGELOG.md
index 0a2d59c..509252c 100644
--- a/com.unity.asset-store-tools/CHANGELOG.md
+++ b/com.unity.asset-store-tools/CHANGELOG.md
@@ -1,6 +1,25 @@
 # Changelog
 All notable changes to this package will be documented in this file.
 
+## [11.4.0] - 2024-01-23
+
+### Uploader Changes
+- Added prevention of uploading packages larger than 6 GB
+- Added a prompt to allow automatically generating meta files within hidden folders
+- Fixed some obsolete API usage warnings in newer Unity versions
+
+### Validator Changes
+- Added validation tests for:
+    - Animation Clip take names
+	- Model import logs
+	- Uncompressed Package size
+- Updated the fail severity of Audio Clipping validation test
+- Updated the Demo Scene test to treat default scenes with custom skyboxes as valid demo scenes
+- Fixed some obsolete API usage warnings in newer Unity versions
+
+### Other
+- Added an option to check for Asset Store Publishing Tools updates
+
 ## [11.3.1] - 2023-08-14
 
 ### Uploader Changes
diff --git a/com.unity.asset-store-tools/Editor/AssetStoreTools.cs b/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
index 25a0a83..e9b51c4 100644
--- a/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
+++ b/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
@@ -44,6 +44,13 @@ public static void OpenFeedback()
             Application.OpenURL("https://forum.unity.com/threads/new-asset-store-tools-version-coming-july-20th-2022.1310939/");
         }
 
+        [MenuItem("Asset Store Tools/Check for Updates", false, 45)]
+        public static void OpenUpdateChecker()
+        {
+            var wnd = GetWindowWithRect<ASToolsUpdater>(new Rect(Screen.width / 2, Screen.height / 2, 400, 150), true);
+            wnd.Show();
+        }
+
         [MenuItem("Asset Store Tools/Settings", false, 50)]
         public static void OpenSettings()
         {
diff --git a/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs b/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs
index f40f3a8..d8b0c4b 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs
+++ b/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs
@@ -14,6 +14,7 @@ namespace AssetStoreTools.Uploader
     internal class AssetStoreUploader : AssetStoreToolsWindow
     {
         public const string MinRequiredPackageVersion = "2021.3";
+        public const long MaxPackageSizeBytes = 6442450944; // 6 GB
 
         private const string MainWindowVisualTree = "Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Base/BaseWindow_Main";
         private const string DebugPhrase = "debug";
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs
index 11c3c8b..a2cb723 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs
@@ -22,7 +22,7 @@ namespace AssetStoreTools.Uploader
     /// </summary>
     internal static class AssetStoreAPI
     {
-        public const string ToolVersion = "V6.3.1";
+        public const string ToolVersion = "V6.4.0";
 
         private const string UnauthSessionId = "26c4202eb475d02864b40827dfff11a14657aa41";
         private const string KharmaSessionId = "kharma.sessionid";
@@ -556,6 +556,28 @@ public static void AbortPackageUpload(string packageId)
         #endregion
 
         #region Utility Methods
+        
+        public static async Task<APIResult> GetLatestAssetStoreToolsVersion()
+        {
+            try
+            {
+                var url = "https://api.assetstore.unity3d.com/package/latest-version/115";
+                var result = await httpClient.GetAsync(url);
+
+                result.EnsureSuccessStatusCode();
+
+                var resultStr = await result.Content.ReadAsStringAsync();
+
+                var json = JSONParser.SimpleParse(resultStr);
+
+                return new APIResult() { Success = true, Response = json };
+            }
+            catch (Exception e)
+            {
+                return new APIResult() { Success = false, Error = ASError.GetGenericError(e) };
+            }
+        }
+        
         private static string GetLicenseHash()
         {
             return UnityEditorInternal.InternalEditorUtility.GetAuthToken().Substring(0, 40);
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs
index a91b18e..b809abb 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs
@@ -1,4 +1,5 @@
-using UnityEditor;
+using System;
+using UnityEditor;
 using UnityEngine.Analytics;
 
 namespace AssetStoreTools.Uploader.Data
@@ -14,12 +15,19 @@ internal static class ASAnalytics
         
         static bool EnableAnalytics()
         {
+#if UNITY_2023_2_OR_NEWER
+            return true;
+#else
             var result = EditorAnalytics.RegisterEventWithLimit(EventName, MaxEventsPerHour, MaxNumberOfElements, VendorKey, VersionId);
             return result == AnalyticsResult.Ok;
+#endif
         }
 
         [System.Serializable]
         public struct AnalyticsData
+#if UNITY_2023_2_OR_NEWER
+            : IAnalytic.IData
+#endif
         {
             public string ToolVersion;
             public string PackageId;
@@ -33,6 +41,26 @@ public struct AnalyticsData
             public string EndpointUrl;
         }
 
+#if UNITY_2023_2_OR_NEWER
+        [AnalyticInfo(eventName: EventName, vendorKey: VendorKey, version: VersionId, maxEventsPerHour: MaxEventsPerHour, maxNumberOfElements: MaxNumberOfElements)]
+        private class AssetStoreToolsAnalytic : IAnalytic
+        {
+            private AnalyticsData _data;
+
+            public AssetStoreToolsAnalytic(AnalyticsData data)
+            {
+                _data = data;
+            }
+
+            public bool TryGatherData(out IAnalytic.IData data, out Exception error)
+            {
+                error = null;
+                data = _data;
+                return data != null;
+            }
+        }
+#endif
+
         public static void SendUploadingEvent(AnalyticsData data)
         {
             if (!EditorAnalytics.enabled)
@@ -40,7 +68,13 @@ public static void SendUploadingEvent(AnalyticsData data)
 
             if (!EnableAnalytics())
                 return;
+
+#if UNITY_2023_2_OR_NEWER
+            var analytic = new AssetStoreToolsAnalytic(data);
+            EditorAnalytics.SendAnalytic(analytic);
+#else
             EditorAnalytics.SendEventWithLimit(EventName, data, VersionId);
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/PackageView.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/PackageView.cs
index cf50420..eab295b 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/PackageView.cs	
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/PackageView.cs	
@@ -442,6 +442,24 @@ private async Task<ExportResult> ExportPackage(string outputPath)
             return exportResult;
         }
 
+        private bool ValidatePackageSize(string packagePath)
+        {
+            long packageSize = new FileInfo(packagePath).Length;
+            long packageSizeLimit = AssetStoreUploader.MaxPackageSizeBytes;
+            float packageSizeInGB = packageSize / (1024f * 1024f * 1024f);
+            float maxPackageSizeInGB = packageSizeLimit / (1024f * 1024f * 1024f);
+
+            if (packageSizeInGB - maxPackageSizeInGB < 0.1f)
+                return true;
+
+            var message = $"The size of your package ({packageSizeInGB:0.#} GB) exceeds the maximum allowed package size of {maxPackageSizeInGB:0.#} GB.\n\n" +
+                $"Please reduce the size of your package.";
+
+            EditorUtility.DisplayDialog("Asset Store Tools", message, "OK");
+
+            return false;
+        }
+
         private bool ValidateUnityVersionsForUpload()
         {
             if (!AssetStoreUploader.ShowPackageVersionDialog)
@@ -488,6 +506,9 @@ private async void PreparePackageUpload()
                 return;
             }
 
+            if (!ValidatePackageSize(exportResult.ExportedPath))
+                return;
+
             if (!ValidateUnityVersionsForUpload())
                 return;
 
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/FolderUploadWorkflowView.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/FolderUploadWorkflowView.cs
index 5f5ca79..8cbced9 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/FolderUploadWorkflowView.cs	
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/FolderUploadWorkflowView.cs	
@@ -299,7 +299,8 @@ private void HandleFolderUploadPathSelection(string relativeExportPath, List<str
             if (dependencies != null && dependencies.Count != 0)
                 FindAndPopulateDependencies(dependencies);
 
-            // After setting up the main and extra paths update validation paths
+            // After setting up the main and extra paths, check for missing metas and update validation paths
+            CheckForMissingMetas();
             UpdateValidationPaths();
 
             // Only serialize current selection when no serialized toggles were passed
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/HybridPackageUploadWorkflowView.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/HybridPackageUploadWorkflowView.cs
index e7b0a01..8884d43 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/HybridPackageUploadWorkflowView.cs	
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/HybridPackageUploadWorkflowView.cs	
@@ -193,7 +193,8 @@ private void HandleHybridUploadPathSelection(string relativeExportPath, string r
             if (pathsToAdd.Count != 0)
                 PopulateExtraPackagesBox(pathsToAdd, serializedToggles);
 
-            // After setting up the main and extra paths update validation paths
+            // After setting up the main and extra paths, check for missing metas and update validation paths
+            CheckForMissingMetas();
             UpdateValidationPaths();
 
             if (serializeValues)
diff --git a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/UploadWorkflowView.cs b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/UploadWorkflowView.cs
index b56c308..ed4bf98 100644
--- a/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/UploadWorkflowView.cs	
+++ b/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Upload/Workflows/UploadWorkflowView.cs	
@@ -164,6 +164,36 @@ private string DeserializePath(JsonValue pathDict)
             return exportPath;
         }
 
+        protected void CheckForMissingMetas()
+        {
+            if (ASToolsPreferences.Instance.DisplayHiddenMetaDialog && FileUtility.IsMissingMetaFiles(GetAllExportPaths()))
+            {
+                var selectedOption = EditorUtility.DisplayDialogComplex(
+                    "Notice",
+                    "Your package includes hidden folders which do not contain meta files. " +
+                    "Hidden folders will not be exported unless they contain meta files.\n\nWould you like meta files to be generated?",
+                    "Yes", "No", "No and do not display this again");
+
+                switch (selectedOption)
+                {
+                    case 0:
+                        FileUtility.GenerateMetaFiles(GetAllExportPaths());
+                        EditorUtility.DisplayDialog(
+                            "Success",
+                            "Meta files have been generated. Please note that further manual tweaking may be required to set up correct references",
+                            "OK");
+                        break;
+                    case 1:
+                        // Do nothing
+                        return;
+                    case 2:
+                        ASToolsPreferences.Instance.DisplayHiddenMetaDialog = false;
+                        ASToolsPreferences.Instance.Save();
+                        return;
+                }
+            }
+        }
+
         public bool GetValidationSummary(out string validationSummary)
         {
             return ValidationElement.GetValidationSummary(out validationSummary);
diff --git a/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs b/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
index 32bb0f5..2eaf3c1 100644
--- a/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
+++ b/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
@@ -21,8 +21,10 @@ private ASToolsPreferences()
 
         private void Load()
         {
+            CheckForUpdates = PlayerPrefs.GetInt("AST_CheckForUpdates", 1) == 1;
             LegacyVersionCheck = PlayerPrefs.GetInt("AST_LegacyVersionCheck", 1) == 1;
             UploadVersionCheck = PlayerPrefs.GetInt("AST_UploadVersionCheck", 1) == 1;
+            DisplayHiddenMetaDialog = PlayerPrefs.GetInt("AST_HiddenFolderMetaCheck", 1) == 1;
             EnableSymlinkSupport = PlayerPrefs.GetInt("AST_EnableSymlinkSupport", 0) == 1;
             UseLegacyExporting = PlayerPrefs.GetInt("AST_UseLegacyExporting", 0) == 1;
             DisplayUploadDialog = PlayerPrefs.GetInt("AST_DisplayUploadDialog", 0) == 1;
@@ -30,8 +32,10 @@ private void Load()
 
         public void Save(bool triggerSettingsChange = false)
         {
+            PlayerPrefs.SetInt("AST_CheckForUpdates", CheckForUpdates ? 1 : 0);
             PlayerPrefs.SetInt("AST_LegacyVersionCheck", LegacyVersionCheck ? 1 : 0);
             PlayerPrefs.SetInt("AST_UploadVersionCheck", UploadVersionCheck ? 1 : 0);
+            PlayerPrefs.SetInt("AST_HiddenFolderMetaCheck", DisplayHiddenMetaDialog ? 1 : 0);
             PlayerPrefs.SetInt("AST_EnableSymlinkSupport", EnableSymlinkSupport ? 1 : 0);
             PlayerPrefs.SetInt("AST_UseLegacyExporting", UseLegacyExporting ? 1 : 0);
             PlayerPrefs.SetInt("AST_DisplayUploadDialog", DisplayUploadDialog ? 1 : 0);
@@ -41,6 +45,11 @@ public void Save(bool triggerSettingsChange = false)
                 OnSettingsChange?.Invoke();
         }
 
+        /// <summary>
+        /// Periodically check if an update for the Asset Store Publishing Tools is available
+        /// </summary>
+        public bool CheckForUpdates;
+
         /// <summary>
         /// Check if legacy Asset Store Tools are in the Project
         /// </summary>
@@ -51,6 +60,11 @@ public void Save(bool triggerSettingsChange = false)
         /// </summary>
         public bool UploadVersionCheck;
 
+        /// <summary>
+        /// Enables a DisplayDialog when hidden folders are found to be missing meta files
+        /// </summary>
+        public bool DisplayHiddenMetaDialog;
+
         /// <summary>
         /// Enables Junction symlink support
         /// </summary>
@@ -73,8 +87,10 @@ internal class ASToolsPreferencesProvider : SettingsProvider
         
         private class Styles
         {
+            public static readonly GUIContent CheckForUpdatesLabel = EditorGUIUtility.TrTextContent("Check for Updates", "Periodically check if an update for the Asset Store Publishing Tools is available.");
             public static readonly GUIContent LegacyVersionCheckLabel = EditorGUIUtility.TrTextContent("Legacy ASTools Check", "Enable Legacy Asset Store Tools version checking.");
             public static readonly GUIContent UploadVersionCheckLabel = EditorGUIUtility.TrTextContent("Upload Version Check", "Check if the package has been uploader from a correct Unity version at least once.");
+            public static readonly GUIContent DisplayHiddenMetaDialogLabel = EditorGUIUtility.TrTextContent("Display Hidden Folder Meta Dialog", "Show a DisplayDialog when hidden folders are found to be missing meta files.\nNote: this only affects hidden folders ending with a '~' character");
             public static readonly GUIContent EnableSymlinkSupportLabel = EditorGUIUtility.TrTextContent("Enable Symlink Support", "Enable Junction Symlink support. Note: folder selection validation will take longer.");
             public static readonly GUIContent UseLegacyExportingLabel = EditorGUIUtility.TrTextContent("Use Legacy Exporting", "Enabling this option uses native Unity methods when exporting packages for the Folder Upload workflow.\nNote: individual package dependency selection when choosing to 'Include Package Manifest' is unavailable when this option is enabled.");
             public static readonly GUIContent DisplayUploadDialogLabel = EditorGUIUtility.TrTextContent("Display Upload Dialog", "Show a DisplayDialog after the package uploading has finished.");
@@ -94,8 +110,10 @@ public override void OnGUI(string searchContext)
             EditorGUI.BeginChangeCheck();
             using (CreateSettingsWindowGUIScope())
             {
+                preferences.CheckForUpdates = EditorGUILayout.Toggle(Styles.CheckForUpdatesLabel, preferences.CheckForUpdates);
                 preferences.LegacyVersionCheck = EditorGUILayout.Toggle(Styles.LegacyVersionCheckLabel, preferences.LegacyVersionCheck);
                 preferences.UploadVersionCheck = EditorGUILayout.Toggle(Styles.UploadVersionCheckLabel, preferences.UploadVersionCheck);
+                preferences.DisplayHiddenMetaDialog = EditorGUILayout.Toggle(Styles.DisplayHiddenMetaDialogLabel, preferences.DisplayHiddenMetaDialog);
                 preferences.EnableSymlinkSupport = EditorGUILayout.Toggle(Styles.EnableSymlinkSupportLabel, preferences.EnableSymlinkSupport);
                 preferences.UseLegacyExporting = EditorGUILayout.Toggle(Styles.UseLegacyExportingLabel, preferences.UseLegacyExporting);
                 preferences.DisplayUploadDialog = EditorGUILayout.Toggle(Styles.DisplayUploadDialogLabel, preferences.DisplayUploadDialog);
diff --git a/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs b/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
new file mode 100644
index 0000000..6a0637a
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
@@ -0,0 +1,251 @@
+using AssetStoreTools.Uploader;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Utility
+{
+    [InitializeOnLoad]
+    internal class ASToolsUpdater : AssetStoreToolsWindow
+    {
+        private const string AssetStoreToolsUrl = "https://assetstore.unity.com/packages/tools/utilities/asset-store-publishing-tools-115";
+
+        protected override string WindowTitle => "Asset Store Tools Update Check";
+
+        private VisualElement _loadingContainer;
+        private VisualElement _versionInfoContainer;
+
+        private Image _loadingImage;
+        private double _lastTimeSinceStartup;
+        private double _timeSinceLoadingImageChange;
+        private int _loadingImageIndex;
+
+        private static bool _updateCheckPerformed
+        {
+            get
+            {
+                return SessionState.GetBool("AST_UpdateChecked", false);
+            }
+            set
+            {
+                SessionState.SetBool("AST_UpdateChecked", value);
+            }
+        }
+
+        static ASToolsUpdater()
+        {
+            // Retrieving cached SessionState/PlayerPrefs values is not allowed from an instance field initializer
+            EditorApplication.update += CheckForUpdatesAfterEditorUpdate;
+        }
+
+        private static async void CheckForUpdatesAfterEditorUpdate()
+        {
+            EditorApplication.update -= CheckForUpdatesAfterEditorUpdate;
+
+            if (!ShouldCheckForUpdates())
+                return;
+
+            await CheckForUpdates((success, currentVersion, latestVersion) =>
+            {
+                if (success && currentVersion < latestVersion)
+                {
+                    AssetStoreTools.OpenUpdateChecker();
+                }
+            });
+        }
+
+        private static bool ShouldCheckForUpdates()
+        {
+            if (!ASToolsPreferences.Instance.CheckForUpdates)
+                return false;
+
+            return _updateCheckPerformed == false;
+        }
+
+        private static async Task CheckForUpdates(Action<bool, Version, Version> OnUpdatesChecked)
+        {
+            _updateCheckPerformed = true;
+            var latestVersionResult = await AssetStoreAPI.GetLatestAssetStoreToolsVersion();
+            if (!latestVersionResult.Success)
+            {
+                OnUpdatesChecked?.Invoke(false, null, null);
+                return;
+            }
+
+            Version currentVersion = null;
+            Version latestVersion = null;
+
+            try
+            {
+                var latestVersionStr = latestVersionResult.Response["version"].AsString();
+                var currentVersionStr = PackageUtility.GetAllLocalPackages().FirstOrDefault(x => x.name == "com.unity.asset-store-tools").version;
+
+                currentVersion = new Version(currentVersionStr);
+                latestVersion = new Version(latestVersionStr);
+            }
+            catch
+            {
+                OnUpdatesChecked?.Invoke(false, null, null);
+            }
+
+            OnUpdatesChecked?.Invoke(true, currentVersion, latestVersion);
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+
+            rootVisualElement.styleSheets.Add(StyleSelector.UpdaterWindow.UpdaterWindowStyle);
+            rootVisualElement.styleSheets.Add(StyleSelector.UpdaterWindow.UpdaterWindowTheme);
+
+            SetupLoadingSpinner();
+            _ = CheckForUpdates(OnVersionsRetrieved);
+        }
+
+        private void OnVersionsRetrieved(bool success, Version currentVersion, Version latestVersion)
+        {
+            if (_loadingContainer != null)
+                _loadingContainer.style.display = DisplayStyle.None;
+
+            if (success)
+            {
+                SetupVersionInfo(currentVersion, latestVersion);
+            }
+            else
+            {
+                SetupFailInfo();
+            }
+        }
+
+        private void SetupLoadingSpinner()
+        {
+            _loadingContainer = new VisualElement();
+            _loadingContainer.AddToClassList("loading-container");
+            _loadingImage = new Image();
+            EditorApplication.update += LoadingSpinLoop;
+
+            _loadingContainer.Add(_loadingImage);
+            rootVisualElement.Add(_loadingContainer);
+        }
+
+        private void SetupVersionInfo(Version currentVersion, Version latestVersion)
+        {
+            _versionInfoContainer = new VisualElement();
+            _versionInfoContainer.AddToClassList("version-info-container");
+            
+            AddDescriptionLabels(currentVersion, latestVersion);
+            AddUpdateButtons(currentVersion, latestVersion);
+            AddCheckForUpdatesToggle();
+
+            rootVisualElement.Add(_versionInfoContainer);
+        }
+
+        private void AddDescriptionLabels(Version currentVersion, Version latestVersion)
+        {
+            var descriptionText = currentVersion < latestVersion ?
+                "An update to the Asset Store Publishing Tools is available. Updating to the latest version is highly recommended." :
+                "Asset Store Publishing Tools are up to date!";
+
+            var labelContainer = new VisualElement();
+            labelContainer.AddToClassList("version-info-container-labels");
+            var descriptionLabel = new Label(descriptionText);
+            descriptionLabel.AddToClassList("version-info-container-labels-description");
+
+            var currentVersionRow = new VisualElement();
+            currentVersionRow.AddToClassList("version-info-container-labels-row");
+            var latestVersionRow = new VisualElement();
+            latestVersionRow.AddToClassList("version-info-container-labels-row");
+
+            var currentVersionLabel = new Label("Current version:");
+            currentVersionLabel.AddToClassList("version-info-container-labels-row-identifier");
+            var latestVersionLabel = new Label("Latest version:");
+            latestVersionLabel.AddToClassList("version-info-container-labels-row-identifier");
+
+            var currentVersionLabelValue = new Label(currentVersion.ToString());
+            var latestVersionLabelValue = new Label(latestVersion.ToString());
+
+            currentVersionRow.Add(currentVersionLabel);
+            currentVersionRow.Add(currentVersionLabelValue);
+            latestVersionRow.Add(latestVersionLabel);
+            latestVersionRow.Add(latestVersionLabelValue);
+
+            labelContainer.Add(descriptionLabel);
+            labelContainer.Add(currentVersionRow);
+            labelContainer.Add(latestVersionRow);
+
+            _versionInfoContainer.Add(labelContainer);
+        }
+
+        private void AddUpdateButtons(Version currentVersion, Version latestVersion)
+        {
+            if (currentVersion >= latestVersion)
+                return;
+
+            var buttonContainer = new VisualElement();
+            buttonContainer.AddToClassList("version-info-container-buttons");
+            var latestVersionButton = new Button(() => Application.OpenURL(AssetStoreToolsUrl)) { text = "Get the latest version" };
+            var skipVersionButton = new Button(Close) { text = "Skip for now" };
+
+            buttonContainer.Add(latestVersionButton);
+            buttonContainer.Add(skipVersionButton);
+
+            _versionInfoContainer.Add(buttonContainer);
+        }
+
+        private void AddCheckForUpdatesToggle()
+        {
+            var toggleContainer = new VisualElement();
+            toggleContainer.AddToClassList("version-info-container-toggle");
+            var checkForUpdatesToggle = new Toggle() { text = "Check for Updates", value = ASToolsPreferences.Instance.CheckForUpdates };
+            checkForUpdatesToggle.RegisterValueChangedCallback(OnCheckForUpdatesToggleChanged);
+
+            toggleContainer.Add(checkForUpdatesToggle);
+            _versionInfoContainer.Add(toggleContainer);
+        }
+
+        private void OnCheckForUpdatesToggleChanged(ChangeEvent<bool> evt)
+        {
+            ASToolsPreferences.Instance.CheckForUpdates = evt.newValue;
+            ASToolsPreferences.Instance.Save();
+        }
+
+        private void SetupFailInfo()
+        {
+            var failContainer = new VisualElement();
+            failContainer.AddToClassList("fail-container");
+
+            var failImage = new Image();
+            var failDescription = new Label("Asset Store Publishing Tools could not retrieve information about the latest version.");
+
+            failContainer.Add(failImage);
+            failContainer.Add(failDescription);
+
+            rootVisualElement.Add(failContainer);
+        }
+
+        private void LoadingSpinLoop()
+        {
+            var currentTimeSinceStartup = EditorApplication.timeSinceStartup;
+            var deltaTime = EditorApplication.timeSinceStartup - _lastTimeSinceStartup;
+            _lastTimeSinceStartup = currentTimeSinceStartup;
+
+            _timeSinceLoadingImageChange += deltaTime;
+            if (_timeSinceLoadingImageChange < 0.075)
+                return;
+
+            _timeSinceLoadingImageChange = 0;
+
+            _loadingImage.image = EditorGUIUtility.IconContent($"WaitSpin{_loadingImageIndex++:00}").image;
+            if (_loadingImageIndex > 11)
+                _loadingImageIndex = 0;
+        }
+
+        private void OnDestroy()
+        {
+            EditorApplication.update -= LoadingSpinLoop;
+        }
+    }
+}
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta b/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta
new file mode 100644
index 0000000..d0e4183
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ac370b9d2279ed4c9faec7134ba2759
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs b/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
index c99f01b..68cb70f 100644
--- a/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
+++ b/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
@@ -1,9 +1,18 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
 
 namespace AssetStoreTools.Utility
 {
     internal static class FileUtility
     {
+        private class RenameInfo
+        {
+            public string OriginalName;
+            public string CurrentName;
+        }
+
         public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive)
         {
             // Get information about the source directory
@@ -36,5 +45,95 @@ public static void CopyDirectory(string sourceDir, string destinationDir, bool r
                 }
             }
         }
+
+        public static bool IsMissingMetaFiles(params string[] sourcePaths)
+        {
+            foreach (var sourcePath in sourcePaths)
+            {
+                var allDirectories = Directory.GetDirectories(sourcePath, "*", SearchOption.AllDirectories);
+                foreach (var dir in allDirectories)
+                {
+                    var dirInfo = new DirectoryInfo(dir);
+                    if (dirInfo.Name.EndsWith("~"))
+                    {
+                        var nestedContent = dirInfo.GetFileSystemInfos("*", SearchOption.AllDirectories);
+
+                        foreach (var nested in nestedContent)
+                        {
+                            // .meta files, hidden files and OSX .DS_STORE files do not require their own metas
+                            if (nested.FullName.EndsWith(".meta")
+                                || nested.FullName.EndsWith("~")
+                                || nested.Name.Equals(".DS_Store"))
+                                continue;
+
+                            if (!File.Exists(nested.FullName + ".meta"))
+                                return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public static void GenerateMetaFiles(params string[] sourcePaths)
+        {
+            var renameInfos = new List<RenameInfo>();
+
+            foreach (var sourcePath in sourcePaths)
+            {
+                var hiddenDirectoriesInPath = Directory.GetDirectories(sourcePath, "*", SearchOption.AllDirectories).Where(x => x.EndsWith("~"));
+                foreach (var hiddenDir in hiddenDirectoriesInPath)
+                    renameInfos.Add(new RenameInfo() { CurrentName = hiddenDir, OriginalName = hiddenDir });
+            }
+
+
+            try
+            {
+                EditorApplication.LockReloadAssemblies();
+
+                // Order paths from longest to shortest to avoid having to rename them multiple times
+                renameInfos = renameInfos.OrderByDescending(x => x.OriginalName.Length).ToList();
+
+                try
+                {
+                    AssetDatabase.StartAssetEditing();
+                    foreach (var renameInfo in renameInfos)
+                    {
+                        renameInfo.CurrentName = renameInfo.OriginalName.TrimEnd('~');
+                        Directory.Move(renameInfo.OriginalName, renameInfo.CurrentName);
+                    }
+                }
+                finally
+                {
+                    AssetDatabase.StopAssetEditing();
+                    AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+                }
+
+                // Restore the original path names in reverse order
+                renameInfos = renameInfos.OrderBy(x => x.OriginalName.Length).ToList();
+
+                try
+                {
+                    AssetDatabase.StartAssetEditing();
+                    foreach (var renameInfo in renameInfos)
+                    {
+                        Directory.Move(renameInfo.CurrentName, renameInfo.OriginalName);
+
+                        if (File.Exists($"{renameInfo.CurrentName}.meta"))
+                            File.Delete($"{renameInfo.CurrentName}.meta");
+                    }
+                }
+                finally
+                {
+                    AssetDatabase.StopAssetEditing();
+                    AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+                }
+            }
+            finally
+            {
+                EditorApplication.UnlockReloadAssemblies();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs b/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
index d221cb4..017ae33 100644
--- a/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
+++ b/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
@@ -39,10 +39,20 @@ public static class ValidatorWindow
         {
             private const string StylesPath = "Packages/com.unity.asset-store-tools/Editor/Validator/Styles";
 
-            public static StyleSheet BaseWindowStyle => GetStylesheet($"{StylesPath}/Validator_Main.uss");
-            public static StyleSheet BaseWindowTheme => !EditorGUIUtility.isProSkin ?
+            public static StyleSheet ValidatorWindowStyle => GetStylesheet($"{StylesPath}/Validator_Main.uss");
+            public static StyleSheet ValidatorWindowTheme => !EditorGUIUtility.isProSkin ?
                 GetStylesheet($"{StylesPath}/Validator_Light.uss") :
                 GetStylesheet($"{StylesPath}/Validator_Dark.uss");
         }
+
+        public static class UpdaterWindow
+        {
+            private const string StylesPath = "Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater";
+
+            public static StyleSheet UpdaterWindowStyle => GetStylesheet($"{StylesPath}/Updater_Main.uss");
+            public static StyleSheet UpdaterWindowTheme => !EditorGUIUtility.isProSkin ?
+                GetStylesheet($"{StylesPath}/Updater_Light.uss") :
+                GetStylesheet($"{StylesPath}/Updater_Dark.uss");
+        }
     }
 }
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles.meta b/com.unity.asset-store-tools/Editor/Utility/Styles.meta
new file mode 100644
index 0000000..0175b81
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f730eb0b8c48c434d93cc60a0b8aff40
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta
new file mode 100644
index 0000000..315b99b
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5367435d9abe935438f4d7b588a55488
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss
new file mode 100644
index 0000000..3b4e83d
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss
@@ -0,0 +1,7 @@
+.loading-container > VisualElement > Image {
+	--unity-image: resource("d_WaitSpin00");
+}
+
+.fail-container > Image {
+	--unity-image: resource("console.erroricon@2x");
+}
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss.meta b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss.meta
new file mode 100644
index 0000000..31fca5d
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Dark.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 225786b34a57ee440b0c1b213902214a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss
new file mode 100644
index 0000000..ab641f7
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss
@@ -0,0 +1,7 @@
+.loading-container > VisualElement > Image {
+	--unity-image: resource("WaitSpin00");
+}
+
+.fail-container > Image {
+	--unity-image: resource("console.erroricon@2x");
+}
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss.meta b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss.meta
new file mode 100644
index 0000000..9baabbf
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Light.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8cdc065c428afe14c96781ac6fd73d73
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss
new file mode 100644
index 0000000..df3761e
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss
@@ -0,0 +1,76 @@
+.loading-container {
+	flex-grow: 1;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-container > Image {
+	width: 16px;
+	height: 16px;
+}
+
+.version-info-container {
+	flex-grow: 1;
+	margin: 0 5px 5px 5px;
+}
+
+.version-info-container-labels {
+	flex-grow: 1;
+	margin-bottom: 10px;
+	margin-top: 5px;
+}
+
+.version-info-container-labels-description {
+	flex-grow: 0.5;
+	margin-bottom: 5px;
+	white-space: normal;
+	-unity-text-align: middle-left;
+}
+
+.version-info-container-labels-row {
+	flex-direction: row;
+}
+
+.version-info-container-labels-row-identifier {
+	-unity-font-style: bold;
+}
+
+.version-info-container-buttons {
+	flex-direction: row;
+	margin-bottom: 5px;
+}
+
+.version-info-container-buttons > Button {
+	flex-grow: 1;
+	flex-shrink: 1;
+	flex-basis: 100%;
+	height: 25px;
+}
+
+.version-info-container-toggle {
+	align-self: flex-end;
+}
+
+.version-info-container-toggle > Toggle > VisualElement > Label {
+	margin-left: 5px;
+}
+
+.fail-container {
+	flex-grow: 1;
+	flex-direction: row;
+	margin: 0 5px 5px 5px;
+	justify-content: center;
+	align-items: center;
+}
+
+.fail-container > Image {
+	flex-shrink: 0;
+	width: 36px;
+	height: 36px;
+	margin-right: 5px;
+}
+
+.fail-container > Label {
+	flex-shrink: 1;
+	white-space: normal;
+}
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss.meta b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss.meta
new file mode 100644
index 0000000..28d6012
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Updater_Main.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: daf82dcb916f6ae498d03a6a127122c6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/com.unity.asset-store-tools/Editor/Validator/AssetStoreValidator.cs b/com.unity.asset-store-tools/Editor/Validator/AssetStoreValidator.cs
index fe45a57..65e0b84 100644
--- a/com.unity.asset-store-tools/Editor/Validator/AssetStoreValidator.cs
+++ b/com.unity.asset-store-tools/Editor/Validator/AssetStoreValidator.cs
@@ -30,8 +30,8 @@ protected override void Init()
             root.Clear();
 
             // Getting a reference to the USS Document and adding stylesheet to the root
-            root.styleSheets.Add(StyleSelector.ValidatorWindow.BaseWindowStyle);
-            root.styleSheets.Add(StyleSelector.ValidatorWindow.BaseWindowTheme);
+            root.styleSheets.Add(StyleSelector.ValidatorWindow.ValidatorWindowStyle);
+            root.styleSheets.Add(StyleSelector.ValidatorWindow.ValidatorWindowTheme);
 
             ConstructWindow();
         }
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset
new file mode 100644
index 0000000..d96081d
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Animation Clips
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 31
+  Title: Check Animation Clips
+  Description: Animation Clips should not have the default name 'Take 001'. This
+    could lead to confusion when filtering assets by animation clips.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 0
+    AppliesToSubCategories: 1
+    Filter:
+    - Animation
+  TestScript: {fileID: 11500000, guid: 7a28985886f182c4bacc89a44777c742, type: 3}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset.meta
new file mode 100644
index 0000000..e647903
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Animation Clips.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e0426dd01b5136a4ca1d42d312e12fad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Audio Clipping.asset b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Audio Clipping.asset
index 3066b72..356c3ae 100644
--- a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Audio Clipping.asset	
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Audio Clipping.asset	
@@ -27,5 +27,6 @@ MonoBehaviour:
     IsFailFilter: 1
     IsInclusiveFilter: 1
     AppliesToSubCategories: 1
-    Filter: []
+    Filter:
+    - Audio
   TestScript: {fileID: 11500000, guid: f604db0353da0cb46bb048f5cd37186f, type: 3}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset
new file mode 100644
index 0000000..582e2bb
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset	
@@ -0,0 +1,29 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Model Import Logs
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 32
+  Title: Check Model Import Logs
+  Description: Model assets should work without issues. Please make sure that there
+    are no errors or warnings when these models are imported.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 3D
+    - Animation
+    - Essentials
+    - Templates
+  TestScript: {fileID: 11500000, guid: 98f3ec209166855408eaf4abe5bff591, type: 3}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset.meta
new file mode 100644
index 0000000..ba55c59
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Model Import Logs.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c889cdd91c2f41941a14363dad7a1a38
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset
new file mode 100644
index 0000000..8478bc0
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset	
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Package Size
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 30
+  Title: Check Package Size
+  Description: Package submissions should not be more than 6 GB in size
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 0
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: ee88143d11c82ff498e8318602cf22f8, type: 3}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset.meta
new file mode 100644
index 0000000..e5aadd9
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Check Package Size.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5da4c440d3728ba40b183c1de4a1c384
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs
new file mode 100644
index 0000000..050c9eb
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs	
@@ -0,0 +1,57 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.TestMethods.Utility;
+using NUnit.Framework;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckAnimationClips : ITestScript
+    {
+        private static readonly string[] InvalidNames = new[] { "Take 001" };
+
+        public TestResult Run(ValidationTestConfig config)
+        {
+            var result = new TestResult() { Result = TestResult.ResultStatus.Undefined };
+            var badModels = new Dictionary<UnityObject, List<UnityObject>>();
+            var models = AssetUtility.GetObjectsFromAssets<UnityObject>(config.ValidationPaths, AssetType.Model);
+
+            foreach(var model in models)
+            {
+                var badClips = new List<UnityObject>();
+                var clips = AssetDatabase.LoadAllAssetsAtPath(AssetUtility.ObjectToAssetPath(model));
+                foreach(var clip in clips)
+                {
+                    if (InvalidNames.Any(x => x.ToLower().Equals(clip.name.ToLower())))
+                    {
+                        badClips.Add(clip);
+                    }
+                }
+
+                if (badClips.Count > 0)
+                    badModels.Add(model, badClips);
+            }
+
+            if(badModels.Count > 0)
+            {
+                result.Result = TestResult.ResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following models have animation clips with invalid names. Animation clip names should be unique and reflective of the animation itself");
+                foreach(var kvp in badModels)
+                {
+                    result.AddMessage(AssetUtility.ObjectToAssetPath(kvp.Key), null, kvp.Value.ToArray());
+                }
+            }
+            else
+            {
+                result.AddMessage("No animation clips with invalid names were found!");
+                result.Result = TestResult.ResultStatus.Pass;
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs.meta
new file mode 100644
index 0000000..4529bdf
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckAnimationClips.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a28985886f182c4bacc89a44777c742
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckDemoScenes.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckDemoScenes.cs
index 114f6c5..999667a 100644
--- a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckDemoScenes.cs	
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckDemoScenes.cs	
@@ -2,6 +2,7 @@
 using AssetStoreTools.Validator.Data;
 using AssetStoreTools.Validator.TestDefinitions;
 using AssetStoreTools.Validator.TestMethods.Utility;
+using System;
 using System.IO;
 using System.Linq;
 using UnityEngine;
@@ -82,6 +83,14 @@ public TestResult Run(ValidationTestConfig config)
 
         private bool CanBeDemoScene(string scenePath)
         {
+            // Check skybox
+            var sceneSkyboxPath = AssetUtility.ObjectToAssetPath(RenderSettings.skybox).Replace("\\", "").Replace("/", "");
+            var defaultSkyboxPath = "Resources/unity_builtin_extra".Replace("\\", "").Replace("/", "");
+
+            if (!sceneSkyboxPath.Equals(defaultSkyboxPath, StringComparison.OrdinalIgnoreCase))
+                return true;
+
+            // Check GameObjects
             SceneUtility.OpenScene(scenePath);
             var rootObjects = SceneUtility.GetRootGameObjects();
             var count = rootObjects.Length;
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs
new file mode 100644
index 0000000..b1673f2
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs	
@@ -0,0 +1,53 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.TestMethods.Utility;
+using System.Collections.Generic;
+using System.Linq;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckModelImportLogs : ITestScript
+    {
+        public TestResult Run(ValidationTestConfig config)
+        {
+            var result = new TestResult() { Result = TestResult.ResultStatus.Undefined };
+
+            var models = AssetUtility.GetObjectsFromAssets<UnityObject>(config.ValidationPaths, AssetType.Model);
+            var importLogs = ModelUtility.GetImportLogs(models.ToArray());
+
+            var warningModels = new List<UnityObject>();
+            var errorModels = new List<UnityObject>();
+
+            foreach (var kvp in importLogs)
+            {
+                if (kvp.Value.Any(x => x.Severity == UnityEngine.LogType.Error))
+                    errorModels.Add(kvp.Key);
+                if (kvp.Value.Any(x => x.Severity == UnityEngine.LogType.Warning))
+                    warningModels.Add(kvp.Key);
+            }
+
+            if (warningModels.Count > 0 || errorModels.Count > 0)
+            {
+                if (warningModels.Count > 0)
+                {
+                    result.Result = TestResult.ResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following models contain import warnings:", null, warningModels.ToArray());
+                }
+
+                if (errorModels.Count > 0)
+                {
+                    result.Result = TestResult.ResultStatus.Fail;
+                    result.AddMessage("The following models contain import errors:", null, errorModels.ToArray());
+                }
+            }
+            else
+            {
+                result.Result = TestResult.ResultStatus.Pass;
+                result.AddMessage("No issues were detected when importing your models!");
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs.meta
new file mode 100644
index 0000000..884b6cb
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckModelImportLogs.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 98f3ec209166855408eaf4abe5bff591
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs
new file mode 100644
index 0000000..5e44b88
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs	
@@ -0,0 +1,65 @@
+using AssetStoreTools.Uploader;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.TestMethods.Utility;
+using System.Diagnostics;
+using System.IO;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckPackageSize : ITestScript
+    {
+        public TestResult Run(ValidationTestConfig config)
+        {
+            var result = new TestResult() { Result = TestResult.ResultStatus.Undefined };
+
+            var packageSize = CalculatePackageSize(config.ValidationPaths);
+            float packageSizeInGB = packageSize / (1024f * 1024f * 1024f);
+            float maxPackageSizeInGB = AssetStoreUploader.MaxPackageSizeBytes / (1024f * 1024f * 1024f);
+
+            if (packageSizeInGB - maxPackageSizeInGB >= 0.1f)
+            {
+                result.Result = TestResult.ResultStatus.Warning;
+
+                result.AddMessage($"The uncompressed size of your package ({packageSizeInGB:0.#} GB) exceeds the maximum allowed package size of {maxPackageSizeInGB:0.#} GB. " +
+                    $"Please make sure that the compressed .unitypackage size does not exceed the size limit.");
+            }
+            else
+            {
+                result.Result = TestResult.ResultStatus.Pass;
+                result.AddMessage("Your package does not exceed the maximum allowed package size!");
+            }
+
+            return result;
+        }
+
+        private long CalculatePackageSize(string[] assetPaths)
+        {
+            long totalSize = 0;
+
+            foreach(var path in assetPaths)
+            {
+                totalSize += CalculatePathSize(path);
+            }
+
+            return totalSize;
+        }
+
+        private long CalculatePathSize(string path)
+        {
+            long size = 0;
+
+            var dirInfo = new DirectoryInfo(path);
+            if (!dirInfo.Exists)
+                return size;
+
+            foreach (var file in dirInfo.EnumerateFiles())
+                size += file.Length;
+
+            foreach (var nestedDir in dirInfo.EnumerateDirectories())
+                size += CalculatePathSize(nestedDir.FullName);
+
+            return size;
+        }
+    }
+}
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs.meta
new file mode 100644
index 0000000..4e60fbd
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckPackageSize.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee88143d11c82ff498e8318602cf22f8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckParticleSystems.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckParticleSystems.cs
index 1da9bab..95f59b8 100644
--- a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckParticleSystems.cs	
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/CheckParticleSystems.cs	
@@ -29,7 +29,12 @@ public TestResult Run(ValidationTestConfig config)
                     continue;
                 }
 
+#if UNITY_2023_1_OR_NEWER
+                var particleSystems = GameObject.FindObjectsByType<ParticleSystem>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+#else
                 var particleSystems = GameObject.FindObjectsOfType<ParticleSystem>();
+#endif
+
                 foreach (var ps in particleSystems)
                 {
                     if (PrefabUtility.IsPartOfAnyPrefab(ps.gameObject))
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs
new file mode 100644
index 0000000..cfc663e
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs	
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEditor;
+using UnityEditor.AssetImporters;
+using UnityEngine;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods.Utility
+{
+    internal static class ModelUtility
+    {
+        public class LogEntry
+        {
+            public string Message;
+            public LogType Severity;
+        }
+
+#if !UNITY_2022_2_OR_NEWER
+        // Rig fields
+        private const string RigImportWarningsField = "m_RigImportWarnings";
+        private const string RigImportErrorsField = "m_RigImportErrors";
+
+        // Animation fields
+        private const string AnimationImportWarningsField = "m_AnimationImportWarnings";
+        private const string AnimationImportErrorsField = "m_AnimationImportErrors";
+
+        private static Editor _modelImporterEditor = null;
+#endif
+
+        public static Dictionary<UnityObject, List<LogEntry>> GetImportLogs(params UnityObject[] models)
+        {
+#if UNITY_2022_2_OR_NEWER
+            return GetImportLogsDefault(models);
+#else
+            return GetImportLogsLegacy(models);
+#endif
+        }
+
+#if UNITY_2022_2_OR_NEWER
+        private static Dictionary<UnityObject, List<LogEntry>> GetImportLogsDefault(params UnityObject[] models)
+        {
+            var modelsWithLogs = new Dictionary<UnityObject, List<LogEntry>>();
+
+            foreach (var model in models)
+            {
+                var modelLogs = new List<LogEntry>();
+
+                var importLog = AssetImporter.GetImportLog(AssetUtility.ObjectToAssetPath(model));
+
+                if (importLog == null)
+                    continue;
+
+                var entries = importLog.logEntries.Where(x => x.flags.HasFlag(ImportLogFlags.Warning) || x.flags.HasFlag(ImportLogFlags.Error));
+                foreach (var entry in entries)
+                {
+                    var severity = entry.flags.HasFlag(ImportLogFlags.Error) ? LogType.Error : LogType.Warning;
+                    modelLogs.Add(new LogEntry() { Message = entry.message, Severity = severity });
+                }
+
+                if (modelLogs.Count > 0)
+                    modelsWithLogs.Add(model, modelLogs);
+            }
+
+            return modelsWithLogs;
+        }
+#endif
+
+#if !UNITY_2022_2_OR_NEWER
+
+        private static Dictionary<UnityObject, List<LogEntry>> GetImportLogsLegacy(params UnityObject[] models)
+        {
+            var modelsWithLogs = new Dictionary<UnityObject, List<LogEntry>>();
+
+            foreach (var model in models)
+            {
+                var modelLogs = new List<LogEntry>();
+
+                // Load the Model Importer
+                var modelImporter = AssetUtility.GetAssetImporter(model) as ModelImporter;
+
+                var editorAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.GetName().Name.Equals("UnityEditor"));
+
+                var modelImporterEditorType = editorAssembly.GetType("UnityEditor.ModelImporterEditor");
+
+                // Load its Model Importer Editor
+                Editor.CreateCachedEditorWithContext(new UnityObject[] { modelImporter }, model, modelImporterEditorType, ref _modelImporterEditor);
+
+                // Find the base type
+                var modelImporterEditorTypeBase = _modelImporterEditor.GetType().BaseType;
+
+                // Get the tabs value
+                var tabsArrayType = modelImporterEditorTypeBase.GetRuntimeProperties().FirstOrDefault(x => x.Name == "tabs");
+                var tabsArray = (Array)tabsArrayType.GetValue(_modelImporterEditor);
+
+                // Get the tabs (Model | Rig | Animation | Materials)
+                var rigTab = tabsArray.GetValue(1);
+                var animationTab = tabsArray.GetValue(2);
+
+                var rigErrorsCheckSuccess = CheckFieldForSerializedProperty(rigTab, RigImportErrorsField, out var rigErrors);
+                var rigWarningsCheckSuccess = CheckFieldForSerializedProperty(rigTab, RigImportWarningsField, out var rigWarnings);
+                var animationErrorsCheckSuccess = CheckFieldForSerializedProperty(animationTab, AnimationImportErrorsField, out var animationErrors);
+                var animationWarningsCheckSuccess = CheckFieldForSerializedProperty(animationTab, AnimationImportWarningsField, out var animationWarnings);
+
+                if (!rigErrorsCheckSuccess || !rigWarningsCheckSuccess || !animationErrorsCheckSuccess || !animationWarningsCheckSuccess)
+                    UnityEngine.Debug.LogWarning($"An error was encountered when checking import logs for model '{model.name}'");
+
+                if (!string.IsNullOrEmpty(rigWarnings))
+                    modelLogs.Add(new LogEntry() { Message = rigWarnings, Severity = LogType.Warning });
+                if (!string.IsNullOrEmpty(rigErrors))
+                    modelLogs.Add(new LogEntry() { Message = rigErrors, Severity = LogType.Error });
+                if (!string.IsNullOrEmpty(animationWarnings))
+                    modelLogs.Add(new LogEntry() { Message = animationWarnings, Severity = LogType.Warning });
+                if (!string.IsNullOrEmpty(animationErrors))
+                    modelLogs.Add(new LogEntry() { Message = animationErrors, Severity = LogType.Error });
+
+                if (modelLogs.Count > 0)
+                    modelsWithLogs.Add(model, modelLogs);
+            }
+
+            return modelsWithLogs;
+        }
+
+        private static bool CheckFieldForSerializedProperty(object source, string propertyName, out string message)
+        {
+            message = string.Empty;
+
+            try
+            {
+                var propertyType = source.GetType().GetRuntimeFields().FirstOrDefault(x => x.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase));
+                var propertyValue = propertyType.GetValue(source) as SerializedProperty;
+                message = propertyValue.stringValue;
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs.meta b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs.meta
new file mode 100644
index 0000000..ebf9f2b
--- /dev/null
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/Tests/Test Methods/Utility/ModelUtility.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8a40a5c516b37d43b869d3d669bd87f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestElement.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestElement.cs
index 791d0a8..f406dce 100644
--- a/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestElement.cs	
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestElement.cs	
@@ -1,5 +1,6 @@
 using AssetStoreTools.Validator.Data;
 using AssetStoreTools.Validator.TestDefinitions;
+using System;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEditor.UIElements;
@@ -193,6 +194,12 @@ private void ConstructAutomatedTest()
             };
             testCaseDescription.AddToClassList("test-description");
 
+#if UNITY_2022_1_OR_NEWER
+            testCaseDescription.focusable = true;
+            testCaseDescription.selectAllOnFocus = false;
+            testCaseDescription.selectAllOnMouseUp = false;
+#endif
+
             _expandedBox = new VisualElement();
             _expandedBox.AddToClassList("test-expanded-box");
             
diff --git a/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestsGroup.cs b/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestsGroup.cs
index 8cb4d9e..3cd8a1c 100644
--- a/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestsGroup.cs	
+++ b/com.unity.asset-store-tools/Editor/Validator/Scripts/UI Elements/AutomatedTestsGroup.cs	
@@ -3,6 +3,7 @@
 using AssetStoreTools.Validator.TestDefinitions;
 using AssetStoreTools.Validator.Utility;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using UnityEditor;
 using UnityEditor.UIElements;
@@ -139,7 +140,7 @@ private void PopulateCategoryDropdown()
                 AddCategoriesToSet(categories, test.CategoryInfo);
             }
 
-            foreach (var category in categories)
+            foreach (var category in categories.OrderBy(x => x))
             {
                 list.AppendAction(ConvertSlashToUnicodeSlash(category), _ => OnCategoryValueChange(category));
             }
diff --git a/com.unity.asset-store-tools/LICENSE.md b/com.unity.asset-store-tools/LICENSE.md
index e6afb83..05073ba 100644
--- a/com.unity.asset-store-tools/LICENSE.md
+++ b/com.unity.asset-store-tools/LICENSE.md
@@ -1,5 +1,5 @@
 Asset Store Tools v2 copyright © 2023 Unity Technologies
 
-Source code of the package is licensed under the Unity Companion License (see https://unity3d.com/legal/licenses/unity_companion_license); otherwise licensed under the Unity Package Distribution License (see https://unity3d.com/legal/licenses/Unity_Package_Distribution_License )
+Source code of the package is licensed under the Unity Companion License (see https://unity.com/legal/licenses/unity-companion-license); otherwise licensed under the Unity Package Distribution License (see https://unity.com/legal/licenses/unity-package-distribution-license )
 
 Unless expressly provided otherwise, the software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
\ No newline at end of file
diff --git a/com.unity.asset-store-tools/package.json b/com.unity.asset-store-tools/package.json
index a5eed06..f156415 100644
--- a/com.unity.asset-store-tools/package.json
+++ b/com.unity.asset-store-tools/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.unity.asset-store-tools",
   "displayName": "Asset Store Tools",
-  "version": "11.3.1",
+  "version": "11.4.0",
   "unity": "2019.4",
   "description": "Whether you're a programmer, game designer, texture artist or 3D modeler, you're welcome to share your creations with everybody in the Unity developer community!",
   "type": "tool"