diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 419cea02e5..3df89ece65 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -17,71 +17,25 @@ run_quick_checks: name: Run Quick Initial Checks dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }} + - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editor }} -# Runs all package tests -run_all_package_tests: - name: Run All Package Tests +# Runs all package tests on supported editor +run_all_package_tests_{{ validation_editor }}: + name: Run All Package Tests [{{ validation_editor }} only] dependencies: {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }} -{% endfor -%} -{% endfor -%} - - -# Runs all package tests on default editor (latest supported editor) -run_all_package_tests_{{ validation_editors.default }}: - name: Run All Package Tests [{{ validation_editors.default }} only] - dependencies: -{% for platform in test_platforms.desktop -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_{{ platform.name }} + - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editor }}_{{ platform.name }} {% endfor -%} -# Runs all package tests on minimal supported editor -run_all_package_tests_{{ validation_editors.minimal }}: - name: Run All Package Tests [{{ validation_editors.minimal }}] - dependencies: -{% for platform in test_platforms.desktop -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_{{ platform.name }} -{% endfor -%} - -# Runs all projects tests -run_all_project_tests: - name: Run All Project Tests +# Runs all projects tests on supported editor +run_all_project_tests_{{ validation_editor }}: + name: Run All Project Tests [{{ validation_editor }} only] dependencies: {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} -{% endfor -%} -{% endif -%} -{% endfor -%} - - -# Runs all projects tests on default editor (latest supported editor) -run_all_project_tests_{{ validation_editors.default }}: - name: Run All Project Tests [{{ validation_editors.default }} only] - dependencies: -{% for project in projects.all -%} -{% if project.has_tests == "true" -%} -{% for platform in test_platforms.desktop -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} -{% endfor -%} -{% endif -%} -{% endfor -%} - -# Runs all projects tests on minimal supported editor -run_all_project_tests_{{ validation_editors.minimal }}: - name: Run All Project Tests [{{ validation_editors.minimal }}] - dependencies: -{% for project in projects.all -%} -{% if project.has_tests == "true" -%} -{% for platform in test_platforms.desktop -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endif -%} {% endfor -%} @@ -93,147 +47,49 @@ run_all_projects_standards: dependencies: {% for platform in test_platforms.default -%} {% for project in projects.all -%} - - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ validation_editors.default }} -{% endfor -%} -{% endfor -%} - - -# Runs all WebGL builds -run_all_webgl_builds: - name: Run All WebGl Build - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} -{% endfor -%} -{% endfor -%} - - -# Runs all WebGL builds on default editor (latest supported editor) -run_all_webgl_builds_{{ validation_editors.default }}: - name: Run All WebGl Build [{{ validation_editors.default }} only] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.desktop -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} -{% endfor -%} -{% endfor -%} - -# Runs all WebGL builds on minimal supported editor -run_all_webgl_builds_{{ validation_editors.minimal }}: - name: Run All WebGl Build [{{ validation_editors.minimal }}] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.desktop -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} + - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} - -# Runs all Desktop tests -run_all_project_tests_desktop_standalone: - name: Run All Standalone Tests - Desktop +# Runs all WebGL builds on supported editor +run_all_webgl_builds_{{ validation_editor }}: + name: Run All WebGl Build [{{ validation_editor }} only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} -{% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} -{% endfor -%} -{% endfor -%} - -# Runs all Desktop tests on default editor (latest supported editor) -run_all_project_tests_desktop_standalone_{{ validation_editors.default }}: - name: Run All Standalone Tests - Desktop [{{ validation_editors.default }} only] +# Runs all Desktop tests on supported editor +run_all_project_tests_desktop_standalone_{{ validation_editor }}: + name: Run All Standalone Tests - Desktop [{{ validation_editor }} only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} {% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.default }} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editor }} {% endfor -%} {% endfor -%} {% endfor -%} -# Runs all Desktop tests on minimal supported editor -run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }}: - name: Run All Standalone Tests - Desktop [{{ validation_editors.minimal }}] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.desktop -%} -{% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.minimal }} -{% endfor -%} -{% endfor -%} -{% endfor -%} - -# Runs all Mobile tests -run_all_project_tests_mobile_standalone: - name: Run All Standalone Tests - Mobile +# Runs all Mobile tests on supported editor +run_all_project_tests_mobile_standalone_{{ validation_editor }}: + name: Run All Standalone Tests - Mobile [{{ validation_editor }} only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} -{% for editor in validation_editors.all -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} - -# Runs all Mobile tests on default editor (latest supported editor) -run_all_project_tests_mobile_standalone_{{ validation_editors.default }}: - name: Run All Standalone Tests - Mobile [{{ validation_editors.default }} only] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.mobile_test -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} -{% endfor -%} -{% endfor -%} - -# Runs all Mobile tests on minimal supported editor -run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }}: - name: Run All Standalone Tests - Mobile [{{ validation_editors.minimal }}] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.mobile_test -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} -{% endfor -%} -{% endfor -%} - - -# Runs all Console tests -run_all_project_tests_console_standalone: - name: Run All Standalone Tests - Console - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.all -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} -{% endfor -%} -{% endfor -%} - - -# Runs all Console tests on default editor (latest supported editor) -run_all_project_tests_console_standalone_{{ validation_editors.default }}: - name: Run All Standalone Tests - Console [{{ validation_editors.default }} only] +# Runs all Console tests on supported editor +run_all_project_tests_console_standalone_{{ validation_editor }}: + name: Run All Standalone Tests - Console [{{ validation_editor }} only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} -# Runs all Console tests on minimal supported editor -run_all_project_tests_console_standalone_{{ validation_editors.minimal }}: - name: Run All Standalone Tests - Console [{{ validation_editors.minimal }}] - dependencies: -{% for project in projects.default -%} -{% for platform in test_platforms.console_test -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} -{% endfor -%} -{% endfor -%} diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 7867fb2e5a..bc9494cae6 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -2,36 +2,31 @@ --- # DESCRIPTION-------------------------------------------------------------------------- - # This configuration defines three main CI trigger patterns: + # This configuration defines the CI trigger patterns: # 1. Pull Request Validation: Validation performed on PR basis # - we have mandatory minimal checks that run on all PRs (even if only docs are changed) # - we have more extensive pr_code_changes_checks that run if code is changed - # 2. Nightly Development: Test set run nightly (validates most important test cases) - # 3. Weekly Full Validation: Test set run weekly (validates all test cases to prevent any surprises) + # 2. develop_nightly / develop_weekly: kept as manually-runnable jobs but NO automatic recurring triggers + # due to the fact that this branch is basically unsupported so this would be a waste of resources # Each pattern represents different balance between validation depth, execution time and CI resource usage # TRIGGER PATTERNS------------------------------------------------------------------- # Pull Request: # We have two PR triggers: # 1) Minimal PR checks that run on all PRs (even if only docs are changed) - # 2) More extensive pr_code_changes_checks that run if code is changed. This test validates Standards, Package tests, Project tests and Desktop standalone tests to ensure that main platforms are covered + # 2) More extensive pr_code_changes_checks that run if code is changed. + # Includes the full suite that previously ran nightly: Standards, APV, Package tests, Project tests, + # Desktop/Mobile/Console standalone tests, WebGL builds, and updated-dependencies checks. + # Only {{ validation_editor }} is tested as this is the only supported editor. # By default pr_minimal_required_checks it's triggered if # 1) PR targets develop, develop-2.0.0 or release branches # 2) PR is not a draft # Then pr_code_changes_checks it's triggered if the same conditions apply plus: # 1) PR changes code in com.unity.netcode.gameobjects package (Editor, Runtime or Tests folders) or in testproject folder or package.json file - # Nightly: - # This test validates same subset as pull_request_trigger with addition of mobile/console tests and webgl builds - # Runs daily on develop (local configuration) - # Includes all test types but only on {{ validation_editors.default }} (latest supported editor). - # Adds platform-specific and APV validation - - # Weekly: - # This test validates same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project - # Runs across all supported editor versions - # Includes code coverage analysis - # Validates all projects and standards + # Nightly / Weekly (NO automatic trigger — run manually only): + # These jobs still exist so they can be triggered on demand in Yamato, but recurring schedules have been removed. + # Rationale: low landing frequency makes automated nightly/weekly runs wasteful. # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs configurations are generated by ensuring that all dependencies are successful. @@ -49,7 +44,7 @@ pr_minimal_required_checks: name: Minimal PR checks dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }} + - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editor }} triggers: expression: |- (pull_request.comment eq "ngo" OR @@ -67,26 +62,28 @@ pr_minimal_required_checks: # Since standards job is a part of initial checks it's not present as direct dependency here!!!!!!!!!!!!!!!!!!!! pr_code_changes_checks: name: Code changes PR checks - # Run the following tests on a selection of different desktop platforms + # Run the full nightly suite on every code-change PR (only {{ validation_editor }} since 2022.3 support was dropped) dependencies: # 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 package EditMode and Playmode package tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor - - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_mac - - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_win - - # Run testproject EditMode and Playmode project tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor - - .yamato/project-tests.yml#test_testproject_win_{{ validation_editors.default }} - - .yamato/project-tests.yml#test_testproject_mac_{{ validation_editors.minimal }} - - # Run tools integration tests EditMode and Playmode tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor - - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_{{ validation_editors.minimal }} - - .yamato/project-tests.yml#test_testproject-tools-integration_win_{{ validation_editors.default }} - - # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon - # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ validation_editors.minimal }} + # Run project standards to verify package/default project + - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editor }} + # 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 all desktop platforms on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_package_tests_{{ validation_editor }} + # Run project EditMode and Playmode tests on all desktop platforms on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_project_tests_{{ validation_editor }} + # Run Runtime tests on desktop players on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editor }} + # Run Runtime tests on mobile players on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editor }} + # Run Runtime tests on console players on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editor }} + # Build player for WebGL platform on {{ validation_editor }} (latest supported editor) + - .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editor }} + # Run updated-dependencies test to catch regressions introduced by upstream package updates + - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_{{ validation_editor }} triggers: expression: |- (pull_request.comment eq "ngo" OR @@ -107,78 +104,3 @@ pr_code_changes_checks: "**/*.md" ] cancel_old_ci: true - - -# Run all tests on {{ validation_editors.default }} (latest supported editor) on nightly basis. -# Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds -# Those tests are all running on {{ validation_editors.default }} (latest supported editor) since it's daily and running all of them would add a lot of overhead -develop_nightly: - name: "\U0001F319 [Nightly] Run All Tests [{{ validation_editors.default }} and {{ validation_editors.minimal }}]" - triggers: - recurring: - - branch: develop - frequency: daily - rerun: always - dependencies: - # 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 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.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 {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.minimal }} - # Run project EditMode and PLaymode tests on desktop platforms on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.minimal }} - # Run Runtime tests on desktop players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }} - # Run Runtime tests on mobile players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }} - # Run Runtime tests on console players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.minimal }} - # Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.default }} - - .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.minimal }} - # Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }} - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_{{ validation_editors.default }} - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_{{ validation_editors.minimal }} - # 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 all tests on weekly bases -# Same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project -# It's not running wrench jobs since those will run either way in nightly test run -# This in contrast to nightly checks will run tests on all editors (not only {{ validation_editors.default }}). Running those on weekly basis and {{ validation_editors.default }} (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests -develop_weekly_trunk: - name: "\U0001F319 [Weekly] Run All Tests" - triggers: - recurring: - - branch: develop - frequency: weekly - rerun: always - dependencies: - # 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 project standards to verify package/default project - - .yamato/_run-all.yml#run_all_projects_standards - # Run package EditMode and Playmode tests on desktop platforms - - .yamato/_run-all.yml#run_all_package_tests - # Run project EditMode and PLaymode tests on desktop platforms - - .yamato/_run-all.yml#run_all_project_tests - # Run Runtime tests on desktop players - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone - # Run Runtime tests on mobile players - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone - # Run Runtime tests on console players - - .yamato/_run-all.yml#run_all_project_tests_console_standalone - # Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) - - .yamato/_run-all.yml#run_all_webgl_builds - # Run code coverage test - - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }} diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index a33abd13e4..b18aa86741 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -12,7 +12,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops through: # 1. For default platform only (Ubuntu) since coverage would not vary between platforms (no need for checks on more platforms) - # 2. For default editor version ({{ validation_editors.default }}) since coverage would not vary between editors (no need for checks on more editors) + # 2. For default editor version ({{ validation_editor }}) since coverage would not vary between editors (no need for checks on more editors) #TECHNICAL CONSIDERATIONS--------------------------------------------------------------- # In theory this job also runs package tests, but we don't want to use it as default since is heavier (because of added coverage analysis) and coverage is not changing that often @@ -25,9 +25,8 @@ {% for platform in test_platforms.default -%} -{% for editor in validation_editors.default -%} -code_coverage_{{ platform.name }}_{{ editor }}: - name: Code Coverage - NGO [{{ platform.name }}, {{ editor }}] +code_coverage_{{ platform.name }}_{{ validation_editor }}: + name: Code Coverage - NGO [{{ platform.name }}, {{ validation_editor }}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -36,9 +35,9 @@ code_coverage_{{ platform.name }}_{{ editor }}: model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models + - unity-downloader-cli --fast --wait -u {{ validation_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:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ 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:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ 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 --artifacts-path=test-results artifacts: logs: paths: @@ -46,4 +45,3 @@ code_coverage_{{ platform.name }}_{{ editor }}: dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} -{% endfor -%} diff --git a/.yamato/console-standalone-test.yml b/.yamato/console-standalone-test.yml index 31f858fe07..511a3e66d6 100644 --- a/.yamato/console-standalone-test.yml +++ b/.yamato/console-standalone-test.yml @@ -39,9 +39,8 @@ # BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.console_build -%} -{% for editor in validation_editors.all -%} -console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name: Build {{ project.name }} - [{{ platform.name }}, {{ editor }}, il2cpp{% if platform.name == "switch" %}, arm64{% endif %}] +console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name: Build {{ project.name }} - [{{ platform.name }}, {{ validation_editor }}, il2cpp{% if platform.name == "switch" %}, arm64{% endif %}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -50,7 +49,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }} + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor -c il2cpp -c {{ platform.name }} - UnifiedTestRunner --testproject={{ project.path }} --architecture={% if platform.name == "switch" %}arm64{% else %}x64{% endif %} --scripting-backend=il2cpp --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --artifacts-path=artifacts --player-save-path=build/players --testfilter="Unity.Netcode.RuntimeTests.*" --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout}} variables: # PS4 related @@ -71,16 +70,14 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - "artifacts/**/*" {% endfor -%} {% endfor -%} -{% endfor -%} # RUN PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.all -%} -console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ editor }}, il2cpp] +console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ validation_editor }}, il2cpp] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -89,8 +86,8 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }} - - UnifiedTestRunner --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800 + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor -c il2cpp -c {{ platform.name }} + - UnifiedTestRunner --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library --timeout=1800 variables: # PS4 related SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00' @@ -106,7 +103,6 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: paths: - "test-results/**/*" dependencies: - - .yamato/console-standalone-test.yml#console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/console-standalone-test.yml#console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml index 6114fbff59..5ba05a9dfd 100644 --- a/.yamato/desktop-standalone-tests.yml +++ b/.yamato/desktop-standalone-tests.yml @@ -31,10 +31,9 @@ # BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} {% for backend in scripting_backends -%} -desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}: - name : Standalone Build - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}] +desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editor }}: + name : Standalone Build - NGO {{ project.name }} - [{{ platform.name }}, {{ validation_editor }}, {{ backend }}] agent: type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %} image: {{ platform.image }} @@ -43,7 +42,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --scripting-backend={{ backend }} --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --artifacts-path=artifacts --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800 artifacts: players: @@ -58,7 +57,6 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ {% endfor -%} {% endfor -%} {% endfor -%} -{% endfor -%} @@ -66,10 +64,9 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ # RUN PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} {% for backend in scripting_backends -%} -desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}: - name : Standalone Test - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}] +desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editor }}: + name : Standalone Test - NGO {{ project.name }} - [{{ platform.name }}, {{ validation_editor }}, {{ backend }}] agent: type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %} image: {{ platform.image }} @@ -78,15 +75,14 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} - - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }} + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} + - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library --timeout={{ test_timeout }} artifacts: logs: paths: - "test-results/**/*" dependencies: - - .yamato/desktop-standalone-tests.yml#desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} -{% endfor -%} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editor }} {% endfor -%} {% endfor -%} {% endfor -%} diff --git a/.yamato/mobile-standalone-test.yml b/.yamato/mobile-standalone-test.yml index e5d9f8bcf2..5c29e75dda 100644 --- a/.yamato/mobile-standalone-test.yml +++ b/.yamato/mobile-standalone-test.yml @@ -38,9 +38,8 @@ # BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.mobile_build -%} -{% for editor in validation_editors.all -%} -mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name: Build {{ project.name }} - [{{ platform.name }}, {{ editor }}, il2cpp] +mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name: Build {{ project.name }} - [{{ platform.name }}, {{ validation_editor }}, il2cpp] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -54,7 +53,7 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: variables: UNITY_HANDLEUIINTERRUPTIONS: 1 commands: - - unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --wait + - unity-downloader-cli -u {{ validation_editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --wait - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout }} artifacts: players: @@ -65,15 +64,13 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - "artifacts/**/*" {% endfor -%} {% endfor -%} -{% endfor -%} # RUN PHASE CONFIGURATION------------------------------------------------------------------------------------ {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} -{% for editor in validation_editors.all -%} -mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ editor }}, il2cpp] +mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ validation_editor }}, il2cpp] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -83,7 +80,7 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: {% endif %} commands: # Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} {% if platform.standalone == "Android" %} # Download standalone UnityTestRunner and ADB setup @@ -108,7 +105,6 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}: paths: - "test-results/**/*" dependencies: - - .yamato/mobile-standalone-test.yml#mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/mobile-standalone-test.yml#mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }} {% endfor -%} {% endfor -%} diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml index f41c0d1f6e..b9f4790b5d 100644 --- a/.yamato/package-tests.yml +++ b/.yamato/package-tests.yml @@ -25,9 +25,8 @@ #------------------------------------------------------------------------------------ {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} -package_test_-_ngo_{{ editor }}_{{ platform.name }}: - name : Package Test - NGO [{{ platform.name }}, {{ editor }}] +package_test_-_ngo_{{ validation_editor }}_{{ platform.name }}: + name : Package Test - NGO [{{ platform.name }}, {{ validation_editor }}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -39,7 +38,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: XRAY_PROFILE: "supported ./pvpExceptions.json" UNITY_EXT_LOGGING: 1 commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. # Validate PVP checks for package. - upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --results pvp-results @@ -47,7 +46,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: # Run UTR to test packages. - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor - - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --artifacts-path=test-results "--ff={ops.upmpvpevidence.enable=true}" --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }} + - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --artifacts-path=test-results "--ff={ops.upmpvpevidence.enable=true}" --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library --timeout={{ test_timeout }} artifacts: logs: paths: @@ -57,4 +56,3 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} -{% endfor -%} diff --git a/.yamato/performance-tests.yml b/.yamato/performance-tests.yml index 63644f97b9..fbe8716c59 100644 --- a/.yamato/performance-tests.yml +++ b/.yamato/performance-tests.yml @@ -23,10 +23,9 @@ #------------------------------------------------------------------------------------ {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} {% for project in projects.default -%} -performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reporting: - name : Performance editor Tests - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] (No Data Reporting) +performance_editor_tests_-_NGO_{{ platform.name }}_{{ validation_editor }}_no_data_reporting: + name : Performance editor Tests - NGO {{ project.name }} [{{ platform.name }}, {{ validation_editor }}] (No Data Reporting) agent: type: {{ platform.type }} image: {{ platform.image }} @@ -35,8 +34,8 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli -u {{ editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor - - UnifiedTestRunner --suite=editor --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --timeout=3600 --artifacts-path=artifacts --extra-editor-arg=-assemblyNames --extra-editor-arg=Unity.NetCode.* --extra-editor-arg=-testCategory --extra-editor-arg=Performance --extra-editor-arg=-enablePackageManagerTraces --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --dontreportperformancedata + - unity-downloader-cli -u {{ validation_editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor + - UnifiedTestRunner --suite=editor --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --timeout=3600 --artifacts-path=artifacts --extra-editor-arg=-assemblyNames --extra-editor-arg=Unity.NetCode.* --extra-editor-arg=-testCategory --extra-editor-arg=Performance --extra-editor-arg=-enablePackageManagerTraces --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library --dontreportperformancedata # TODO: when performance tests will be present we need to add actuall execution of this test artifacts: logs: @@ -44,4 +43,3 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin - "artifacts/**/*" {% endfor -%} {% endfor -%} -{% endfor -%} diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index 3dfcb2b46e..e1f28beeac 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -13,7 +13,7 @@ # Jobs configurations are generated using nested loops through: # 1. For all NGO projects (testproject, testproject-tools-interation, minimalproject) # 2. For default platform only (Ubuntu) since standards would not vary between platforms (no need for checks on more platforms) - # 3. For default editor version {{ validation_editors.default }} since standards would not vary between editors (no need for checks on more editors) + # 3. For default editor version {{ validation_editor }} since standards would not vary between editors (no need for checks on more editors) # TECHNICAL CONSTRAINTS--------------------------------------------------------------- # Requires .NET SDK installed (should be preinstalled on the image so we just check for version) @@ -29,9 +29,8 @@ {% for project in projects.all -%} {% for platform in test_platforms.default -%} -{% for editor in validation_editors.all -%} -standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: - name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] +standards_{{ platform.name }}_{{ project.name }}_{{ validation_editor }}: + name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ validation_editor }}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -44,11 +43,10 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: - dotnet --version - dotnet format --version - - 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 + - unity-downloader-cli --fast --wait -u {{ validation_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 {% endfor -%} -{% endfor -%} {% endfor -%} \ No newline at end of file diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index 49b4d1467a..216c135418 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -27,9 +27,8 @@ {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} -test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name : Project Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] +test_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name : Project Test - NGO {{ project.name }} [{{ platform.name }}, {{ validation_editor }}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -39,7 +38,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: {% endif %} commands: - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor for tests execution - - UnifiedTestRunner --testproject={{ project.path }} --suite=editor --suite=playmode --artifacts-path=test-results --editor-location=.Editor --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }} + - UnifiedTestRunner --testproject={{ project.path }} --suite=editor --suite=playmode --artifacts-path=test-results --editor-location=.Editor --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library --timeout={{ test_timeout }} artifacts: logs: paths: @@ -48,6 +47,5 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} -{% endfor -%} {% endif -%} {% endfor -%} diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml index d8b09ff3a0..22c4a12127 100644 --- a/.yamato/project-updated-dependencies-test.yml +++ b/.yamato/project-updated-dependencies-test.yml @@ -22,11 +22,10 @@ #-------------------------------------------------------------------------------------- -{% for project in projects.all -%} +{% for project in projects.all -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} -updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}: - name : Updated Dependencies Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] +updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ validation_editor }}: + name : Updated Dependencies Test - NGO {{ project.name }} [{{ platform.name }}, {{ validation_editor }}] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -45,7 +44,6 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}: - .yamato/project-updated-dependencies-test.yml#project_pack_-_{{ project.name }}_{{ platform.name }} {% endfor -%} {% endfor -%} -{% endfor -%} # TODO: This job was removed on PR-3711 but the above job somehow can find proper artifacts with package pack job. diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 8314f339a8..b8862713c9 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -23,7 +23,7 @@ small_agent_platform: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.83.0 + image: package-ci/ubuntu-22.04:v4.85.0 flavor: b1.small @@ -38,13 +38,13 @@ test_platforms: default: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.83.0 + image: package-ci/ubuntu-22.04:v4.85.0 flavor: b1.large standalone: StandaloneLinux64 desktop: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.83.0 + image: package-ci/ubuntu-22.04:v4.85.0 flavor: b1.large smaller_flavor: b1.medium standalone: StandaloneLinux64 @@ -154,14 +154,8 @@ test_platforms: # Editors to be used for testing. NGOv1.X official support started from 2021.3 editor # TODO: When a new editor will be released it should be added to this list. Correct also if we will stop supporting one of the editors present here -validation_editors: - default: - - 6000.0 - all: - - 2022.3 - - 6000.0 - minimal: - - 2022.3 +validation_editor: + - 6000.0 # Scripting backends used by Standalone RunTimeTests--------------------------------------------------- diff --git a/.yamato/vetting-test.yml b/.yamato/vetting-test.yml index 5d26deb39e..a04a0529a0 100644 --- a/.yamato/vetting-test.yml +++ b/.yamato/vetting-test.yml @@ -5,13 +5,12 @@ # If this test fails with new API error we should either make those API internal OR bump package version to new minor (note that the package version reflects the current package state) # Note that we are packing the package only (no project context) so if package have any soft dependencies then project should be used to test it (to enable those APIs) -{% for editor in validation_editors.minimal -%} vetting_test: - name: NGO - Vetting Test (Win, {{editor}} LTS) + name: NGO - Vetting Test (Win, {{validation_editor}} LTS) agent: { type: Unity::VM, flavor: b1.medium, image: package-ci/win11:v4 } commands: - npm install -g "upm-ci-utils@stable" --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --fast --wait --unity-version {{ editor }} --components editor --arch x64 + - unity-downloader-cli --fast --wait --unity-version {{ validation_editor }} --components editor --arch x64 - upm-ci package pack --package-path com.unity.netcode.gameobjects - upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --type vetting-tests artifacts: @@ -21,4 +20,3 @@ vetting_test: - test-results/** - upm-ci~/test-results/** - upm-ci~/upm-ci.log -{% endfor -%} diff --git a/.yamato/webgl-build.yml b/.yamato/webgl-build.yml index d258fa61a1..9b47e4b3d0 100644 --- a/.yamato/webgl-build.yml +++ b/.yamato/webgl-build.yml @@ -23,11 +23,10 @@ #-------------------------------------------------------------------------------------- -{% for project in projects.default -%} +{% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.all -%} -webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp] +webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editor }}: + name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ validation_editor }}, il2cpp] agent: type: {{ platform.type }} image: {{ platform.image }} @@ -36,7 +35,7 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) {% endif %} commands: - - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components + - unity-downloader-cli --fast --wait -u {{ validation_editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components # The following step builds the player with defined options such as: # Suite parameter if defined since it's a mandatory field to define which test suite should be used, but it doesn't matter in this case since we won't run any tests (--suite) @@ -52,4 +51,3 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}: - "build/players/**/*" {% endfor -%} {% endfor -%} -{% endfor -%} diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 944e70f3d0..000ac0d09e 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 3994a564c2..06c750a127 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.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.7.0.0 + Wrench: 2.9.0.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index fac9a9832b..a3d5d86552 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -18,7 +18,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS). preview_apv_-_2022_3_-_macos13: @@ -73,10 +73,10 @@ preview_apv_-_2022_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). preview_apv_-_2022_3_-_ubuntu1804: @@ -131,10 +131,10 @@ preview_apv_-_2022_3_-_ubuntu1804: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Windows). preview_apv_-_2022_3_-_win10: @@ -190,10 +190,10 @@ preview_apv_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -248,10 +248,10 @@ preview_apv_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -306,10 +306,10 @@ preview_apv_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -365,8 +365,8 @@ preview_apv_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 6fa8beca51..a60c8d8f29 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -93,10 +93,10 @@ publish_dry_run_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -185,8 +185,9 @@ publish_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 + allow_on: branch match "^release/.*" metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 1550408dd2..b9eba06e54 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 7f28c2d3a0..be9669ab2a 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -69,10 +69,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects @@ -139,10 +139,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects @@ -209,10 +209,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects @@ -279,10 +279,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects @@ -349,10 +349,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects @@ -419,10 +419,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.7.0.0 + UPMPVP_CONTEXT_WRENCH: 2.9.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.7.0.0 + Wrench: 2.9.0.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 40663cff14..6ca1da5073 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -39,7 +39,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "2.7.0.0", + "wrench_version": "2.9.0.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/NGO.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj index aa420f1382..452a22131a 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -12,7 +12,7 @@ - + diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index 8f3466f327..a93be64439 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -12,7 +12,8 @@ Additional documentation and release notes are available at [Multiplayer Documen ### Changed - +- Minimal supported editor was updated to 6000.0 as 2022.3 is now out of support +- Updated transport dependency to latest 2.7.2 ### Deprecated diff --git a/com.unity.netcode.gameobjects/ValidationExceptions.json b/com.unity.netcode.gameobjects/ValidationExceptions.json index 1b4355043a..ded1d60b94 100644 --- a/com.unity.netcode.gameobjects/ValidationExceptions.json +++ b/com.unity.netcode.gameobjects/ValidationExceptions.json @@ -1,10 +1,4 @@ { - "ErrorExceptions": [ - { - "ValidationTest": "API Validation", - "ExceptionMessage": "Breaking changes require a new major version.", - "PackageVersion": "1.15.2" - } - ], + "ErrorExceptions": [], "WarningExceptions": [] } diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index a91a2e21fd..4370ff0a2f 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -2,11 +2,11 @@ "name": "com.unity.netcode.gameobjects", "displayName": "Netcode for GameObjects", "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.", - "version": "1.15.2", - "unity": "2022.3", + "version": "1.16.0", + "unity": "6000.0", "dependencies": { "com.unity.nuget.mono-cecil": "1.11.6", - "com.unity.transport": "1.5.0" + "com.unity.transport": "2.7.2" }, "samples": [ { diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index 74506eef18..9699201700 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -1,10 +1,12 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.ide.rider": "3.0.37", - "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects" + "com.unity.ide.rider": "3.0.39", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", + "com.unity.modules.accessibility": "1.0.0" }, - "testables": [ - "com.unity.netcode.gameobjects" - ] -} \ No newline at end of file + "testables": [ + "com.unity.netcode.gameobjects" + ] +} diff --git a/minimalproject/Packages/packages-lock.json b/minimalproject/Packages/packages-lock.json index 2c61ca625d..3d505c155f 100644 --- a/minimalproject/Packages/packages-lock.json +++ b/minimalproject/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.19", + "version": "1.8.28", "depth": 2, "source": "registry", "dependencies": { @@ -11,24 +11,26 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.6.5", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.27", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.37", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": { @@ -37,12 +39,20 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, "com.unity.netcode.gameobjects": { "version": "file:../../com.unity.netcode.gameobjects", "depth": 0, @@ -60,38 +70,76 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.6.0", "depth": 3, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.test-framework.performance": { + "version": "3.3.0", + "depth": 3, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.5.0", + "version": "2.7.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.collections": "1.2.4", - "com.unity.mathematics": "1.2.6" + "com.unity.burst": "1.8.24", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.2" }, "url": "https://packages.unity.com" }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imgui": { "version": "1.0.0", - "depth": 4, + "depth": 2, "source": "builtin", "dependencies": {} }, "com.unity.modules.jsonserialize": { "version": "1.0.0", - "depth": 3, + "depth": 2, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 2, "source": "builtin", "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" + } } } } diff --git a/minimalproject/ProjectSettings/MultiplayerManager.asset b/minimalproject/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/minimalproject/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/minimalproject/ProjectSettings/ProjectVersion.txt b/minimalproject/ProjectSettings/ProjectVersion.txt index 41a11b2d05..ba577c5bf5 100644 --- a/minimalproject/ProjectSettings/ProjectVersion.txt +++ b/minimalproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.61f1 -m_EditorVersionWithRevision: 2022.3.61f1 (6c53ebaf375d) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 630914f407..a6b8d3335c 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -2,11 +2,13 @@ "disableProjectUpdate": false, "dependencies": { "com.unity.ide.rider": "3.0.40", - "com.unity.multiplayer.tools": "1.1.1", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.multiplayer.tools": "2.2.8", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "1.4.6", - "com.unity.test-framework.performance": "3.4.0", + "com.unity.test-framework": "1.6.0", + "com.unity.test-framework.performance": "3.4.1", "com.unity.transport": "2.7.2", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/testproject-tools-integration/Packages/packages-lock.json b/testproject-tools-integration/Packages/packages-lock.json index 6f131a9535..28ec21ddd8 100644 --- a/testproject-tools-integration/Packages/packages-lock.json +++ b/testproject-tools-integration/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.24", + "version": "1.8.28", "depth": 1, "source": "registry", "dependencies": { @@ -11,26 +11,26 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.2.1", + "version": "2.6.5", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.8", - "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.test-framework.performance": "3.0.2" + "com.unity.burst": "1.8.27", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.3", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.38", + "version": "3.0.40", "depth": 0, "source": "registry", "dependencies": { @@ -45,16 +45,26 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, "com.unity.multiplayer.tools": { - "version": "1.1.1", + "version": "2.2.8", "depth": 0, "source": "registry", "dependencies": { - "com.unity.collections": "1.1.0", - "com.unity.profiling.core": "1.0.0-pre.1", - "com.unity.nuget.mono-cecil": "1.10.1", + "com.unity.burst": "1.8.18", + "com.unity.collections": "2.5.1", + "com.unity.mathematics": "1.3.2", + "com.unity.profiling.core": "1.0.2", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.modules.uielements": "1.0.0", - "com.unity.nuget.newtonsoft-json": "2.0.0" + "com.unity.nuget.newtonsoft-json": "3.2.1" }, "url": "https://packages.unity.com" }, @@ -82,25 +92,24 @@ "url": "https://packages.unity.com" }, "com.unity.profiling.core": { - "version": "1.0.2", + "version": "1.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.6", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.2.0", + "version": "3.4.1", "depth": 0, "source": "registry", "dependencies": { @@ -110,7 +119,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.6.0", + "version": "2.7.2", "depth": 0, "source": "registry", "dependencies": { @@ -120,6 +129,12 @@ }, "url": "https://packages.unity.com" }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -167,6 +182,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -255,7 +276,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/testproject-tools-integration/ProjectSettings/MultiplayerManager.asset b/testproject-tools-integration/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/testproject-tools-integration/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt index 41a11b2d05..ba577c5bf5 100644 --- a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt +++ b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.61f1 -m_EditorVersionWithRevision: 2022.3.61f1 (6c53ebaf375d) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/testproject/Assets/Scripts/ConnectionModeScript.cs b/testproject/Assets/Scripts/ConnectionModeScript.cs index 70bc46a1d9..b21a029bd8 100644 --- a/testproject/Assets/Scripts/ConnectionModeScript.cs +++ b/testproject/Assets/Scripts/ConnectionModeScript.cs @@ -1,10 +1,10 @@ +using System; using System.Collections; using UnityEngine; using Unity.Netcode; using Unity.Netcode.Transports.UTP; using UnityEngine.SceneManagement; #if ENABLE_RELAY_SERVICE -using System; using Unity.Services.Core; using Unity.Services.Authentication; #endif diff --git a/testproject/Assets/Scripts/RelayUtility.cs b/testproject/Assets/Scripts/RelayUtility.cs index 4935a2fdf1..433a7925a7 100644 --- a/testproject/Assets/Scripts/RelayUtility.cs +++ b/testproject/Assets/Scripts/RelayUtility.cs @@ -12,7 +12,7 @@ public class RelayUtility string createJoinCode; try { - allocation = await Relay.Instance.CreateAllocationAsync(maxConnections, region); + allocation = await RelayService.Instance.CreateAllocationAsync(maxConnections, region); } catch (Exception e) { @@ -25,7 +25,7 @@ public class RelayUtility try { - createJoinCode = await Relay.Instance.GetJoinCodeAsync(allocation.AllocationId); + createJoinCode = await RelayService.Instance.GetJoinCodeAsync(allocation.AllocationId); } catch { @@ -41,7 +41,7 @@ public class RelayUtility JoinAllocation allocation; try { - allocation = await Relay.Instance.JoinAllocationAsync(joinCode); + allocation = await RelayService.Instance.JoinAllocationAsync(joinCode); } catch { diff --git a/testproject/Assets/Scripts/testproject.asmdef b/testproject/Assets/Scripts/testproject.asmdef index 391e453cb9..de751a02dc 100644 --- a/testproject/Assets/Scripts/testproject.asmdef +++ b/testproject/Assets/Scripts/testproject.asmdef @@ -8,13 +8,13 @@ "Unity.Netcode.Adapter.UTP", "Unity.Services.Authentication", "Unity.Services.Core", - "Unity.Services.Relay", + "Unity.Services.Multiplayer", "Unity.Addressables.Editor" ], "versionDefines": [ { - "name": "com.unity.services.relay", - "expression": "0.0.1-preview.3", + "name": "com.unity.services.multiplayer", + "expression": "1.0.0", "define": "ENABLE_RELAY_SERVICE" }, { diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index d37058ba4a..0b079309f2 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,23 +1,24 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.addressables": "1.22.3", - "com.unity.ai.navigation": "1.1.6", - "com.unity.collab-proxy": "2.7.1", - "com.unity.ide.rider": "3.0.37", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.mathematics": "1.2.6", + "com.unity.addressables": "2.9.1", + "com.unity.ai.navigation": "2.0.12", + "com.unity.collab-proxy": "2.12.4", + "com.unity.ide.rider": "3.0.40", + "com.unity.ide.visualstudio": "2.0.27", + "com.unity.mathematics": "1.3.3", + "com.unity.multiplayer.center": "1.0.0", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.package-validation-suite": "0.49.0-preview", - "com.unity.services.authentication": "2.7.4", - "com.unity.services.core": "1.14.0", - "com.unity.services.relay": "1.0.5", - "com.unity.test-framework": "1.3.3", - "com.unity.test-framework.performance": "3.1.0", - "com.unity.textmeshpro": "3.0.7", - "com.unity.timeline": "1.8.2", - "com.unity.transport": "1.5.0", - "com.unity.ugui": "1.0.0", + "com.unity.services.authentication": "3.6.1", + "com.unity.services.core": "1.16.0", + "com.unity.services.multiplayer": "2.2.1", + "com.unity.test-framework": "1.6.0", + "com.unity.test-framework.performance": "3.3.0", + "com.unity.timeline": "1.8.12", + "com.unity.transport": "2.7.2", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 3b3992d7d9..ebca177790 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -1,21 +1,23 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.22.3", + "version": "2.9.1", "depth": 0, "source": "registry", "dependencies": { + "com.unity.profiling.core": "1.0.2", + "com.unity.test-framework": "1.4.5", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.21.25", + "com.unity.scriptablebuildpipeline": "2.6.1", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.6", + "version": "2.0.12", "depth": 0, "source": "registry", "dependencies": { @@ -24,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.21", + "version": "1.8.28", "depth": 1, "source": "registry", "dependencies": { @@ -34,31 +36,33 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.7.1", + "version": "2.12.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.6.5", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.27", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.3", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.37", + "version": "3.0.40", "depth": 0, "source": "registry", "dependencies": { @@ -67,21 +71,29 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.27", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.3", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, "com.unity.netcode.gameobjects": { "version": "file:../../com.unity.netcode.gameobjects", "depth": 0, @@ -99,7 +111,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.2.1", + "version": "3.2.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -114,27 +126,37 @@ }, "url": "https://packages.unity.com" }, - "com.unity.scriptablebuildpipeline": { - "version": "1.21.25", + "com.unity.profiling.core": { + "version": "1.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.scriptablebuildpipeline": { + "version": "2.6.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.services.authentication": { - "version": "2.7.4", + "version": "3.6.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.12.5", + "com.unity.services.core": "1.15.1", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.14.0", + "version": "1.16.0", "depth": 0, "source": "registry", "dependencies": { @@ -144,50 +166,76 @@ }, "url": "https://packages.unity.com" }, + "com.unity.services.deployment": { + "version": "1.7.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.15.1", + "com.unity.services.deployment.api": "1.1.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment.api": { + "version": "1.1.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.multiplayer": { + "version": "2.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.transport": "2.6.0", + "com.unity.collections": "2.2.1", + "com.unity.services.qos": "1.4.1", + "com.unity.services.core": "1.16.0", + "com.unity.services.wire": "1.4.3", + "com.unity.services.deployment": "1.7.1", + "com.unity.nuget.newtonsoft-json": "3.2.2", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "3.6.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.services.qos": { - "version": "1.3.0", + "version": "1.4.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.collections": "1.2.4", - "com.unity.services.core": "1.12.4", + "com.unity.services.core": "1.12.5", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.services.authentication": "2.0.0" + "com.unity.services.authentication": "3.5.2" }, "url": "https://packages.unity.com" }, - "com.unity.services.relay": { - "version": "1.0.5", - "depth": 0, + "com.unity.services.wire": { + "version": "1.4.3", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.transport": "1.3.0", - "com.unity.services.qos": "1.1.0", - "com.unity.services.core": "1.4.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.services.authentication": "2.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0" + "com.unity.services.core": "1.12.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.authentication": "2.7.4" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.3.3", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.1.0", + "version": "3.3.0", "depth": 0, "source": "registry", "dependencies": { @@ -196,17 +244,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { - "version": "1.8.2", + "version": "1.8.12", "depth": 0, "source": "registry", "dependencies": { @@ -218,18 +257,18 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.5.0", + "version": "2.7.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.collections": "1.2.4", - "com.unity.mathematics": "1.2.6" + "com.unity.burst": "1.8.24", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.2" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -237,6 +276,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -284,6 +329,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -372,7 +423,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/testproject/ProjectSettings/MultiplayerManager.asset b/testproject/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/testproject/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt index b852362343..ba577c5bf5 100644 --- a/testproject/ProjectSettings/ProjectVersion.txt +++ b/testproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.62f2 -m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857)