Merge branch 'develop-2.0.0' into chore/merge-develop-2-13-1-develop-3-x-x

Author: NoelStephensUnity

.yamato/_triggers.yml

@@ -159,6 +159,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 +191,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.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.86.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.86.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.86.0
           flavor: b1.large
           smaller_flavor: b1.large
           larger_flavor: b1.xlarge
@@ -177,8 +177,8 @@ validation_editors:
         - 6000.3
     all:
         - 6000.3
-        - 6000.4
         - 6000.5
+        - 6000.6
         - trunk
         - f1298548e194f35ff7dfa6fee699d4464ab3919c
     minimal:

.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.0.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.9.0.0
+    Wrench: 3.2.0.0
 

.yamato/wrench/package-pack-jobs.yml

@@ -29,5 +29,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.9.0.0
+    Wrench: 3.2.0.0