[6.4] Deprecate FindObjectsSortMode and Object.FindObject* methods that depend on InstanceID sort order.

joelpryde · Evergreen · commit ff5087a3dd40 · 2026-01-20T20:55:09.000Z
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.LightTransport.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.LightTransport.cs
@@ -668,7 +668,7 @@ static void UpdateLightStatus()
             var sceneLights = new Dictionary<Scene, List<Light>>();
 
             // Modify each baked light, take note of which scenes they belong to.
-            var allLights = Object.FindObjectsByType<Light>(FindObjectsSortMode.None);
+            var allLights = Object.FindObjectsByType<Light>();
             foreach (var light in allLights)
             {
                 if (light.lightmapBakeType != LightmapBakeType.Realtime)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Placement.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Placement.cs
@@ -73,7 +73,9 @@ internal static List<ProbeVolumePerSceneData> GetPerSceneDataList()
 
         internal static List<ProbeVolume> GetProbeVolumeList()
         {
+            #pragma warning disable CS0618 // Type or member is obsolete
             var fullPvList = GameObject.FindObjectsByType<ProbeVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             List<ProbeVolume> usedPVList;
 
             if (isBakingSceneSubset)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs
@@ -746,7 +746,9 @@ static internal void Clear()
             if (activeSet != null)
                 activeSet.Clear();
 
+            #pragma warning disable CS0618 // Type or member is obsolete
             var probeVolumes = GameObject.FindObjectsByType<ProbeVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (var probeVolume in probeVolumes)
                 probeVolume.OnLightingDataAssetCleared();
         }
@@ -879,7 +881,9 @@ static void CellCountInDirections(out Vector3Int minCellPositionXYZ, out Vector3
         static TouchupVolumeWithBoundsList GetAdjustementVolumes()
         {
             // This is slow, but we should have very little amount of touchup volumes.
+#pragma warning disable CS0618 // Type or member is obsolete
             var touchupVolumes = Object.FindObjectsByType<ProbeAdjustmentVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
             var touchupVolumesAndBounds = new TouchupVolumeWithBoundsList(touchupVolumes.Length);
             foreach (var touchup in touchupVolumes)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs
@@ -42,7 +42,9 @@ static void UpdateRealtimeSubdivisionDebug()
 
                 if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds)
                 {
+                    #pragma warning disable CS0618 // Type or member is obsolete
                     var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();
+#pragma warning restore CS0618 // Type or member is obsolete
                     if (probeVolume == null || !probeVolume.isActiveAndEnabled)
                         return;
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs
@@ -1216,7 +1216,9 @@ internal class ProbeVolumeOverlay : Overlay, ITransientOverlay
             {
                 if (ProbeReferenceVolume.instance.probeVolumeDebug.realtimeSubdivision)
                 {
+                    #pragma warning disable CS0618 // Type or member is obsolete
                     var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();
+#pragma warning restore CS0618 // Type or member is obsolete
                     if (probeVolume != null && probeVolume.isActiveAndEnabled)
                     {
                         var profile = ProbeVolumeBakingSet.GetBakingSetForScene(probeVolume.gameObject.scene);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.cs
@@ -227,7 +227,9 @@ void EnsurePersistentCanvas()
         {
             if (m_RootUIPersistentCanvas == null)
             {
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var uiManager = UnityObject.FindFirstObjectByType<DebugUIHandlerPersistentCanvas>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
                 if (uiManager == null)
                 {
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUpdater.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUpdater.cs
@@ -80,7 +80,7 @@ internal static void HandleInternalEventSystemComponents(bool uiEnabled)
 
         void EnsureExactlyOneEventSystem()
         {
-            var eventSystems = FindObjectsByType<EventSystem>(FindObjectsSortMode.None);
+            var eventSystems = FindObjectsByType<EventSystem>();
             var debugEventSystem = GetComponent<EventSystem>();
 
             if (eventSystems.Length > 1 && debugEventSystem != null)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingSet.Editor.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingSet.Editor.cs
@@ -525,7 +525,7 @@ static void InflateBound(ref Bounds bounds, ProbeVolume pv)
 
         internal void UpdateSceneBounds(Scene scene, string sceneGUID, bool onSceneSave)
         {
-            var volumes = FindObjectsByType<ProbeVolume>(FindObjectsSortMode.None);
+            var volumes = FindObjectsByType<ProbeVolume>();
             float prevBrickSize = ProbeReferenceVolume.instance.MinBrickSize();
             int prevMaxSubdiv = ProbeReferenceVolume.instance.GetMaxSubdivision();
             Vector3 prevOffset = ProbeReferenceVolume.instance.ProbeOffset();
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeGIContributor.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeGIContributor.cs
@@ -196,7 +196,9 @@ void PushTerrain(Terrain terrain)
             }
             else
             {
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var renderers = Object.FindObjectsByType<Renderer>(FindObjectsSortMode.InstanceID);
+                #pragma warning restore CS0618 // Type or member is obsolete
                 Profiling.Profiler.BeginSample($"Find Renderers ({renderers.Length})");
                 foreach (var renderer in renderers)
                 {
@@ -205,7 +207,9 @@ void PushTerrain(Terrain terrain)
                 }
                 Profiling.Profiler.EndSample();
 
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var terrains = Object.FindObjectsByType<Terrain>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
                 Profiling.Profiler.BeginSample($"Find Terrains ({terrains.Length})");
                 foreach (var terrain in terrains)
                 {
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingContext.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingContext.cs
@@ -186,7 +186,7 @@ public void Update(CommandBuffer cmd, PathTracingSettings settings)
                 if (settings.lightPickingMethod == LightPickingMethod.Regir ||
                     settings.lightPickingMethod == LightPickingMethod.LightGrid)
                 {
-                    var sceneRenderers = Object.FindObjectsByType<Renderer>(FindObjectsSortMode.None);
+                    var sceneRenderers = Object.FindObjectsByType<Renderer>();
                     foreach (Renderer r in sceneRenderers)
                         sceneBounds.Encapsulate(r.bounds);
                 }
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructTests.cs
@@ -532,7 +532,9 @@ public void AddAndRemoveInstances()
         private void AddTerrainToAccelerationStructure(int heightmapResolution)
         {
             Terrain.CreateTerrainGameObject(new TerrainData());
+            #pragma warning disable CS0618 // Type or member is obsolete
             Terrain terrain = GameObject.FindFirstObjectByType<Terrain>();
+#pragma warning restore CS0618 // Type or member is obsolete
             Assert.NotNull(terrain);
 
             // Set terrain texture resolution on terrain data.
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs
@@ -28,7 +28,9 @@ public void Setup()
                 Assert.Ignore("Frame timing tests are not supported in batch mode, skipping test.");
 
             // HACK #1 - really shouldn't have to do this here, but previous tests are leaking gameobjects
+#pragma warning disable CS0618 // Type or member is obsolete
             var objects = GameObject.FindObjectsByType<GameObject>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (var o in objects)
             {
                 // HACK #2 - must not destroy DebugUpdater, which happens to have an EventSystem.
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/DiffusionProfileListEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/DiffusionProfileListEditor.cs
@@ -57,7 +57,9 @@ void FillProfileListWithScene()
 
             // Get all mesh renderers that are within the current volume
             var diffusionProfiles = new List<DiffusionProfileSettings>();
+            #pragma warning disable CS0618 // Type or member is obsolete
             foreach (var meshRenderer in Object.FindObjectsByType<MeshRenderer>(FindObjectsSortMode.InstanceID))
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 var colliders = Physics.OverlapBox(meshRenderer.bounds.center, meshRenderer.bounds.size / 2);
                 if (colliders.Contains(volumeCollider))
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
@@ -301,7 +301,9 @@ static void MenuCreatePostProcessShader()
         //[MenuItem("Internal/HDRP/Add \"Additional Light-shadow Data\" (if not present)")]
         static void AddAdditionalLightData()
         {
+            #pragma warning disable CS0618 // Type or member is obsolete
             var lights = UnityObject.FindObjectsByType<Light>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
             foreach (var light in lights)
             {
@@ -317,7 +319,9 @@ static void AddAdditionalLightData()
         //[MenuItem("Internal/HDRP/Add \"Additional Camera Data\" (if not present)")]
         static void AddAdditionalCameraData()
         {
+            #pragma warning disable CS0618 // Type or member is obsolete
             var cameras = UnityObject.FindObjectsByType<Camera>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
             foreach (var camera in cameras)
             {
@@ -509,8 +513,10 @@ static void CheckSceneContentForRayTracing(MenuCommand menuCommand)
         {
             // Flag that holds
             bool generalErrorFlag = false;
+            #pragma warning disable CS0618 // Type or member is obsolete
             var rendererArray = UnityEngine.GameObject.FindObjectsByType<Renderer>(FindObjectsSortMode.InstanceID);
             var lodGroupArray = UnityEngine.GameObject.FindObjectsByType<LODGroup>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             List<Material> materialArray = new List<Material>(32);
             ReflectionProbe reflectionProbe = new ReflectionProbe();
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/HDLightingWindowEnvironmentSection.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/HDLightingWindowEnvironmentSection.cs
@@ -103,7 +103,9 @@ static internal StaticLightingSky GetStaticLightingSkyForScene(Scene scene)
             //Perhaps it is an old scene. Search everywhere
             if (result == null)
             {
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var candidates = GameObject.FindObjectsByType<StaticLightingSky>(FindObjectsSortMode.InstanceID).Where(sls => sls.gameObject.scene == scene);
+#pragma warning restore CS0618 // Type or member is obsolete
                 if (candidates.Count() > 0)
                     result = candidates.First();
             }
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/HDRISky/HDRISkyEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/HDRISky/HDRISkyEditor.cs
@@ -167,7 +167,9 @@ public void GetUpperHemisphereLuxValue()
         Light GetSun()
         {
             Light sunObject = null;
+            #pragma warning disable CS0618 // Type or member is obsolete
             var lights = FindObjectsByType<Light>(FindObjectsInactive.Exclude, FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (var light in lights)
             {
                 if (light.type != LightType.Directional)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs
@@ -9,7 +9,7 @@ public partial class HDRenderPipeline
 
         internal void RetrieveExtraDataFromProbeVolumeBake(ProbeReferenceVolume.ExtraDataActionInput input)
         {
-            var hdProbes = GameObject.FindObjectsByType<HDProbe>(FindObjectsSortMode.None);
+            var hdProbes = GameObject.FindObjectsByType<HDProbe>();
             foreach (var hdProbe in hdProbes)
             {
                 hdProbe.TryUpdateLuminanceSHL2ForNormalization();
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.cs
@@ -180,7 +180,7 @@ void CheckWaterCurrentData()
         internal void Cleanup()
         {
             // Grab all the water surfaces in the scene. Including disabled ones (i.e. not in WaterSurface.instances).
-            var waterSurfaces = Object.FindObjectsByType<WaterSurface>(FindObjectsSortMode.None);
+            var waterSurfaces = Object.FindObjectsByType<WaterSurface>();
             int numWaterSurfaces = waterSurfaces.Length;
 
             // Loop through them and display them
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesLitShader.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesLitShader.cs
@@ -57,7 +57,9 @@ void CacheRenderersUsingThisMaterial(Material material)
         {
             m_RenderersUsingThisMaterial.Clear();
 
+            #pragma warning disable CS0618 // Type or member is obsolete
             ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (ParticleSystemRenderer renderer in renderers)
             {
                 if (renderer.sharedMaterial == material)
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesSimpleLitShader.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesSimpleLitShader.cs
@@ -59,7 +59,9 @@ void CacheRenderersUsingThisMaterial(Material material)
         {
             m_RenderersUsingThisMaterial.Clear();
 
+            #pragma warning disable CS0618 // Type or member is obsolete
             ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (ParticleSystemRenderer renderer in renderers)
             {
                 if (renderer.sharedMaterial == material)
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesUnlitShader.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/ParticlesUnlitShader.cs
@@ -57,7 +57,9 @@ void CacheRenderersUsingThisMaterial(Material material)
         {
             m_RenderersUsingThisMaterial.Clear();
 
+            #pragma warning disable CS0618 // Type or member is obsolete
             ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (ParticleSystemRenderer renderer in renderers)
             {
                 if (renderer.sharedMaterial == material)
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs
@@ -88,7 +88,9 @@ public DecalEntityManager Get()
 
                 m_DecalEntityManager = new DecalEntityManager();
 
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var decalProjectors = GameObject.FindObjectsByType<DecalProjector>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
                 foreach (var decalProjector in decalProjectors)
                 {
                     if (!decalProjector.isActiveAndEnabled || m_DecalEntityManager.IsValid(decalProjector.decalEntity))
diff --git a/Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/SharedAssets/Scripts/CheckAssignedRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/SharedAssets/Scripts/CheckAssignedRenderPipelineAsset.cs
@@ -26,7 +26,7 @@ private void Update()
 
     private void SetAllCamerasEnabled(bool enable)
     {
-        Camera[] allCameras = FindObjectsByType<Camera>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+        Camera[] allCameras = FindObjectsByType<Camera>(FindObjectsInactive.Include);
         foreach (Camera c in allCameras)
             c.enabled = enable;
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/RenderPassCullingTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/RenderPassCullingTests.cs
@@ -22,7 +22,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
 
             var cullingResults = cullContextData.Cull(ref cullingParameters);
 
-            var lightsInScene = Object.FindObjectsByType<Light>(FindObjectsSortMode.None);
+            var lightsInScene = Object.FindObjectsByType<Light>();
             Assert.IsTrue(cullingResults.visibleLights.Length == lightsInScene.Length);
         }
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/Light2DTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/Light2DTests.cs
@@ -19,7 +19,7 @@ class MultipleObjectLight2DTests
         [OneTimeSetUp]
         public void OneTimeSetup()
         {
-            var allGameObjectsInScene = Object.FindObjectsByType<GameObject>(FindObjectsSortMode.None);
+            var allGameObjectsInScene = Object.FindObjectsByType<GameObject>();
             foreach (var go in allGameObjectsInScene)
             {
                 Object.DestroyImmediate(go);
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Utilities/Playables/VisualEffectControlClipInspector.cs b/Packages/com.unity.visualeffectgraph/Editor/Utilities/Playables/VisualEffectControlClipInspector.cs
@@ -30,7 +30,9 @@ public override void OnInspectorGUI()
                 serializedObject.ApplyModifiedProperties();
 
                 //Modification on tracks doesn't trigger a refresh, calling manually the director refresh
+#pragma warning disable CS0618 // Type or member is obsolete
                 var allDirectors = FindObjectsByType<UnityEngine.Playables.PlayableDirector>(FindObjectsInactive.Exclude, FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
                 foreach (var director in allDirectors)
                 {
                     director.RebuildGraph();
diff --git a/Tests/SRPTests/Packages/com.unity.testing.hdrp/Scripts/Editor/GraphicTestTools.cs b/Tests/SRPTests/Packages/com.unity.testing.hdrp/Scripts/Editor/GraphicTestTools.cs
@@ -33,7 +33,9 @@ public static void MakeMaterialSceneInstance()
     [MenuItem("Internal/GraphicTest Tools/Update All Material Placers")]
     public static void UpdateAllPlacers()
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         MultiMaterialPlacer[] placers = Object.FindObjectsByType<MultiMaterialPlacer>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
         for (int i = 0; i < placers.Length; ++i)
         {
diff --git a/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs b/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs
@@ -102,7 +102,9 @@ override public void OnInspectorGUI()
 
         if (GUILayout.Button("Fix Texts"))
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             TextMeshPixelSize[] texts = FindObjectsByType<TextMeshPixelSize>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (TextMeshPixelSize text in texts)
             {
                 text.CorrectPosition();
diff --git a/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs b/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs
@@ -55,9 +55,9 @@ public static IEnumerator Run(SceneGraphicsTestCase testCase)
         for (int i = 0; i < 5; ++i)
             yield return new WaitForEndOfFrame();
 
-        settings = GameObject.FindFirstObjectByType<HDRP_TestSettings>();
+        settings = GameObject.FindAnyObjectByType<HDRP_TestSettings>();
         camera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
-        if (camera == null) camera = GameObject.FindFirstObjectByType<Camera>();
+        if (camera == null) camera = GameObject.FindAnyObjectByType<Camera>();
         if (camera == null)
         {
             Assert.Fail("Missing camera for graphic tests.");
@@ -103,9 +103,9 @@ public static IEnumerator Run(SceneGraphicsTestCase testCase)
             yield return new WaitForEndOfFrame();
 
         // Need to retrieve objects again after scene reload.
-        settings = GameObject.FindFirstObjectByType<HDRP_TestSettings>();
+        settings = GameObject.FindAnyObjectByType<HDRP_TestSettings>();
         camera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
-        if (camera == null) camera = GameObject.FindFirstObjectByType<Camera>();
+        if (camera == null) camera = GameObject.FindAnyObjectByType<Camera>();
         if (camera == null)
         {
             Assert.Fail("Missing camera for graphic tests.");
@@ -115,7 +115,9 @@ public static IEnumerator Run(SceneGraphicsTestCase testCase)
         HDCamera hdCamera = HDCamera.GetOrCreate(camera);
 
         //We need to get all the cameras to set accumulation in all of them for tests that uses multiple cameras
+#pragma warning disable CS0618 // Type or member is obsolete
         cameras = GameObject.FindObjectsByType<Camera>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
         //Grab the HDCameras
         hdCameras = new HDCamera[cameras.Length];
@@ -158,7 +160,9 @@ public static IEnumerator Run(SceneGraphicsTestCase testCase)
             settings.ImageComparisonSettings.PerPixelCorrectnessThreshold *= settings.xrThresholdMultiplier;
 
             // Increase number of volumetric slices to compensate for initial half-resolution due to XR single-pass optimization
+#pragma warning disable CS0618 // Type or member is obsolete
             foreach (var volume in GameObject.FindObjectsByType<Volume>(FindObjectsSortMode.InstanceID))
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 if (volume.profile.TryGet<Fog>(out Fog fog))
                     fog.volumeSliceCount.value *= 2;
@@ -216,7 +220,7 @@ public static IEnumerator Run(SceneGraphicsTestCase testCase)
         for (int i = 0; i < waitFrames; ++i)
             yield return new WaitForEndOfFrame();
 
-        var settingsSG = (GameObject.FindFirstObjectByType<HDRP_TestSettings>() as HDRP_ShaderGraph_TestSettings);
+        var settingsSG = (GameObject.FindAnyObjectByType<HDRP_TestSettings>() as HDRP_ShaderGraph_TestSettings);
         if (settingsSG == null || !settingsSG.compareSGtoBI)
         {
             // Standard Test
diff --git a/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/TextMeshPixelSize.cs b/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/TextMeshPixelSize.cs
diff --git a/Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs b/Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs
diff --git a/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Common/Editor/BaseGraphicsTests.cs b/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Common/Editor/BaseGraphicsTests.cs
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Editor/MaterialCreator.cs b/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Editor/MaterialCreator.cs
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs b/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs
diff --git a/Tests/SRPTests/Projects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs b/Tests/SRPTests/Projects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/FixedTimeParamsUploader.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/FixedTimeParamsUploader.cs
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/SceneFixedTimeAnimatorUpdater.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/SceneFixedTimeAnimatorUpdater.cs
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/SceneFixedTimePlayableDirectorUpdater.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/210_Motion_Vectors/Scripts/SceneFixedTimePlayableDirectorUpdater.cs
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/133_DepthOfField_DynamicResolution/SetDynamicResolution.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/133_DepthOfField_DynamicResolution/SetDynamicResolution.cs
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_URP/Assets/GraphicsTests/Instancing/SplitGroupStressTest.cs b/Tests/SRPTests/Projects/VisualEffectGraph_URP/Assets/GraphicsTests/Instancing/SplitGroupStressTest.cs

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ static void UpdateLightStatus()`
`668`	`668`	`var sceneLights = new Dictionary<Scene, List<Light>>();`
`669`	`669`
`670`	`670`	`// Modify each baked light, take note of which scenes they belong to.`
`671`		`- var allLights = Object.FindObjectsByType<Light>(FindObjectsSortMode.None);`
	`671`	`+ var allLights = Object.FindObjectsByType<Light>();`
`672`	`672`	`foreach (var light in allLights)`
`673`	`673`	`{`
`674`	`674`	`if (light.lightmapBakeType != LightmapBakeType.Realtime)`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ internal static List<ProbeVolumePerSceneData> GetPerSceneDataList()`
`73`	`73`
`74`	`74`	`internal static List<ProbeVolume> GetProbeVolumeList()`
`75`	`75`	`{`
	`76`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`76`	`77`	`var fullPvList = GameObject.FindObjectsByType<ProbeVolume>(FindObjectsSortMode.InstanceID);`
	`78`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`77`	`79`	`List<ProbeVolume> usedPVList;`
`78`	`80`
`79`	`81`	`if (isBakingSceneSubset)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ static void UpdateRealtimeSubdivisionDebug()`
`42`	`42`
`43`	`43`	`if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds)`
`44`	`44`	`{`
	`45`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`45`	`46`	`var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();`
	`47`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`46`	`48`	`if (probeVolume == null \|\| !probeVolume.isActiveAndEnabled)`
`47`	`49`	`return;`
`48`	`50`
Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,9 @@ internal class ProbeVolumeOverlay : Overlay, ITransientOverlay`
`1216`	`1216`	`{`
`1217`	`1217`	`if (ProbeReferenceVolume.instance.probeVolumeDebug.realtimeSubdivision)`
`1218`	`1218`	`{`
	`1219`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`1219`	`1220`	`var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();`
	`1221`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`1220`	`1222`	`if (probeVolume != null && probeVolume.isActiveAndEnabled)`
`1221`	`1223`	`{`
`1222`	`1224`	`var profile = ProbeVolumeBakingSet.GetBakingSetForScene(probeVolume.gameObject.scene);`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,9 @@ void EnsurePersistentCanvas()`
`227`	`227`	`{`
`228`	`228`	`if (m_RootUIPersistentCanvas == null)`
`229`	`229`	`{`
	`230`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`230`	`231`	`var uiManager = UnityObject.FindFirstObjectByType<DebugUIHandlerPersistentCanvas>();`
	`232`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`231`	`233`
`232`	`234`	`if (uiManager == null)`
`233`	`235`	`{`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ internal static void HandleInternalEventSystemComponents(bool uiEnabled)`
`80`	`80`
`81`	`81`	`void EnsureExactlyOneEventSystem()`
`82`	`82`	`{`
`83`		`- var eventSystems = FindObjectsByType<EventSystem>(FindObjectsSortMode.None);`
	`83`	`+ var eventSystems = FindObjectsByType<EventSystem>();`
`84`	`84`	`var debugEventSystem = GetComponent<EventSystem>();`
`85`	`85`
`86`	`86`	`if (eventSystems.Length > 1 && debugEventSystem != null)`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ static void InflateBound(ref Bounds bounds, ProbeVolume pv)`
`525`	`525`
`526`	`526`	`internal void UpdateSceneBounds(Scene scene, string sceneGUID, bool onSceneSave)`
`527`	`527`	`{`
`528`		`- var volumes = FindObjectsByType<ProbeVolume>(FindObjectsSortMode.None);`
	`528`	`+ var volumes = FindObjectsByType<ProbeVolume>();`
`529`	`529`	`float prevBrickSize = ProbeReferenceVolume.instance.MinBrickSize();`
`530`	`530`	`int prevMaxSubdiv = ProbeReferenceVolume.instance.GetMaxSubdivision();`
`531`	`531`	`Vector3 prevOffset = ProbeReferenceVolume.instance.ProbeOffset();`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,9 @@ void PushTerrain(Terrain terrain)`
`196`	`196`	`}`
`197`	`197`	`else`
`198`	`198`	`{`
	`199`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`199`	`200`	`var renderers = Object.FindObjectsByType<Renderer>(FindObjectsSortMode.InstanceID);`
	`201`	`+ #pragma warning restore CS0618 // Type or member is obsolete`
`200`	`202`	`Profiling.Profiler.BeginSample($"Find Renderers ({renderers.Length})");`
`201`	`203`	`foreach (var renderer in renderers)`
`202`	`204`	`{`
`@@ -205,7 +207,9 @@ void PushTerrain(Terrain terrain)`
`205`	`207`	`}`
`206`	`208`	`Profiling.Profiler.EndSample();`
`207`	`209`
	`210`	`+ #pragma warning disable CS0618 // Type or member is obsolete`
`208`	`211`	`var terrains = Object.FindObjectsByType<Terrain>(FindObjectsSortMode.InstanceID);`
	`212`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`209`	`213`	`Profiling.Profiler.BeginSample($"Find Terrains ({terrains.Length})");`
`210`	`214`	`foreach (var terrain in terrains)`
`211`	`215`	`{`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public void Update(CommandBuffer cmd, PathTracingSettings settings)`
`186`	`186`	`if (settings.lightPickingMethod == LightPickingMethod.Regir \|\|`
`187`	`187`	`settings.lightPickingMethod == LightPickingMethod.LightGrid)`
`188`	`188`	`{`
`189`		`- var sceneRenderers = Object.FindObjectsByType<Renderer>(FindObjectsSortMode.None);`
	`189`	`+ var sceneRenderers = Object.FindObjectsByType<Renderer>();`
`190`	`190`	`foreach (Renderer r in sceneRenderers)`
`191`	`191`	`sceneBounds.Encapsulate(r.bounds);`
`192`	`192`	`}`