[email protected]

## [1.16.16] - 2021-01-20
- Updated dependency versions for testcase fix

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.16.16] - 2021-01-20
+- Updated dependency versions for testcase fix
+
 ## [1.16.15] - 2020-12-09
 - Addressables link.xml should now have it's own folder.
 - Fixed an issue where InvalidKeyException was getting thrown when calling GetDownloadSizeAsync on scenes

Editor/Build/BuildPipelineTasks/GenerateLocationListsTask.cs

@@ -208,7 +208,7 @@ internal static Output RunInternal(Input input)
                                 throw new Exception($"Address '{entry.address}' cannot contain '[ ]'.");
                             if (entry.MainAssetType == typeof(DefaultAsset) && !AssetDatabase.IsValidFolder(entry.AssetPath))
                             {
-                                if (ProjectConfigData.ignoreUnsupportedFilesInBuild)
+                                if (input.Settings.IgnoreUnsupportedFilesInBuild)
                                     Debug.LogWarning($"Cannot recognize file type for entry located at '{entry.AssetPath}'. Asset location will be ignored.");
                                 else
                                     throw new Exception($"Cannot recognize file type for entry located at '{entry.AssetPath}'. Asset import failed for using an unsupported file type.");

Editor/Build/ContentUpdateScript.cs

@@ -269,8 +269,8 @@ public static bool SaveContentState(string path, List<AddressableAssetEntry> ent
                 stream.Close();
                 stream.Dispose();
                 return true;
-            } 
-            catch(UnauthorizedAccessException uae)
+            }
+            catch (UnauthorizedAccessException uae)
             {
                 if (AddressableAssetUtility.IsUsingVCIntegration())
                     Debug.LogErrorFormat("Cannot access the file {0}. This may be due to a version control lock.", path);
@@ -379,7 +379,7 @@ public static bool SaveContentState(List<ContentCatalogDataEntry> locations, str
                 stream.Dispose();
                 return true;
             }
-            catch(UnauthorizedAccessException uae)
+            catch (UnauthorizedAccessException uae)
             {
                 if (AddressableAssetUtility.IsUsingVCIntegration())
                     Debug.LogErrorFormat("Cannot access the file {0}. Is it checked out?", path);
@@ -760,5 +760,16 @@ public static void CreateContentUpdateGroup(AddressableAssetSettings settings, L
             contentGroup.AddSchema<ContentUpdateGroupSchema>().StaticContent = false;
             settings.MoveEntries(items, contentGroup);
         }
+
+        internal static bool GroupFilter(AddressableAssetGroup g)
+        {
+            if (g == null)
+                return false;
+            if (!g.HasSchema<ContentUpdateGroupSchema>() || !g.GetSchema<ContentUpdateGroupSchema>().StaticContent)
+                return false;
+            if (!g.HasSchema<BundledAssetGroupSchema>() || !g.GetSchema<BundledAssetGroupSchema>().IncludeInBuild)
+                return false;
+            return true;
+        }
     }
 }

Editor/Build/DataBuilders/BuildScriptPackedMode.cs

@@ -183,6 +183,7 @@ public void Dispose()
                 var groups = aaContext.Settings.groups.Where(g => g != null);
 
                 var bundleRenameMap = new Dictionary<string, string>();
+                var postCatalogUpdateCallbacks = new List<Action>();
                 using (m_Log.ScopedStep(LogLevel.Info, "PostProcessBundles"))
                 using (var progressTracker = new UnityEditor.Build.Pipeline.Utilities.ProgressTracker())
                 {
@@ -205,7 +206,7 @@ public void Dispose()
                                 outputBundles.Add(b >= 0 ? m_OutputAssetBundleNames[b] : buildBundles[i]);
                             }
 
-                            PostProcessBundles(assetGroup, buildBundles, outputBundles, results, aaContext.runtimeData, aaContext.locations, builderInput.Registry, primaryKeyToCatalogEntry, bundleRenameMap);
+                            PostProcessBundles(assetGroup, buildBundles, outputBundles, results, aaContext.runtimeData, aaContext.locations, builderInput.Registry, primaryKeyToCatalogEntry, bundleRenameMap, postCatalogUpdateCallbacks);
                         }
                     }
                 }
@@ -222,6 +223,8 @@ public void Dispose()
                 }
 
                 ProcessCatalogEntriesForBuild(aaContext, m_Log, groups, builderInput, extractData.WriteData, carryOverCachedState, m_BundleToInternalId);
+                foreach (var postUpdateCatalogCallback in postCatalogUpdateCallbacks)
+                    postUpdateCatalogCallback.Invoke();
 
                 foreach (var r in results.WriteResults)
                 {
@@ -282,7 +285,7 @@ public void Dispose()
             if (extractData.BuildCache != null && builderInput.PreviousContentState == null)
             {
                 var allEntries = new List<AddressableAssetEntry>();
-                aaContext.Settings.GetAllAssets(allEntries, false, FilterGroupForContentState);
+                aaContext.Settings.GetAllAssets(allEntries, false, ContentUpdateScript.GroupFilter);
                 var remoteCatalogLoadPath = aaContext.Settings.BuildRemoteCatalog ? aaContext.Settings.RemoteCatalogLoadPath.GetValue(aaContext.Settings) : string.Empty;
                 if (ContentUpdateScript.SaveContentState(aaContext.locations, tempPath, allEntries, extractData.DependencyData, playerBuildVersion, remoteCatalogLoadPath, carryOverCachedState))
                 {
@@ -302,17 +305,6 @@ public void Dispose()
             return opResult;
         }
 
-        private static bool FilterGroupForContentState(AddressableAssetGroup g)
-        {
-            if (g == null)
-                return false;
-            if (!g.HasSchema<ContentUpdateGroupSchema>() || !g.GetSchema<ContentUpdateGroupSchema>().StaticContent)
-                return false;
-            if (!g.HasSchema<BundledAssetGroupSchema>() || !g.GetSchema<BundledAssetGroupSchema>().IncludeInBuild)
-                return false;
-            return true;
-        }
-
         private static void ProcessCatalogEntriesForBuild(AddressableAssetsBuildContext aaContext, IBuildLogger log,
             IEnumerable<AddressableAssetGroup> validGroups, AddressablesDataBuilderInput builderInput, IBundleWriteData writeData,
             List<CachedAssetState> carryOverCachedState, Dictionary<string, string> bundleToInternalId)
@@ -493,12 +485,27 @@ internal ReturnCode CreateCatalogBundle(string filepath, string jsonText, Addres
                     string fullBundleName = writeData.FileToBundle[file];
                     string convertedLocation = bundleNameToInternalBundleIdMap[fullBundleName];
 
-                    if (locationIdToCatalogEntryMap.TryGetValue(convertedLocation, out ContentCatalogDataEntry catalogEntry))
+                    if (locationIdToCatalogEntryMap.TryGetValue(convertedLocation,
+                        out ContentCatalogDataEntry catalogEntry))
+                    {
                         loc.BundleFileId = catalogEntry.InternalId;
+
+                        //This is where we strip out the temporary hash added to the bundle name for Content Update for the AssetEntry
+                        if(loc.parentGroup?.GetSchema<BundledAssetGroupSchema>()?.BundleNaming ==
+                          BundledAssetGroupSchema.BundleNamingStyle.NoHash)
+                        {
+                            loc.BundleFileId = StripHashFromBundleLocation(loc.BundleFileId);
+                        }
+                    }
                 }
             }
         }
 
+        static string StripHashFromBundleLocation(string hashedBundleLocation)
+        {
+            return hashedBundleLocation.Remove(hashedBundleLocation.LastIndexOf("_")) + ".bundle";
+        }
+
         /// <inheritdoc />
         protected override string ProcessGroup(AddressableAssetGroup assetGroup, AddressableAssetsBuildContext aaContext)
         {
@@ -860,7 +867,7 @@ static void CopyFileWithTimestampIfDifferent(string srcPath, string destPath, IB
             }
         }
 
-        void PostProcessBundles(AddressableAssetGroup assetGroup, List<string> buildBundles, List<string> outputBundles, IBundleBuildResults buildResult, ResourceManagerRuntimeData runtimeData, List<ContentCatalogDataEntry> locations, FileRegistry registry, Dictionary<string, ContentCatalogDataEntry> primaryKeyToCatalogEntry, Dictionary<string, string> bundleRenameMap)
+        void PostProcessBundles(AddressableAssetGroup assetGroup, List<string> buildBundles, List<string> outputBundles, IBundleBuildResults buildResult, ResourceManagerRuntimeData runtimeData, List<ContentCatalogDataEntry> locations, FileRegistry registry, Dictionary<string, ContentCatalogDataEntry> primaryKeyToCatalogEntry, Dictionary<string, string> bundleRenameMap, List<Action> postCatalogUpdateCallbacks)
         {
             var schema = assetGroup.GetSchema<BundledAssetGroupSchema>();
             if (schema == null)
@@ -916,10 +923,35 @@ void PostProcessBundles(AddressableAssetGroup assetGroup, List<string> buildBund
                 bundleRenameMap.Add(buildBundles[i], outputBundles[i]);
                 CopyFileWithTimestampIfDifferent(srcPath, targetPath, m_Log);
 
+                AddPostCatalogUpdatesInternal(assetGroup, postCatalogUpdateCallbacks, dataEntry, targetPath);
+
                 registry.AddFile(targetPath);
             }
         }
 
+        internal void AddPostCatalogUpdatesInternal(AddressableAssetGroup assetGroup, List<Action> postCatalogUpdates, ContentCatalogDataEntry dataEntry, string targetBundlePath)
+        {
+            if (assetGroup.GetSchema<BundledAssetGroupSchema>()?.BundleNaming ==
+                BundledAssetGroupSchema.BundleNamingStyle.NoHash)
+            {
+                postCatalogUpdates.Add(() =>
+                {
+                    //This is where we strip out the temporary hash for the final bundle location and filename
+                    string bundleNameWithoutHash = StripHashFromBundleLocation(targetBundlePath);
+                    if (File.Exists(targetBundlePath))
+                    {
+                        if (File.Exists(bundleNameWithoutHash))
+                            File.Delete(bundleNameWithoutHash);
+                        File.Move(targetBundlePath, bundleNameWithoutHash);
+                    }
+
+                    if (dataEntry != null)
+                        dataEntry.InternalId = bundleNameWithoutHash;
+
+                });
+            }
+        }
+
         /// <summary>
         /// Creates a name for an asset bundle using the provided information.
         /// </summary>
@@ -932,7 +964,15 @@ protected virtual string ConstructAssetBundleName(AddressableAssetGroup assetGro
         {
             string groupName = assetGroup.Name.Replace(" ", "").Replace('\\', '/').Replace("//", "/").ToLower();
             assetBundleName = groupName + "_" + assetBundleName;
-            return BuildUtility.GetNameWithHashNaming(schema.BundleNaming, info.Hash.ToString(), assetBundleName);
+            string bundleNameWithHashing = BuildUtility.GetNameWithHashNaming(schema.BundleNaming, info.Hash.ToString(), assetBundleName);
+            //For no hash, we need the hash temporarily for content update purposes.  This will be stripped later on.
+            if (assetGroup.GetSchema<BundledAssetGroupSchema>()?.BundleNaming ==
+                BundledAssetGroupSchema.BundleNamingStyle.NoHash)
+            {
+                bundleNameWithHashing = bundleNameWithHashing.Replace(".bundle", "_" + info.Hash.ToString() + ".bundle");
+            }
+
+            return bundleNameWithHashing;
         }
 
         static void ReplaceDependencyKeys(string from, string to, List<ContentCatalogDataEntry> locations)

Editor/GUI/AddressableAssetSettingsInspector.cs

@@ -215,7 +215,10 @@ public override void OnInspectorGUI()
                     m_QueuedChanges.Add(() => m_AasTarget.MaxConcurrentWebRequests = maxWebReqs);
 
                 ProjectConfigData.showGroupsAsHierarchy = EditorGUILayout.Toggle(m_groupHierarchyView, ProjectConfigData.showGroupsAsHierarchy);
-                ProjectConfigData.ignoreUnsupportedFilesInBuild = EditorGUILayout.Toggle(m_IgnoreUnsupportedFilesInBuild, ProjectConfigData.ignoreUnsupportedFilesInBuild);
+
+                bool ignoreUnsupportedFilesInBuild = EditorGUILayout.Toggle(m_IgnoreUnsupportedFilesInBuild, m_AasTarget.IgnoreUnsupportedFilesInBuild);
+                if (ignoreUnsupportedFilesInBuild != m_AasTarget.IgnoreUnsupportedFilesInBuild)
+                    m_QueuedChanges.Add(() => m_AasTarget.IgnoreUnsupportedFilesInBuild = ignoreUnsupportedFilesInBuild);
             }
 
             GUILayout.Space(6);

Editor/GUI/AddressableAssetsSettingsGroupEditor.cs

@@ -29,7 +29,7 @@ class AddressableAssetsSettingsGroupEditor
 
         SearchField m_SearchField;
         const int k_SearchHeight = 20;
-        internal AddressableAssetSettings settings { get { return AddressableAssetSettingsDefaultObject.Settings; } }
+        internal AddressableAssetSettings settings;
 
         bool m_ResizingVerticalSplitter;
         Rect m_VerticalSplitterRect = new Rect(0, 0, 10, k_SplitterWidth);
@@ -40,6 +40,7 @@ class AddressableAssetsSettingsGroupEditor
         public AddressableAssetsSettingsGroupEditor(AddressableAssetsWindow w)
         {
             window = w;
+            settings = AddressableAssetSettingsDefaultObject.Settings;
             m_VerticalSplitterPercent = 0.8f;
             OnEnable();
         }
@@ -226,15 +227,7 @@ void TopToolbar(Rect toolbarPos)
                     var searchString = m_SearchField.OnGUI(searchRect, baseSearch, m_SearchStyles[0], m_SearchStyles[1], m_SearchStyles[2]);
                     if (baseSearch != searchString)
                     {
-                        if (ProjectConfigData.hierarchicalSearch)
-                        {
-                            m_EntryTree.customSearchString = searchString;
-                            Reload();
-                        }
-                        else
-                        {
-                            m_EntryTree.searchString = searchString;
-                        }
+                        m_EntryTree?.Search(searchString);
                     }
                 }
             }
@@ -367,8 +360,8 @@ public bool OnGUI(Rect pos)
         {
             if (settings == null)
                 return false;
-				
-			if (!m_ModificationRegistered)
+
+            if (!m_ModificationRegistered)
             {
                 m_ModificationRegistered = true;
                 settings.OnModification -= OnSettingsModification; //just in case...

Editor/GUI/AddressableAssetsSettingsGroupTreeView.cs

@@ -35,6 +35,13 @@ enum ColumnId
             ColumnId.Path,
             ColumnId.Labels
         };
+
+        internal AddressableAssetEntryTreeView(AddressableAssetSettings settings)
+            : this(new TreeViewState(), CreateDefaultMultiColumnHeaderState(), new AddressableAssetsSettingsGroupEditor(ScriptableObject.CreateInstance<AddressableAssetsWindow>()))
+        {
+            m_Editor.settings = settings;
+        }
+
         public AddressableAssetEntryTreeView(TreeViewState state, MultiColumnHeaderState mchs, AddressableAssetsSettingsGroupEditor ed) : base(state, new MultiColumnHeader(mchs))
         {
             showBorder = true;
@@ -45,6 +52,8 @@ public AddressableAssetEntryTreeView(TreeViewState state, MultiColumnHeaderState
             BuiltinSceneCache.sceneListChanged += OnScenesChanged;
         }
 
+        internal TreeViewItem Root => rootItem;
+
         void OnScenesChanged()
         {
             Reload();
@@ -125,6 +134,21 @@ protected override IList<TreeViewItem> BuildRows(TreeViewItem root)
             return base.BuildRows(root);
         }
 
+        internal IList<TreeViewItem> Search(string search)
+        {
+            if (ProjectConfigData.hierarchicalSearch)
+            {
+                customSearchString = search;
+                Reload();
+            }
+            else
+            {
+                searchString = search;
+            }
+
+            return GetRows();
+        }
+
         protected IList<TreeViewItem> Search(IList<TreeViewItem> rows)
         {
             if (rows == null)
@@ -311,7 +335,7 @@ void AddGroupChildrenBuild(AddressableAssetGroup group, TreeViewItem root)
                 TreeViewItem newRoot = root;
                 var parts = group.Name.Split('-');
                 string partialRestore = "";
-                for(int index = 0; index < parts.Length-1; index++)
+                for (int index = 0; index < parts.Length - 1; index++)
                 {
                     TreeViewItem folderItem = null;
                     partialRestore += parts[index];
@@ -324,7 +348,7 @@ void AddGroupChildrenBuild(AddressableAssetGroup group, TreeViewItem root)
                     depth++;
                     newRoot = folderItem;
                 }
-                
+
                 groupItem = new AssetEntryTreeViewItem(group, depth);
                 newRoot.AddChild(groupItem);
             }
@@ -338,7 +362,7 @@ void AddGroupChildrenBuild(AddressableAssetGroup group, TreeViewItem root)
             {
                 foreach (var entry in group.entries)
                 {
-                    AddAndRecurseEntriesBuild(entry, groupItem, depth+1, IsExpanded(groupItem.id));
+                    AddAndRecurseEntriesBuild(entry, groupItem, depth + 1, IsExpanded(groupItem.id));
                 }
             }
         }
@@ -1416,7 +1440,6 @@ public override string displayName
                 base.displayName = value;
             }
         }
-
     }