Merge pull request #8740 from davidkline-ms/inv8733

David Kline · web-flow · commit 21fe7bb18e45 · 2020-10-02T15:59:14.000-07:00
Fix for #8733: Limit migration tool to Assets folder tree
diff --git a/Assets/MRTK/SDK/Editor/Migration/Tools/MigrationTool.cs b/Assets/MRTK/SDK/Editor/Migration/Tools/MigrationTool.cs
@@ -397,7 +397,7 @@ private static List<string> FindAllAssetsOfType(Type[] types)
             var filter = string.Join(" ", types
                                           .Select(x => string.Format("t:{0}", x.Name))
                                           .ToArray());
-            return AssetDatabase.FindAssets(filter).Select(x => AssetDatabase.GUIDToAssetPath(x)).ToList();
+            return AssetDatabase.FindAssets(filter, new[] {"Assets"}).Select(x => AssetDatabase.GUIDToAssetPath(x)).ToList();
         }
 
         private static bool IsSceneGameObject(Object selectedObject)

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ private static List<string> FindAllAssetsOfType(Type[] types)`
`397`	`397`	`var filter = string.Join(" ", types`
`398`	`398`	`.Select(x => string.Format("t:{0}", x.Name))`
`399`	`399`	`.ToArray());`
`400`		`- return AssetDatabase.FindAssets(filter).Select(x => AssetDatabase.GUIDToAssetPath(x)).ToList();`
	`400`	`+ return AssetDatabase.FindAssets(filter, new[] {"Assets"}).Select(x => AssetDatabase.GUIDToAssetPath(x)).ToList();`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`private static bool IsSceneGameObject(Object selectedObject)`