Skip to content

Commit 8826651

Browse files
author
Stewart Miles
committed
Consider all files when processing plugin manifests.
FileMetadataSet.FindWithPendingUpdates() was filtering out files referenced by plugin manifests that may be out of date when examining the difference between versions of a plugin manifest. This changes the update process to consider all managed files when searching for obsolete files detected via plugin manifests. Bug: 150886091 Change-Id: I307cecf1ccc8b6444f3364f91d700f80c2353cd6
1 parent f3d30e1 commit 8826651

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

source/VersionHandlerImpl/src/VersionHandlerImpl.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,18 +2477,17 @@ public static void UpdateVersionedAssets(bool forceUpdate, Action complete) {
24772477

24782478
UpdateAssetsWithBuildTargets(EditorUserBuildSettings.activeBuildTarget);
24792479

2480-
var metadataSet = FileMetadataSet.FilterOutReadOnlyFiles(
2480+
var allMetadataSet = FileMetadataSet.FilterOutReadOnlyFiles(
24812481
FileMetadataSet.ParseFromFilenames(FindAllAssets()));
24822482
// Rename linux libraries, if any are being tracked.
2483-
var linuxLibraries = new LinuxLibraryRenamer(metadataSet);
2483+
var linuxLibraries = new LinuxLibraryRenamer(allMetadataSet);
24842484
linuxLibraries.RenameLibraries();
24852485

2486-
if (!forceUpdate) {
2487-
metadataSet = FileMetadataSet.FindWithPendingUpdates(metadataSet);
2488-
}
2486+
var metadataSet = allMetadataSet;
2487+
if (!forceUpdate) metadataSet = FileMetadataSet.FindWithPendingUpdates(allMetadataSet);
24892488

24902489
var obsoleteFiles = new ObsoleteFiles(
2491-
ManifestReferences.FindAndReadManifests(metadataSet), metadataSet);
2490+
ManifestReferences.FindAndReadManifests(allMetadataSet), allMetadataSet);
24922491
if (metadataSet.EnableMostRecentPlugins(forceUpdate, obsoleteFiles.All)) {
24932492
analytics.Report("enablemostrecentplugins", "Enable Most Recent Plugins");
24942493
AssetDatabase.Refresh();

0 commit comments

Comments
 (0)