Merge develop-3.x.x into docs/link-fixes-upport

Author: netcode-ci-service

.yamato/_run-all.yml

@@ -16,7 +16,7 @@ run_quick_checks:
   name: Run Quick Initial Checks
   dependencies:
     # Ensure the code is running to our current standards
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
     # This is needed for most of the jobs to execute tests + it runs xray PVP checks (all fast checks)
     - .yamato/package-pack.yml#package_pack_-_ngo_win
 
@@ -115,7 +115,7 @@ run_all_projects_standards:
   dependencies:
 {% for platform in test_platforms.default -%}
 {% for project in projects.all -%}
-{% for editor in validation_editors.standards -%}
+{% for editor in validation_editors.minimal -%}
     - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}

.yamato/_triggers.yml

@@ -51,7 +51,7 @@
 pr_minimal_required_checks:
   name: Minimal PR checks
   dependencies:
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
     - .yamato/package-pack.yml#package_pack_-_ngo_win
   triggers:
     expression: |-
@@ -132,7 +132,7 @@ develop_nightly:
         rerun: always
   dependencies:
     # Run project standards to verify package/default project
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
     # Run APV jobs to make sure the change won't break any dependants
     - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
     # Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0

.yamato/project-standards.yml

@@ -30,7 +30,7 @@
 
 {% for project in projects.all -%}
 {% for platform in test_platforms.default -%}
-{% for editor in validation_editors.standards -%}
+{% for editor in validation_editors.minimal -%}
 standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
   name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:

.yamato/project.metafile

@@ -176,21 +176,17 @@ test_platforms:
 # EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
 # Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
 # TODO: When a new editor will be released it should be added to this list
-# standards editor is used for standards check so we won't get random manifest changes due to newer editor being used
 
 validation_editors:
     default:
-        - 6000.3
+        - 6000.6
     all:
-        - 6000.3
-        - 6000.5
+        - 6000.6.0b5
         - 6000.6
         - trunk
         - 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
     minimal:
-        - 6000.0
-    standards:
-        - 6000.3.21f1
+        - 6000.6.0b5
 pinnedTrunk:  5fe7931aab8c4fff9274e15ef0800125c68b8d6a
 
 

Examples/CharacterControllerMovingBodies/Packages/manifest.json

@@ -2,25 +2,25 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "4.4.2",
-    "com.unity.ai.navigation": "2.0.9",
-    "com.unity.analytics": "3.8.1",
-    "com.unity.collab-proxy": "2.10.0",
+    "com.unity.ads": "4.19.0",
+    "com.unity.ai.navigation": "2.0.13",
+    "com.unity.analytics": "3.8.2",
+    "com.unity.collab-proxy": "2.12.4",
     "com.unity.feature.development": "1.0.2",
     "com.unity.ide.rider": "3.0.38",
-    "com.unity.ide.visualstudio": "2.0.25",
-    "com.unity.multiplayer.center": "1.0.0",
+    "com.unity.ide.visualstudio": "2.0.26",
+    "com.unity.multiplayer.center": "2.0.1",
     "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-3.x.x",
-    "com.unity.purchasing": "4.12.2",
-    "com.unity.services.multiplayer": "1.2.0",
-    "com.unity.test-framework": "1.6.0",
-    "com.unity.timeline": "1.8.9",
-    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
-    "com.unity.transport": "2.6.0",
-    "com.unity.ugui": "2.0.0",
-    "com.unity.visualscripting": "1.9.7",
-    "com.unity.xr.legacyinputhelpers": "2.1.12",
+    "com.unity.purchasing": "5.4.1",
+    "com.unity.services.multiplayer": "2.2.4",
+    "com.unity.test-framework": "1.8.0",
+    "com.unity.timeline": "6.6.0",
+    "com.unity.transport": "6.6.0",
+    "com.unity.ugui": "2.6.0",
+    "com.unity.visualscripting": "1.9.11",
+    "com.unity.xr.legacyinputhelpers": "3.0.1",
     "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.adaptiveperformance": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -34,10 +34,13 @@
     "com.unity.modules.particlesystem": "1.0.0",
     "com.unity.modules.physics": "1.0.0",
     "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.physicscore2d": "1.0.0",
     "com.unity.modules.screencapture": "1.0.0",
     "com.unity.modules.terrain": "1.0.0",
     "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tetgen": "1.0.0",
     "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.timelinefoundation": "1.0.0",
     "com.unity.modules.ui": "1.0.0",
     "com.unity.modules.uielements": "1.0.0",
     "com.unity.modules.umbra": "1.0.0",
@@ -47,9 +50,9 @@
     "com.unity.modules.unitywebrequestaudio": "1.0.0",
     "com.unity.modules.unitywebrequesttexture": "1.0.0",
     "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vectorgraphics": "1.0.0",
     "com.unity.modules.vehicles": "1.0.0",
     "com.unity.modules.video": "1.0.0",
-    "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
   }

Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset

@@ -18,23 +18,27 @@ MonoBehaviour:
   m_SeeAllPackageVersions: 0
   m_DismissPreviewPackagesInUse: 0
   oneTimeWarningShown: 0
-  oneTimeDeprecatedPopUpShown: 0
-  m_Registries:
-  - m_Id: main
+  oneTimePackageErrorsPopUpShown: 0
+  m_MainRegistry:
+    m_Id: main
     m_Name: 
     m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
+    m_IsUnityRegistry: 1
     m_Capabilities: 7
     m_ConfigSource: 0
     m_Compliance:
       m_Status: 0
       m_Violations: []
+  m_ScopedRegistries: []
   m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -924
-    m_OriginalInstanceId: -926
+    m_UserModificationsEntityId:
+      m_rawData: 1099511629078
+    m_OriginalEntityId:
+      m_rawData: 1099511629079
   m_LoadAssets: 0

Examples/CharacterControllerMovingBodies/ProjectSettings/PhysicsCoreProjectSettings2D.asset

@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!176606843 &1
+PhysicsCoreProjectSettings2D:
+  m_ObjectHideFlags: 0
+  m_PhysicsCoreSettings: {fileID: 0}