From 85e66be108b608677b2ad31cd205926984016918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Mon, 6 May 2024 20:48:46 +0200 Subject: [PATCH] v1.0.12 (#61) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Prep for release * Auto increment pre-release version to 1.0.1 [skip ci] * disable tagging for development upversion * Apply V2 workflows (#19) Co-authored-by: Simon Jackson * Auto increment pre-release version to 1.0.1-pre-release.1 [skip ci] * Auto increment pre-release version to 1.0.2 [skip ci] * Fix prefab attribute does not render label (#21) * Auto increment pre-release version to 1.0.2-pre.1 [skip ci] * Auto increment pre-release version to 1.0.3 [skip ci] * Updated Rest features (#23) * Updating Rest utilities, added cancellation token to all calls. Plus clean up * Added Unit Tests to Rest functionality * Standardised overload options into a new RestArgs struct * Rationalised implementations for standards * Added overloaded Download function to return a byte[] or file string contents * Fix new script icon * Update workflow to multi-version for test * Updated PostForm following 2022 testing * Include uGUI dependency for the UI extensions in the package * Extract Canvas dependencies from the utility package * Final review and cleanup * Update Readme --------- Co-authored-by: Simon Jackson * Auto increment pre-release version to 1.0.3-pre.1 [skip ci] * Auto increment pre-release version to 1.0.4 [skip ci] * Next release updates (#27) * Initial commit for next round of updates - Changed fixed use of verbs to use the constants from UnityWebRequest definition. - #26 Added additional exception handling to log instead of throw, returns a Failed response instead - #25 Added the ability to set global override parameters - Added the ability to set a preferred download location, either globally or per call. Default is Temp * Auto increment pre-release version to 1.0.4-pre.1 [skip ci] * Add CODEOWNERS * Update for 1.0.4 release (#29) * Auto increment pre-release version to 1.0.4-pre.2 [skip ci] * Address comments * Auto increment pre-release version to 1.0.5 [skip ci] * Added logging utilities for projects (#31) * Added logging utilities for projects * Address review comments * Auto increment pre-release version to 1.0.5-pre.1 [skip ci] * Extended the Unity File helper with an additional option to get all files and not just Unity's own files. (#32) Updated the GuidRegenerator to use all files as it should not be limited when working with a path. * Auto increment pre-release version to 1.0.5-pre.2 [skip ci] * Fix ambiguous call (#34) Co-authored-by: Dino Fejzagic * Auto increment pre-release version to 1.0.5-pre.3 [skip ci] * Added a new Calculate Bounds extension and updated documentation for all (#35) * Auto increment pre-release version to 1.0.5-pre.4 [skip ci] * Update docs and readme for release (#36) * Auto increment pre-release version to 1.0.5-pre.5 [skip ci] * Auto increment pre-release version to 1.0.6 [skip ci] * Added audio streaming (#38) * Added audio streaming --------- Authored-by: Rony Portelli * Auto increment pre-release version to 1.0.7 [skip ci] * Deprecate the Rest utilities as this is not providing value to the toolkit (#42) * Update readme, remove mention of rest * Remove Rest classes and folders * Clean up Rest Tests --------- Co-authored-by: Dino Fejzagić * Auto increment pre-release version to 1.0.7-pre.1 [skip ci] * Auto increment pre-release version to 1.0.8 [skip ci] * Update Editor menus (#45) * Updating Channel packer tool to fit under the asset store version of the Reality Toolkit * Remove Channel package from Utilities * Remove editor preferences static, as each package has its own root * Auto increment pre-release version to 1.0.8-pre.1 [skip ci] * Remove warning and remove redundant type lookup (#46) * Auto increment pre-release version to 1.0.8-pre.2 [skip ci] * Auto increment pre-release version to 1.0.9 [skip ci] * Migrated all Service-Framework only components to the ServiceFramework (#50) * Auto increment pre-release version to 1.0.9-pre.1 [skip ci] * Auto increment pre-release version to 1.0.10 [skip ci] * Fix assembly info pre processor (#53) * Fix assembly info pre processor * Generate assembly infos * Auto increment pre-release version to 1.0.10-pre.1 [skip ci] * Backporting 2020 fix for recent update (#54) * Auto increment pre-release version to 1.0.10-pre.2 [skip ci] * Auto increment pre-release version to 1.0.11 [skip ci] * Feature/ImprovedBoundsExtension (#55) * Migrated new functionality for bounds, needs sanitising * Modified the bounds extension to achieve the correct behaviour --------- Co-authored-by: Rony Portelli * Auto increment pre-release version to 1.0.11-pre.1 [skip ci] * Cleaned up utilities package, removed duplicates between SF and Utilities/Toolkit (#56) * Update package json with missing fields * Clear icons and fix extensions and attributes namespace * Progress * Finish * Auto increment pre-release version to 1.0.11-pre.2 [skip ci] * Migrate @Cangi s work on the MatrixExtensions (#57) Co-authored-by: Dino Fejzagić * Auto increment pre-release version to 1.0.11-pre.3 [skip ci] * Added new TryGet component search methods (#59) * Added new TryGet component search methods * Address feedback * Update readme with latest contents and banner * Auto increment pre-release version to 1.0.11-pre.4 [skip ci] * Auto increment pre-release version to 1.0.12 [skip ci] * Resolve merge issues (#60) * Auto increment pre-release version to 1.0.12-pre.1 [skip ci] --------- Co-authored-by: Simon (Darkside) Jackson Co-authored-by: realitycollectivebuildbot Co-authored-by: Simon Jackson Co-authored-by: Dino Fejzagic Co-authored-by: Rony Portelli Co-authored-by: Rony Portelli --- Editor/AssemblyInfo.cs | 2 +- .../RealityCollective.Utilities.Editor.asmdef | 3 +- .../AssemblyDefinitionPostprocessor.cs | 97 ------------------- .../AssemblyDefinitionPostprocessor.cs.meta | 11 --- Runtime/AssemblyInfo.cs | 2 +- Runtime/RealityCollective.Utilities.asmdef | 3 +- Tests/AssemblyInfo.cs | 2 +- package.json | 5 +- 8 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 Editor/Utilities/AssemblyDefinitionPostprocessor.cs delete mode 100644 Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs index 3720f1c..99fb0c1 100644 --- a/Editor/AssemblyInfo.cs +++ b/Editor/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.11")] +[assembly: AssemblyVersion("1.0.12")] [assembly: AssemblyTitle("com.realitycollective.utilities.editor")] [assembly: AssemblyCompany("Reality Collective")] [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Editor/RealityCollective.Utilities.Editor.asmdef b/Editor/RealityCollective.Utilities.Editor.asmdef index 288d69e..22431bc 100644 --- a/Editor/RealityCollective.Utilities.Editor.asmdef +++ b/Editor/RealityCollective.Utilities.Editor.asmdef @@ -2,8 +2,7 @@ "name": "RealityCollective.Utilities.Editor", "rootNamespace": "RealityCollective.Utilities.Editor", "references": [ - "GUID:b2d046948d6452a4b8485efc9ce0f88c", - "GUID:84651a3751eca9349aac36a66bba901b" + "GUID:b2d046948d6452a4b8485efc9ce0f88c" ], "includePlatforms": [ "Editor" diff --git a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs b/Editor/Utilities/AssemblyDefinitionPostprocessor.cs deleted file mode 100644 index ce6f15f..0000000 --- a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using System; -using System.IO; -using System.Text.RegularExpressions; -using UnityEditor; -using UnityEngine; - -namespace RealityCollective.Editor.Utilities -{ - internal class AssemblyDefinitionPostprocessor : AssetPostprocessor - { - [Serializable] - private class PackageInfo - { - [SerializeField] - private string name; - - public string Name => name; - - [SerializeField] - private string version; - - public string Version => version; - } - - private const string VersionRegexPattern = "\\[assembly: AssemblyVersion\\(\"(.*)\"\\)\\]"; - - private void OnPreprocessAsset() - { - if (assetPath.Contains("package.json") && !Application.isBatchMode) - { - if (Path.GetFullPath(assetPath).Contains("PackageCache")) - { - return; - } - - var text = File.ReadAllText(assetPath); - var packageJson = JsonUtility.FromJson(text); - - if (!packageJson.Name.Contains("com.realitycollective") && - !packageJson.Name.Contains("com.realitytoolkit")) - { - return; - } - - var packageVersion = packageJson.Version; - - if (packageVersion.Contains("-pre.")) - { -#if UNITY_2021_1_OR_NEWER - packageVersion = packageVersion[..packageVersion.IndexOf("-", StringComparison.Ordinal)]; -#else - packageVersion = packageVersion.Substring(0, packageVersion.IndexOf("-", StringComparison.Ordinal)); -#endif - } - - var newVersion = $"[assembly: AssemblyVersion(\"{packageVersion}\")]"; - var asmdefs = Directory.GetFiles(assetPath.Replace("package.json", string.Empty), "*.asmdef", SearchOption.AllDirectories); - - foreach (var assembly in asmdefs) - { - var assemblyName = Path.GetFileNameWithoutExtension(assembly).ToLower(); - var directory = Path.GetDirectoryName(assembly); - var assemblyInfoPath = $"{directory}/AssemblyInfo.cs"; - var fileText = !File.Exists(assemblyInfoPath) - ? $@"// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using System.Reflection; - -[assembly: AssemblyVersion(""0.0.0"")] -[assembly: AssemblyTitle(""com.{assemblyName}"")] -[assembly: AssemblyCompany(""Reality Collective"")] -[assembly: AssemblyCopyright(""Copyright (c) Reality Collective. All rights reserved."")] -" - : File.ReadAllText(assemblyInfoPath); - - if (!fileText.Contains("AssemblyVersion")) - { - fileText += "\nusing System.Reflection;\n\n[assembly: AssemblyVersion(\"0.0.0\")]\n"; - } - - if (!fileText.Contains("AssemblyTitle")) - { - fileText += $"[assembly: AssemblyTitle(\"com.{assemblyName}\")]\n"; - } - - File.WriteAllText(assemblyInfoPath, Regex.Replace(fileText, VersionRegexPattern, newVersion)); - } - - AssetDatabase.Refresh(ImportAssetOptions.Default); - } - } - } -} diff --git a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta b/Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta deleted file mode 100644 index fbaec1b..0000000 --- a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ae88737d43244bc3928db0d855c2d44a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs index c83c8b0..61b9cc8 100644 --- a/Runtime/AssemblyInfo.cs +++ b/Runtime/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.11")] +[assembly: AssemblyVersion("1.0.12")] [assembly: AssemblyTitle("com.realitycollective.utilities")] [assembly: AssemblyCompany("Reality Collective")] [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Runtime/RealityCollective.Utilities.asmdef b/Runtime/RealityCollective.Utilities.asmdef index 8303b7c..4a014ca 100644 --- a/Runtime/RealityCollective.Utilities.asmdef +++ b/Runtime/RealityCollective.Utilities.asmdef @@ -2,8 +2,7 @@ "name": "RealityCollective.Utilities", "rootNamespace": "RealityCollective.Utilities", "references": [ - "GUID:478a2357cc57436488a56e564b08d223", - "GUID:84651a3751eca9349aac36a66bba901b" + "GUID:478a2357cc57436488a56e564b08d223" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Tests/AssemblyInfo.cs b/Tests/AssemblyInfo.cs index f741ab7..f865463 100644 --- a/Tests/AssemblyInfo.cs +++ b/Tests/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.11")] +[assembly: AssemblyVersion("1.0.12")] [assembly: AssemblyTitle("com.realitycollective.utilities.tests")] [assembly: AssemblyCompany("Reality Collective")] [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/package.json b/package.json index 79ce130..385d6e2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.realitycollective.utilities", "displayName": "RealityCollective.Utilities", "description": "A collection of useful utilities for Unity projects by the Reality Collective.", - "version": "1.0.11-pre.4", + "version": "1.0.12-pre.1", "documentationUrl": "https://realitycollective.io", "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.utilities/releases", "licensesUrl": "https://github.com/realitycollective/com.realitycollective.utilities/blob/main/LICENSE.md", @@ -32,7 +32,6 @@ }, "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.editorcoroutines": "1.0.0", - "com.unity.addressables": "1.18.15" + "com.unity.editorcoroutines": "1.0.0" } }