Merge branch 'develop' into input/settings-uitoolkit-josep

Author: josepmariapujol-unity

.github/workflows/check-runtime-editor-refs.yml

@@ -0,0 +1,20 @@
+name: Check Editor references in Runtime code
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    branches: [ "develop" ]
+
+  workflow_dispatch:
+
+jobs:
+  check-runtime-editor-refs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check Runtime code has no Editor namespace references
+        run: bash check-runtime-editor-refs.sh

.yamato/wrench/pvp-exemptions.json

@@ -127,12 +127,12 @@
         },
         "PVP-92-3": {
           "errors": [
-            "InputSystem/Plugins/iOS/IOSGameController.cs: .Switch;",
-            "InputSystem/Plugins/Switch/SwitchProController.cs: .Switch\n",
-            "InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
-            "InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
-            "InputSystem/Plugins/Switch/SwitchSupportHID.cs: .Switch\n",
-            "Documentation~/Gamepad.md: .Switch."
+            "Documentation~/Gamepad.md: .Switch.",
+            "InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch;",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProController.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/Switch/SwitchSupportHID.cs: .Switch\n"
           ]
         },
         "PVP-124-2": {

Assets/QA/Input_Test/GUITest.unity

@@ -270,7 +270,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -943,7 +943,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1721,7 +1721,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -2377,7 +2377,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/QA/Materials/Blue.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Blue
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []

Assets/QA/Materials/Green.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Green
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []

Assets/QA/Materials/Red.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Red
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []

Assets/QA/Materials/White.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: White
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []

Assets/QA/MouseEvents/OnMouseEventsTestScene.unity

@@ -289,7 +289,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -407,7 +407,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0