From 4cfde114bcba13e2b9bed34947bddd2b1578a411 Mon Sep 17 00:00:00 2001 From: Kirill Chikalin Date: Fri, 6 Dec 2024 09:00:35 +0300 Subject: [PATCH] remove textdecal submodule --- .gitmodules | 3 - .idea/.idea.textdecalURP/.idea/vcs.xml | 2 +- Assets/Resources.meta | 8 -- Assets/Samples | 2 +- Assets/space.chikalin.textdecal | 1 - Assets/space.chikalin.textdecal.meta | 8 -- .../com.unity.asset-store-tools/CHANGELOG.md | 14 +++ .../CHANGELOG.md.meta | 4 +- .../Editor/AssemblyInfo.cs.meta | 4 +- .../Editor/AssetStoreTools.cs | 14 +-- .../Editor/AssetStoreTools.cs.meta | 4 +- .../Editor/AssetStoreToolsWindow.cs.meta | 4 +- .../Editor/Exporter/ExportResult.cs.meta | 4 +- .../Editor/Exporter/ExporterSettings.cs.meta | 4 +- .../Editor/Exporter/PackageExporter.cs | 6 +- .../Editor/Exporter/PackageExporter.cs.meta | 4 +- .../Editor/Exporter/PackageExporterDefault.cs | 5 + .../Exporter/PackageExporterDefault.cs.meta | 4 +- .../Exporter/PackageExporterLegacy.cs.meta | 4 +- .../Unity.AssetStoreTools.Editor.asmdef.meta | 4 +- .../Uploader/AssetStoreUploader.cs.meta | 4 +- .../Uploader/Icons/open-in-browser.png.meta | 4 +- .../Icons/publisher_portal_black.png.meta | 4 +- .../Icons/publisher_portal_white.png.meta | 4 +- .../Editor/Uploader/Scripts/AssetStoreAPI.cs | 2 +- .../Uploader/Scripts/AssetStoreAPI.cs.meta | 4 +- .../Uploader/Scripts/Data/ASAnalytics.cs.meta | 4 +- .../Scripts/Data/OngoingUpload.cs.meta | 4 +- .../Uploader/Scripts/Data/PackageData.cs.meta | 4 +- .../Scripts/Data/PackageUploadResult.cs.meta | 4 +- .../Scripts/UI Elements/Login/LoginWindow.cs | 95 ++++++++++--------- .../UI Elements/Login/LoginWindow.cs.meta | 4 +- .../UI Elements/Upload/AllPackageView.cs | 35 ++++--- .../UI Elements/Upload/AllPackageView.cs.meta | 4 +- .../UI Elements/Upload/PackageGroup.cs.meta | 4 +- .../UI Elements/Upload/PackageView.cs.meta | 4 +- .../UI Elements/Upload/UploadWindow.cs | 10 +- .../UI Elements/Upload/UploadWindow.cs.meta | 4 +- .../Validation/AssetValidationElement.cs.meta | 4 +- .../PackageValidationElement.cs.meta | 4 +- .../Validation/ValidationElement.cs.meta | 4 +- .../FolderUploadWorkflowView.cs.meta | 4 +- .../HybridPackageUploadWorkflowView.cs.meta | 4 +- .../UnityPackageUploadWorkflowView.cs.meta | 4 +- .../Workflows/UploadWorkflowView.cs.meta | 4 +- .../Scripts/Utility/AssetStoreCache.cs.meta | 4 +- .../Scripts/Utility/PackageFetcher.cs.meta | 4 +- .../Scripts/Utility/PackageViewStorer.cs.meta | 4 +- .../Styles/Base/BaseWindow_Dark.uss.meta | 4 +- .../Styles/Base/BaseWindow_Light.uss.meta | 4 +- .../Styles/Base/BaseWindow_Main.uss.meta | 4 +- .../Styles/Base/BaseWindow_Main.uxml.meta | 4 +- .../Uploader/Styles/Login/Login_Dark.uss.meta | 4 +- .../Styles/Login/Login_Light.uss.meta | 4 +- .../Uploader/Styles/Login/Login_Main.uss.meta | 4 +- .../AllPackages/AllPackages_Dark.uss.meta | 4 +- .../AllPackages/AllPackages_Light.uss.meta | 4 +- .../AllPackages/AllPackages_Main.uss.meta | 4 +- .../Styles/Upload/UploadWindow_Dark.uss.meta | 4 +- .../Styles/Upload/UploadWindow_Light.uss.meta | 4 +- .../Styles/Upload/UploadWindow_Main.uss.meta | 4 +- .../Editor/Utility/ASDebug.cs.meta | 4 +- .../Editor/Utility/ASError.cs.meta | 4 +- .../Editor/Utility/ASToolsPreferences.cs.meta | 4 +- .../Editor/Utility/ASToolsUpdater.cs.meta | 4 +- .../Editor/Utility/FileUtility.cs.meta | 4 +- .../Editor/Utility/Json.cs.meta | 4 +- .../Editor/Utility/LegacyToolsRemover.cs.meta | 4 +- .../Editor/Utility/PackageUtility.cs.meta | 4 +- .../Editor/Utility/StyleSelector.cs.meta | 4 +- .../Styles/Updater/Updater_Dark.uss.meta | 4 +- .../Styles/Updater/Updater_Light.uss.meta | 4 +- .../Styles/Updater/Updater_Main.uss.meta | 4 +- .../Editor/Utility/SymlinkUtil.cs.meta | 4 +- .../Validator/AssetStoreValidator.cs.meta | 4 +- .../Editor/Validator/Icons/error.png.meta | 4 +- .../Editor/Validator/Icons/error_d.png.meta | 4 +- .../Editor/Validator/Icons/success.png.meta | 4 +- .../Editor/Validator/Icons/success_d.png.meta | 4 +- .../Editor/Validator/Icons/undefined.png.meta | 4 +- .../Validator/Icons/undefined_d.png.meta | 4 +- .../Editor/Validator/Icons/warning.png.meta | 4 +- .../Editor/Validator/Icons/warning_d.png.meta | 4 +- .../Categories/CategoryEvaluator.cs.meta | 4 +- .../Categories/ValidatorCategory.cs.meta | 4 +- .../Scripts/Data/MessageActions.cs.meta | 4 +- .../Validator/Scripts/Data/TestResult.cs.meta | 4 +- .../Scripts/Data/ValidationResult.cs.meta | 4 +- .../Scripts/Data/ValidationSettings.cs.meta | 4 +- .../Scripts/Data/ValidationState.cs.meta | 4 +- .../Scripts/PackageValidator.cs.meta | 4 +- .../Test Definitions/AutomatedTest.cs.meta | 4 +- .../Test Definitions/ITestScript.cs.meta | 4 +- .../AutomatedTestScriptableObject.cs.meta | 4 +- ...ationTestScriptableObjectInspector.cs.meta | 4 +- .../ValidationTestScriptableObject.cs.meta | 4 +- .../Test Definitions/ValidationTest.cs.meta | 4 +- .../ValidationTestConfig.cs.meta | 4 +- .../Tests/Check Animation Clips.asset.meta | 4 +- .../Tests/Check Audio Clipping.asset.meta | 4 +- .../Scripts/Tests/Check Colliders.asset.meta | 4 +- .../Tests/Check Compressed Files.asset.meta | 4 +- .../Tests/Check Demo Scenes.asset.meta | 4 +- .../Tests/Check Documentation.asset.meta | 4 +- .../Tests/Check Empty Prefabs.asset.meta | 4 +- .../Tests/Check File Menu Names.asset.meta | 4 +- .../Scripts/Tests/Check LODs.asset.meta | 4 +- .../Tests/Check Line Endings.asset.meta | 4 +- .../Tests/Check Mesh Prefabs.asset.meta | 4 +- ...ck Missing Components in Assets.asset.meta | 4 +- ...ck Missing Components in Scenes.asset.meta | 4 +- .../Tests/Check Model Import Logs.asset | 6 +- .../Tests/Check Model Import Logs.asset.meta | 4 +- .../Tests/Check Model Orientation.asset.meta | 4 +- .../Tests/Check Model Types.asset.meta | 4 +- .../Check Normal Map Textures.asset.meta | 4 +- .../Tests/Check Package Size.asset.meta | 4 +- .../Tests/Check Particle Systems.asset.meta | 4 +- .../Tests/Check Path Lengths.asset.meta | 4 +- .../Tests/Check Prefab Transforms.asset.meta | 4 +- .../Tests/Check Script Compilation.asset.meta | 4 +- .../Tests/Check Shader Compilation.asset.meta | 4 +- .../Tests/Check Texture Dimensions.asset.meta | 4 +- .../Tests/Check Type Namespaces.asset.meta | 4 +- .../Tests/Remove Executable Files.asset.meta | 4 +- .../Scripts/Tests/Remove JPG Files.asset.meta | 4 +- .../Tests/Remove JavaScript Files.asset.meta | 4 +- .../Tests/Remove Lossy Audio Files.asset.meta | 4 +- .../Tests/Remove Mixamo Files.asset.meta | 4 +- .../Tests/Remove SpeedTree Files.asset.meta | 4 +- .../Tests/Remove Video Files.asset.meta | 4 +- .../Test Methods/CheckAnimationClips.cs.meta | 4 +- .../Test Methods/CheckAudioClipping.cs.meta | 4 +- .../Tests/Test Methods/CheckColliders.cs.meta | 4 +- .../Test Methods/CheckCompressedFiles.cs.meta | 4 +- .../Test Methods/CheckDemoScenes.cs.meta | 4 +- .../Test Methods/CheckDocumentation.cs.meta | 4 +- .../Test Methods/CheckEmptyPrefabs.cs.meta | 4 +- .../Test Methods/CheckFileMenuNames.cs.meta | 4 +- .../Tests/Test Methods/CheckLODs.cs.meta | 4 +- .../Test Methods/CheckLineEndings.cs.meta | 4 +- .../Test Methods/CheckMeshPrefabs.cs.meta | 4 +- .../CheckMissingComponentsinAssets.cs.meta | 4 +- .../CheckMissingComponentsinScenes.cs.meta | 4 +- .../Test Methods/CheckModelImportLogs.cs | 4 +- .../Test Methods/CheckModelImportLogs.cs.meta | 4 +- .../CheckModelOrientation.cs.meta | 4 +- .../Test Methods/CheckModelTypes.cs.meta | 4 +- .../CheckNormalMapTextures.cs.meta | 4 +- .../Test Methods/CheckPackageSize.cs.meta | 4 +- .../Test Methods/CheckParticleSystems.cs.meta | 4 +- .../Test Methods/CheckPathLengths.cs.meta | 4 +- .../CheckPrefabTransforms.cs.meta | 4 +- .../CheckScriptCompilation.cs.meta | 4 +- .../CheckShaderCompilation.cs.meta | 4 +- .../CheckTextureDimensions.cs.meta | 4 +- .../Test Methods/CheckTypeNamespaces.cs.meta | 4 +- .../RemoveExecutableFiles.cs.meta | 4 +- .../Tests/Test Methods/RemoveJPGFiles.cs.meta | 4 +- .../RemoveJavaScriptFiles.cs.meta | 4 +- .../RemoveLossyAudioFiles.cs.meta | 4 +- .../Test Methods/RemoveMixamoFiles.cs.meta | 4 +- .../Test Methods/RemoveSpeedTreeFiles.cs.meta | 4 +- .../Test Methods/RemoveVideoFiles.cs.meta | 4 +- .../Test Methods/Utility/AssetUtility.cs.meta | 4 +- .../Utility/FileSignatureUtility.cs.meta | 4 +- .../Test Methods/Utility/MeshUtility.cs.meta | 4 +- .../Test Methods/Utility/ModelUtility.cs.meta | 4 +- .../Test Methods/Utility/SceneUtility.cs.meta | 4 +- .../Utility/ScriptUtility.cs.meta | 4 +- .../UI Elements/AutomatedTestElement.cs.meta | 4 +- .../UI Elements/AutomatedTestsGroup.cs.meta | 4 +- .../AutomatedTestsGroupElement.cs.meta | 4 +- .../UI Elements/PathBoxElement.cs.meta | 4 +- .../UI Elements/ValidationInfoElement.cs | 16 ++-- .../UI Elements/ValidationInfoElement.cs.meta | 4 +- .../Scripts/Utility/ValidatorUtility.cs.meta | 4 +- .../Validator/Styles/Validator_Dark.uss.meta | 4 +- .../Validator/Styles/Validator_Light.uss.meta | 4 +- .../Validator/Styles/Validator_Main.uss | 26 +++++ .../Validator/Styles/Validator_Main.uss.meta | 4 +- .../com.unity.asset-store-tools/LICENSE.md | 2 +- .../LICENSE.md.meta | 4 +- .../com.unity.asset-store-tools/package.json | 2 +- .../package.json.meta | 4 +- Packages/packages-lock.json | 6 ++ ProjectSettings/ProjectSettings.asset | 3 +- ProjectSettings/ProjectVersion.txt | 4 +- 188 files changed, 493 insertions(+), 441 deletions(-) delete mode 100644 Assets/Resources.meta delete mode 160000 Assets/space.chikalin.textdecal delete mode 100644 Assets/space.chikalin.textdecal.meta diff --git a/.gitmodules b/.gitmodules index 80bfcd5..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "Assets/ru.chikalin.textdecal"] - path = Assets/space.chikalin.textdecal -url=gituser@git.chikalin.space:unity/space.chikalin.textdecal.git diff --git a/.idea/.idea.textdecalURP/.idea/vcs.xml b/.idea/.idea.textdecalURP/.idea/vcs.xml index f5229a1..23b6803 100644 --- a/.idea/.idea.textdecalURP/.idea/vcs.xml +++ b/.idea/.idea.textdecalURP/.idea/vcs.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Assets/Resources.meta b/Assets/Resources.meta deleted file mode 100644 index fef73ac..0000000 --- a/Assets/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 63e2309e745bf47a0b96898277487399 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples b/Assets/Samples index 0dd0ca9..88d245b 120000 --- a/Assets/Samples +++ b/Assets/Samples @@ -1 +1 @@ -space.chikalin.textdecal/Samples~ \ No newline at end of file +../../space.chikalin.textdecal/Samples~ \ No newline at end of file diff --git a/Assets/space.chikalin.textdecal b/Assets/space.chikalin.textdecal deleted file mode 160000 index 052b583..0000000 --- a/Assets/space.chikalin.textdecal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 052b583e9099d224845a7921cad7bcea4c53ebf3 diff --git a/Assets/space.chikalin.textdecal.meta b/Assets/space.chikalin.textdecal.meta deleted file mode 100644 index 6a6eab7..0000000 --- a/Assets/space.chikalin.textdecal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7644d07f9305247ebbe84044120dbe4c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.unity.asset-store-tools/CHANGELOG.md b/Packages/com.unity.asset-store-tools/CHANGELOG.md index 0b16ae1..b40e58a 100644 --- a/Packages/com.unity.asset-store-tools/CHANGELOG.md +++ b/Packages/com.unity.asset-store-tools/CHANGELOG.md @@ -1,6 +1,20 @@ # Changelog All notable changes to this package will be documented in this file. +## [11.4.4] - 2024-11-29 + +### Validator Changes +- The validator UI window description section can now be expanded or shrunk to take up less screen space +- Updated severity of the Model Importer Logs validation test + +### Exporter Changes +- Updated exporter to always exclude hidden files and folders beginning with the dot symbol (e.g.: .hiddenFolder/ or .hiddenfile.txt) +- Updated exporter to explicitly exclude extended attribute files when exporting packages on macOS systems + +### Other +- Moved the Asset Store Tools toolbar items into the Tools section +- Fixed several window-related compilation warnings when using Unity 6 versions of the Editor + ## [11.4.3] - 2024-08-01 ### Validator Changes diff --git a/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta b/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta index 244545d..04ab54f 100644 --- a/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta +++ b/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/CHANGELOG.md - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta index d15a8f1..f74c22d 100644 --- a/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs index e9b51c4..3c00185 100644 --- a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs +++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs @@ -9,7 +9,7 @@ namespace AssetStoreTools { internal class AssetStoreTools : EditorWindow { - [MenuItem("Asset Store Tools/Asset Store Uploader", false, 0)] + [MenuItem("Tools/Asset Store/Uploader", false, 0)] public static void ShowAssetStoreToolsUploader() { Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll"); @@ -18,7 +18,7 @@ namespace AssetStoreTools } - [MenuItem("Asset Store Tools/Asset Store Validator", false, 1)] + [MenuItem("Tools/Asset Store/Validator", false, 1)] public static void ShowAssetStoreToolsValidator() { Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll"); @@ -26,32 +26,32 @@ namespace AssetStoreTools wnd.Show(); } - [MenuItem("Asset Store Tools/Publisher Portal", false, 20)] + [MenuItem("Tools/Asset Store/Publisher Portal", false, 20)] public static void OpenPublisherPortal() { Application.OpenURL("https://publisher.unity.com/"); } - [MenuItem("Asset Store Tools/Submission Guidelines", false, 21)] + [MenuItem("Tools/Asset Store/Submission Guidelines", false, 21)] public static void OpenSubmissionGuidelines() { Application.OpenURL("https://assetstore.unity.com/publishing/submission-guidelines/"); } - [MenuItem("Asset Store Tools/Provide Feedback", false, 22)] + [MenuItem("Tools/Asset Store/Provide Feedback", false, 22)] 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)] + [MenuItem("Tools/Asset Store/Check for Updates", false, 45)] public static void OpenUpdateChecker() { var wnd = GetWindowWithRect(new Rect(Screen.width / 2, Screen.height / 2, 400, 150), true); wnd.Show(); } - [MenuItem("Asset Store Tools/Settings", false, 50)] + [MenuItem("Tools/Asset Store/Settings", false, 50)] public static void OpenSettings() { ASToolsPreferencesProvider.OpenSettings(); diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta index d648960..fec1469 100644 --- a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta index aee72a4..c91fb0f 100644 --- a/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/ExportResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/ExportResult.cs.meta index c280cdb..2bc8809 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/ExportResult.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/ExportResult.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/ExportResult.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/ExporterSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/ExporterSettings.cs.meta index b203dfc..1d5d5c4 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/ExporterSettings.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/ExporterSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/ExporterSettings.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs index 23cd091..efa68c9 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs @@ -73,7 +73,7 @@ namespace AssetStoreTools.Exporter protected string GetAssetGuid(string assetPath, bool generateForPlugin, bool hiddenSearch) { // Skip meta files as they do not have guids - if (assetPath.EndsWith(".meta")) + if (assetPath.EndsWith(".meta", StringComparison.OrdinalIgnoreCase)) return string.Empty; // Skip hidden assets. They normally do not have meta files, but @@ -81,6 +81,10 @@ namespace AssetStoreTools.Exporter if (assetPath.EndsWith("~")) return string.Empty; + var assetName = assetPath.Split('/').Last(); + if (assetName.StartsWith(".")) + return string.Empty; + // Skip ProjectVersion.txt file specifically as it may introduce // project compatibility issues when imported if (string.Compare(assetPath, "ProjectSettings/ProjectVersion.txt", StringComparison.OrdinalIgnoreCase) == 0) diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs.meta index d243cee..934d0f0 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporter.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs index 3439c08..f2e8c7c 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs @@ -302,6 +302,11 @@ namespace AssetStoreTools.Exporter UseShellExecute = false }; +#if UNITY_EDITOR_OSX + // Prevent OSX-specific archive pollution + info.EnvironmentVariables.Add("COPYFILE_DISABLE", "1"); +#endif + using (Process process = Process.Start(info)) { process.WaitForExit(); diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs.meta index 340b2e3..feb2d56 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterDefault.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterLegacy.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterLegacy.cs.meta index 18329fe..a345e4f 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterLegacy.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterLegacy.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterLegacy.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta index 6ba1896..61ada0f 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs.meta index b1c48e7..6d42dde 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/AssetStoreUploader.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta index f4b1f07..5cb49d0 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta @@ -149,6 +149,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_black.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_black.png.meta index cf54533..c4659f8 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_black.png.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_black.png.meta @@ -130,6 +130,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_black.png - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_white.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_white.png.meta index 652cd77..1ebdfaf 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_white.png.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_white.png.meta @@ -130,6 +130,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher_portal_white.png - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs index bb0ba9e..ad50a60 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs @@ -22,7 +22,7 @@ namespace AssetStoreTools.Uploader /// internal static class AssetStoreAPI { - public const string ToolVersion = "V11.4.3"; + public const string ToolVersion = "V11.4.4"; private const string UnauthSessionId = "26c4202eb475d02864b40827dfff11a14657aa41"; private const string KharmaSessionId = "kharma.sessionid"; diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs.meta index f7dc059..ec951f2 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/AssetStoreAPI.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs.meta index 2421685..396fef2 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs.meta @@ -5,6 +5,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/ASAnalytics.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/OngoingUpload.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/OngoingUpload.cs.meta index f3fc25a..7508d29 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/OngoingUpload.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/OngoingUpload.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/OngoingUpload.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageData.cs.meta index 81ce756..2e55c38 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageData.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageData.cs.meta @@ -5,6 +5,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageData.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageUploadResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageUploadResult.cs.meta index 595b363..2019a0a 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageUploadResult.cs.meta +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageUploadResult.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 115 packageName: Asset Store Publishing Tools - packageVersion: 11.4.3 + packageVersion: 11.4.4 assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageUploadResult.cs - uploadId: 681981 + uploadId: 712972 diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Login/LoginWindow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Login/LoginWindow.cs index e711f60..8662e03 100644 --- a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Login/LoginWindow.cs +++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI Elements/Login/LoginWindow.cs @@ -7,11 +7,19 @@ using UnityEngine.UIElements; namespace AssetStoreTools.Uploader.UIElements { - internal class LoginWindow : VisualElement +#if UNITY_6000_0_OR_NEWER + [UxmlElement] +#endif + internal partial class LoginWindow : VisualElement { + +#if !UNITY_6000_0_OR_NEWER + public new class UxmlFactory : UxmlFactory { } +#endif + private readonly string REGISTER_URL = "https://publisher.unity.com/access"; private readonly string FORGOT_PASSWORD_URL = "https://id.unity.com/password/new"; - + private Button _cloudLoginButton; private Button _credentialsLoginButton; @@ -26,8 +34,6 @@ namespace AssetStoreTools.Uploader.UIElements private double _cloudLoginRefreshTime = 1d; private double _lastRefreshTime; - public new class UxmlFactory : UxmlFactory { } - public LoginWindow() { styleSheets.Add(StyleSelector.UploaderWindow.LoginWindowStyle); @@ -39,9 +45,9 @@ namespace AssetStoreTools.Uploader.UIElements public void SetupLoginElements(Action onSuccess, Action onFail) { this.SetEnabled(true); - + _cloudLoginLabel = _cloudLoginButton.Q