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

Author: jabbacakes

.github/pull_request_template.md

@@ -56,6 +56,12 @@ _Does the change require QA team to:_
 
 If any boxes above are checked the QA team will be automatically added as a PR reviewer.
 
+## Up-port
+[//]: # (
+This section is REQUIRED and should link to the PR that targets develop-3.0.0 branch. Assuming that the PR lands agains default develop-2.0.0 branch
+If this is not needed, for example feature specific to NGOv2.X, then just mention this fact.
+)
+
 ## Backports
 [//]: # (
 This section is REQUIRED and should link to the PR that targets other NGO version which is either develop or develop-2.0.0 branch

.github/renovate.json5

@@ -1,5 +1,5 @@
 {
-  "baseBranches": ["develop", "develop-2.0.0", "develop-3.x.x"],
+  "baseBranches": ["develop-2.0.0", "develop-3.x.x"],
   "dependencyDashboard": true,
 
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
@@ -27,10 +27,12 @@
         "unity-upm-package"
       ],
       "enabled": "true",
-      "schedule": [
-        "every weekend"
-      ],
+      "schedule": ["every weekend"],
       "rollbackPrs": false,
+    },
+    {
+      "groupName": "CI deps updates",
+      "matchPackagePatterns": ["^RecipeEngine", "actions/checkout", "package-ci/ubuntu-22.04"]
     }
   ],
 }

.github/workflows/pr-description-validation.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Check PR description
         uses: actions/github-script@v9
@@ -52,6 +52,10 @@ jobs:
                 header: '## Backports',
                 description: 'PR description must include a "## Backports" section. Please add this section and provide information about this PR backport to develop, develop-2.0.0 or develop-3.x.x branch respectively or explain why backport is not needed.'
               },
+              {
+                header: '## Up-port',
+                description: 'PR description must include a "## Up-port" section. Please add this section and provide information about this PR up-port to develop-3.0.0 branch or explain why up-port is not needed.'
+              },
               {
                 header: '## Testing & QA',
                 description: 'PR description must include a "## Testing & QA" section. Please add this section and provide information about the testing performed for this PR. It can range from adding unit tests to full samples and is needed from QA side to analyze PRs while Playtesting for the release.'

.github/workflows/pr-supervisor.yaml

@@ -26,8 +26,7 @@ jobs:
     timeout-minutes: 720
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
-
+        uses: actions/checkout@v7
       - name: Wait and Verify Yamato Job Status
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}

.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.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     # 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.default -%}
+{% for editor in validation_editors.standards -%}
     - .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.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     - .yamato/package-pack.yml#package_pack_-_ngo_win
   triggers:
     expression: |-
@@ -90,6 +90,8 @@ pr_code_changes_checks:
     # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
     - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }}
     - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }}
+    # Run code coverage test
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}
   triggers:
     expression: |-
       (pull_request.comment eq "ngo" OR
@@ -130,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.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     # 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
@@ -159,6 +161,8 @@ develop_nightly:
     - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_6000.0
     # Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
     - .yamato/vetting-test.yml#vetting_test
+  # Run code coverage test
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}
 
 
 # Run all tests on weekly bases
@@ -189,5 +193,3 @@ develop_weekly_trunk:
     - .yamato/_run-all.yml#run_all_webgl_builds
     # Run Runtime tests against CMB service
     - .yamato/_run-all.yml#run_all_project_tests_cmb_service
-    # Run code coverage test
-    - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}

.yamato/code-coverage.yml

@@ -39,7 +39,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
   commands:
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
     - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
-    - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv2_{{ platform.name }}_{{ editor }};flags:NGOv2_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={{ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results
+    - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage --coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv2_{{ platform.name }}_{{ editor }};flags:NGOv2_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={{ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results
   artifacts:
     logs:
       paths:

.yamato/project-standards.yml

@@ -30,7 +30,7 @@
 
 {% for project in projects.all -%}
 {% for platform in test_platforms.default -%}
-{% for editor in validation_editors.default -%}
+{% for editor in validation_editors.standards -%}
 standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
   name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
@@ -48,8 +48,7 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
     - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
     - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
-    - git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
-    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
+    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes. Note that dotnet version that was used in this check depends on the image that was used so local results may differ (see the first command of this job to know which dotnet version was used)" && exit 1)' # Fail if formatter made any changes
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

.yamato/project.metafile

@@ -24,7 +24,7 @@
 small_agent_platform:
     - name: ubuntu
       type: Unity::VM
-      image: package-ci/ubuntu-22.04:v4.85.0
+      image: package-ci/ubuntu-22.04:v4.87.0
       flavor: b1.small
 
 
@@ -39,13 +39,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.85.0
+          image: package-ci/ubuntu-22.04:v4.87.0
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.85.0
+          image: package-ci/ubuntu-22.04:v4.87.0
           flavor: b1.large
           smaller_flavor: b1.large
           larger_flavor: b1.xlarge
@@ -117,12 +117,17 @@ test_platforms:
         #  flavor: b1.large
         #  larger_flavor: b1.xlarge
         #  standalone: PS5
-        - name: switch
-          type: Unity::VM
-          image: package-ci/win10-switch:v4
-          flavor: b1.large
-          larger_flavor: b1.xlarge
-          standalone: Switch
+        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118
+        #   The NintendoSDK on the win10-switch:v4 Bokken image is incomplete for the SDK
+        #   version the newer editor Playback Engines require: 18_3_0 is missing the
+        #   nintendo-switch-support lib the new toolchain links against, and 21_4_3 is missing the
+        #   Tools\Graphics\NvnTools (GraphicsConverter) libraries needed to package textures.
+        #   Neither is fixable from .yamato; re-enable once Package CI ships a complete SDK on the image.
+        #   type: Unity::VM
+        #   image: package-ci/win10-switch:v4
+        #   flavor: b1.large
+        #   larger_flavor: b1.xlarge
+        #   standalone: Switch
         - name: GameCoreXboxOne
           type: Unity::VM
           image: package-ci/win10-xbox:v4
@@ -148,13 +153,13 @@ test_platforms:
         #  flavor: b1.large
         #  larger_flavor: b1.xlarge
         #  standalone: PS5
-        - name: switch
-          type: Unity::console::switch
-          image: package-ci/win10-switch:v4
-          flavor: b1.large
-          larger_flavor: b1.xlarge
-          standalone: Switch
-          base: win
+        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118 (incomplete NintendoSDK on win10-switch:v4 image)
+        #   type: Unity::console::switch
+        #   image: package-ci/win10-switch:v4
+        #   flavor: b1.large
+        #   larger_flavor: b1.xlarge
+        #   standalone: Switch
+        #   base: win
         - name: GameCoreXboxOne
           type: Unity::console::xbox
           image: package-ci/win10-xbox:v4
@@ -171,19 +176,22 @@ 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
     all:
         - 6000.3
-        - 6000.4
         - 6000.5
+        - 6000.6
         - trunk
-        - f1298548e194f35ff7dfa6fee699d4464ab3919c
+        - 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
     minimal:
         - 6000.0
-pinnedTrunk:  f1298548e194f35ff7dfa6fee699d4464ab3919c
+    standards:
+        - 6000.3.21f1
+pinnedTrunk:  5fe7931aab8c4fff9274e15ef0800125c68b8d6a
 
 
 # Scripting backends used by Standalone RunTimeTests---------------------------------------------------

.yamato/wrench/api-validation-jobs.yml

@@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.9.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.2.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.9.0.0
+    Wrench: 3.2.1.0