V1.0.10 (#52)

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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ć <[email protected]> * 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] --------- Co-authored-by: realitycollectivebuildbot <[email protected]> Co-authored-by: Simon Jackson <[email protected]> Co-authored-by: Dino Fejzagić <[email protected]> Co-authored-by: Dino Fejzagic <[email protected]> Co-authored-by: Rony Portelli <[email protected]>
realitycollective · May 6, 2024 · 7c4b8fb · 7c4b8fb
1 parent c647941
commit 7c4b8fb
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 7 deletions.
diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// 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("1.0.10")]
+[assembly: AssemblyTitle("com.realitycollective.utilities.editor")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Editor/AssemblyInfo.cs.meta b/Editor/AssemblyInfo.cs.meta
diff --git a/...ilities/AssemblyDefinitionPreProcessor.cs → ...lities/AssemblyDefinitionPostprocessor.cs b/...ilities/AssemblyDefinitionPreProcessor.cs → ...lities/AssemblyDefinitionPostprocessor.cs
@@ -9,7 +9,7 @@
 
 namespace RealityCollective.Editor.Utilities
 {
-    internal class AssemblyDefinitionPreProcessor : AssetPostprocessor
+    internal class AssemblyDefinitionPostprocessor : AssetPostprocessor
     {
         [Serializable]
         private class PackageInfo
@@ -39,16 +39,21 @@ private void OnPreprocessAsset()
                 var text = File.ReadAllText(assetPath);
                 var packageJson = JsonUtility.FromJson<PackageInfo>(text);
 
-                if (!packageJson.Name.Contains("com.xrtk"))
+                if (!packageJson.Name.Contains("com.realitycollective") &&
+                    !packageJson.Name.Contains("com.realitytoolkit"))
                 {
                     return;
                 }
 
                 var packageVersion = packageJson.Version;
 
-                if (packageVersion.Contains("-preview."))
+                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}\")]";
@@ -67,8 +72,8 @@ private void OnPreprocessAsset()
 
 [assembly: AssemblyVersion(""0.0.0"")]
 [assembly: AssemblyTitle(""com.{assemblyName}"")]
-[assembly: AssemblyCompany(""XRTK"")]
-[assembly: AssemblyCopyright(""Copyright (c) XRTK. All rights reserved."")]
+[assembly: AssemblyCompany(""Reality Collective"")]
+[assembly: AssemblyCopyright(""Copyright (c) Reality Collective. All rights reserved."")]
 "
                         : File.ReadAllText(assemblyInfoPath);
 

diff --git a/...es/AssemblyDefinitionPreProcessor.cs.meta → ...s/AssemblyDefinitionPostprocessor.cs.meta b/...es/AssemblyDefinitionPreProcessor.cs.meta → ...s/AssemblyDefinitionPostprocessor.cs.meta
diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// 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("1.0.10")]
+[assembly: AssemblyTitle("com.realitycollective.utilities")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Runtime/AssemblyInfo.cs.meta b/Runtime/AssemblyInfo.cs.meta
diff --git a/Tests/AssemblyInfo.cs b/Tests/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// 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("1.0.10")]
+[assembly: AssemblyTitle("com.realitycollective.utilities.tests")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Tests/AssemblyInfo.cs.meta b/Tests/AssemblyInfo.cs.meta
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "com.realitycollective.utilities",
   "displayName": "RealityCollective.Utilities",
-  "description": "A collection of useful utilities for Unity Projects by the Reality Collective",
+  "description": "A collection of useful utilities for Unity Projects by the Reality Collective.",
   "keywords": [
     "Unity",
     "Tools"
   ],
-  "version": "1.0.9",
+  "version": "1.0.10-pre.2",
   "unity": "2020.3",
   "homepage": "https://realitycollective.io",
   "bugs": {