📦 1.1.7 Release

- Some fixes to asset compatibility with our other assets.
CarterGames · Aug 3, 2023 · 1b1774f · 1b1774f
1 parent 5616322
commit 1b1774f
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 20 deletions.
diff --git a/...or/CarterGames.BuildVersion.Editor.asmdef → ...r/CarterGames.BuildVersions.Editor.asmdef b/...or/CarterGames.BuildVersion.Editor.asmdef → ...r/CarterGames.BuildVersions.Editor.asmdef
@@ -1,6 +1,6 @@
 {
-    "name": "CarterGames.BuildVersion.Editor",
-    "rootNamespace": "",
+    "name": "CarterGames.BuildVersions.Editor",
+    "rootNamespace": "CarterGames.Assets.BuildVersions.Editor",
     "references": [
         "GUID:f693b8824d24be84681200cf06cccf09",
         "GUID:87d8c87f2d1ea2c4bbaa667557d41bed"

diff --git a/...rterGames.BuildVersion.Editor.asmdef.meta → ...terGames.BuildVersions.Editor.asmdef.meta b/...rterGames.BuildVersion.Editor.asmdef.meta → ...terGames.BuildVersions.Editor.asmdef.meta
diff --git a/Code/Editor/Utility/AssetVersionData.cs b/Code/Editor/Utility/AssetVersionData.cs
@@ -35,12 +35,12 @@ public static class AssetVersionData
         /// <summary>
         /// The version number of the asset...
         /// </summary>
-        public static string VersionNumber => "1.1.6";
+        public static string VersionNumber => "1.1.7";
 
 
         /// <summary>
         /// The date this release of the asset was submitted for release...
         /// </summary>
-        public static string ReleaseDate => "30/07/2023";
+        public static string ReleaseDate => "03/08/2023";
     }
 }
diff --git a/Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs b/Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs
@@ -89,19 +89,23 @@ private static string GetBaseAssetPath()
         {
             string path = string.Empty;
             var containsChecks = new List<string> { AssetName, $"/{BasePathScriptName}.cs" };
-                
+
             foreach (var scriptFound in AssetDatabase.FindAssets($"t:Script {nameof(UtilEditor)}"))
             {
                 path = AssetDatabase.GUIDToAssetPath(scriptFound);
 
                 foreach (var check in containsChecks)
                 {
-                    if (!path.Contains(check)) continue;
+                    if (!path.Contains(check)) goto SkipAndLoop;
                 }
 
                 path = AssetDatabase.GUIDToAssetPath(scriptFound);
                 path = path.Replace(BasePathScriptPath, "");
+
                 return path;
+
+                // Skips the return as the path contained an invalid element for the asset...
+                SkipAndLoop: ;
             }
 
             return path;

diff --git a/Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs b/Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs
@@ -44,16 +44,16 @@ public static class ScriptableRef
 
         // Asset Filters
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
-        private static readonly string AssetIndexFilter = $"t:{typeof(AssetIndex).FullName}";
-        private static readonly string BuildInfoFilter = $"t:{typeof(BuildInformation).FullName}";
-        private static readonly string OptionsFilter = $"t:{typeof(BuildVersionOptions).FullName}";
+        private static readonly string AssetIndexFilter = $"t:{typeof(CarterGames.Assets.BuildVersions.AssetIndex).FullName}";
+        private static readonly string BuildInfoFilter = $"t:{typeof(CarterGames.Assets.BuildVersions.BuildInformation).FullName}";
+        private static readonly string OptionsFilter = $"t:{typeof(CarterGames.Assets.BuildVersions.BuildVersionOptions).FullName}";
 
 
         // Asset Caches
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
-        private static AssetIndex assetIndexCache;
-        private static BuildInformation buildInformationCache;
-        private static BuildVersionOptions buildOptionsCache;
+        private static CarterGames.Assets.BuildVersions.AssetIndex assetIndexCache;
+        private static CarterGames.Assets.BuildVersions.BuildInformation buildInformationCache;
+        private static CarterGames.Assets.BuildVersions.BuildVersionOptions buildOptionsCache;
 
 
         // SerializedObject Caches
@@ -86,21 +86,21 @@ public static class ScriptableRef
         /// <summary>
         /// The asset index for the asset.
         /// </summary>
-        public static AssetIndex AssetIndex =>
+        public static CarterGames.Assets.BuildVersions.AssetIndex AssetIndex =>
             FileEditorUtil.CreateSoGetOrAssignAssetCache(ref assetIndexCache, AssetIndexFilter, AssetIndexPath, AssetName, $"{AssetName}/Resources/Asset Index.asset");
 
 
         /// <summary>
         /// The editor settings for the asset.
         /// </summary>
-        public static BuildInformation BuildInformation =>
+        public static CarterGames.Assets.BuildVersions.BuildInformation BuildInformation =>
             FileEditorUtil.CreateSoGetOrAssignAssetCache(ref buildInformationCache, BuildInfoFilter, BuildInformationPath, AssetName, $"{AssetName}/Data/Build Information.asset");
 
 
         /// <summary>
         /// The runtime settings for the asset.
         /// </summary>
-        public static BuildVersionOptions BuildOptions =>
+        public static CarterGames.Assets.BuildVersions.BuildVersionOptions BuildOptions =>
             FileEditorUtil.CreateSoGetOrAssignAssetCache(ref buildOptionsCache, OptionsFilter, BuildOptionsPath, AssetName, $"{AssetName}/Data/Build Options.asset");
 
 

diff --git a/Code/Editor/Utility/UtilEditor.cs b/Code/Editor/Utility/UtilEditor.cs
@@ -78,19 +78,19 @@ public static class UtilEditor
         /// <summary>
         /// Gets the build information asset (or makes one if needed)...
         /// </summary>
-        public static AssetIndex AssetIndex => ScriptableRef.AssetIndex;
+        public static CarterGames.Assets.BuildVersions.AssetIndex AssetIndex => ScriptableRef.AssetIndex;
 
 
         /// <summary>
         /// Gets the build information asset (or makes one if needed)...
         /// </summary>
-        public static BuildInformation BuildInformation => ScriptableRef.BuildInformation;
+        public static CarterGames.Assets.BuildVersions.BuildInformation BuildInformation => ScriptableRef.BuildInformation;
 
 
         /// <summary>
         /// Gets the build version options asset (or makes one if needed)...
         /// </summary>
-        public static BuildVersionOptions BuildOptions => ScriptableRef.BuildOptions;
+        public static CarterGames.Assets.BuildVersions.BuildVersionOptions BuildOptions => ScriptableRef.BuildOptions;
 
 
         /// <summary>

diff --git a/Code/Runtime/CarterGames.BuildVersion.asmdef → .../Runtime/CarterGames.BuildVersions.asmdef b/Code/Runtime/CarterGames.BuildVersion.asmdef → .../Runtime/CarterGames.BuildVersions.asmdef
@@ -1,5 +1,6 @@
 {
-    "name": "CarterGames.BuildVersion",
+    "name": "CarterGames.BuildVersions",
+    "rootNamespace": "CarterGames.Assets.BuildVersions",
     "references": [
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
         "GUID:87d8c87f2d1ea2c4bbaa667557d41bed"

diff --git a/...time/CarterGames.BuildVersion.asmdef.meta → ...ime/CarterGames.BuildVersions.asmdef.meta b/...time/CarterGames.BuildVersion.asmdef.meta → ...ime/CarterGames.BuildVersions.asmdef.meta
diff --git a/.../Runtime/Common/CarterGames.Common.asmdef → ...n/CarterGames.BuildVersions.Common.asmdef b/.../Runtime/Common/CarterGames.Common.asmdef → ...n/CarterGames.BuildVersions.Common.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "CarterGames.Common",
+    "name": "CarterGames.BuildVersions.Common",
     "rootNamespace": "CarterGames.Common",
     "references": [],
     "includePlatforms": [],

diff --git a/...ime/Common/CarterGames.Common.asmdef.meta → ...terGames.BuildVersions.Common.asmdef.meta b/...ime/Common/CarterGames.Common.asmdef.meta → ...terGames.BuildVersions.Common.asmdef.meta