diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 30c2089f1c..bafbc440ed 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -17,7 +17,7 @@ run_quick_checks: name: Run Quick Initial Checks dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - - .yamato/project-standards.yml#standards_ubuntu_testproject_6000.2 + - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }} # Runs all package tests run_all_package_tests: @@ -30,22 +30,20 @@ run_all_package_tests: {% endfor -%} -# Runs all package tests on 6000.2 editor (latest supported editor) -run_all_package_tests_6000.2: - name: Run All Package Tests [6000.2 only] +# Runs all package tests on default editor +run_all_package_tests_{{ validation_editors.default }}: + name: Run All Package Tests [{{ validation_editors.default }} only] dependencies: {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }} -{% endfor -%} + - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_{{ platform.name }} {% endfor -%} -# Runs all package tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) -run_all_package_tests_2022: - name: Run All Package Tests [2022.3] +# Runs all package tests on mimimum 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_2022.3_{{ platform.name }} + - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_{{ platform.name }} {% endfor -%} @@ -64,28 +62,26 @@ run_all_project_tests: {% endfor -%} -# Runs all projects tests on 6000.2 editor (latest supported editor) -run_all_project_tests_6000.2: - name: Run All Project Tests [6000.2 only] +# 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 -%} -{% for editor in validation_editors.default -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endif -%} {% endfor -%} -# Runs all projects tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) -run_all_project_tests_2022: - name: Run All Project Tests [2022.3] +# Runs all projects tests on mimimal 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 }}_2022.3 + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} {% endfor -%} {% endif -%} {% endfor -%} @@ -97,9 +93,7 @@ run_all_projects_standards: dependencies: {% for platform in test_platforms.default -%} {% for project in projects.all -%} -{% for editor in validation_editors.default -%} - - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }} -{% endfor -%} + - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} @@ -117,25 +111,23 @@ run_all_webgl_builds: {% endfor -%} -# Runs all WebGL builds on 6000.2 editor (latest supported editor) -run_all_webgl_builds_6000.2: - name: Run All WebGl Build [6000.2 only] +# Runs all WebGL builds on default 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 -%} -{% for editor in validation_editors.default -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} -# Runs all WebGL builds on 2022.3 editor (2022.3 will soon be a minimum supported editor) -run_all_webgl_builds_2022: - name: Run All WebGl Build [2022.3] +# Runs all WebGL builds on 2022.3 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 }}_2022.3 + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} {% endfor -%} {% endfor -%} @@ -155,28 +147,25 @@ run_all_project_tests_desktop_standalone: {% endfor -%} -# Runs all Desktop tests on 6000.2 editor (latest supported editor) -run_all_project_tests_desktop_standalone_6000.2: - name: Run All Standalone Tests - Desktop [6000.2 only] +run_all_project_tests_desktop_standalone_{{ validation_editors.default }}: + name: Run All Standalone Tests - Desktop [{{ validation_editors.default }} only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} {% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} -{% endfor -%} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} {% endfor -%} -# Runs all Desktop tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) -run_all_project_tests_desktop_standalone_2022: - name: Run All Standalone Tests - Desktop [2022.3] +# Runs all Desktop tests on mimimum 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 }}_2022.3 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.minimal }} {% endfor -%} {% endfor -%} {% endfor -%} @@ -194,25 +183,23 @@ run_all_project_tests_mobile_standalone: {% endfor -%} -# Runs all Mobile tests on 6000.2 editor (latest supported editor) -run_all_project_tests_mobile_standalone_6000.2: - name: Run All Standalone Tests - Mobile [6000.2 only] +# 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 -%} -{% for editor in validation_editors.default -%} - - .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_editors.default }} {% endfor -%} {% endfor -%} -# Runs all Mobile tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) -run_all_project_tests_mobile_standalone_2022: - name: Run All Standalone Tests - Mobile [2022.3] +# Runs all Mobile tests on mimimum 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 }}_2022.3 + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }} {% endfor -%} {% endfor -%} @@ -230,24 +217,23 @@ run_all_project_tests_console_standalone: {% endfor -%} -# Runs all Console tests on 6000.2 editor (latest supported editor) -run_all_project_tests_console_standalone_6000.2: - name: Run All Standalone Tests - Console [6000.2 only] +# 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] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.default -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} {% endfor -%} -# Runs all Console tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) -run_all_project_tests_console_standalone_2022: - name: Run All Standalone Tests - Console [2022.3] +# Runs all Console tests on mimimum 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 }}_2022.3 + - .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 2483e600d0..77a3afc6d6 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -24,7 +24,7 @@ # 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 6000.2 (latest supported editor). + # Includes all test types but only on default editor (latest supported editor). # Adds platform-specific and APV validation # Weekly: @@ -49,7 +49,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_6000.2 + - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }} triggers: expression: |- (pull_request.comment eq "ngo" OR @@ -72,21 +72,21 @@ pr_code_changes_checks: # 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 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - - .yamato/package-tests.yml#package_test_-_ngo_6000.2_mac - - .yamato/package-tests.yml#package_test_-_ngo_2022.3_win + # Run package EditMode and Playmode package tests on default editor (latest supported editor) and an older 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 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - - .yamato/project-tests.yml#test_testproject_win_6000.2 - - .yamato/project-tests.yml#test_testproject_mac_2022.3 + # Run testproject EditMode and Playmode project tests on default editor (latest supported editor) and an older 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 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3 - - .yamato/project-tests.yml#test_testproject-tools-integration_win_6000.2 + # Run tools integration tests EditMode and Playmode tests on default editor (latest supported editor) and an older 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_2022.3 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ validation_editors.minimal }} triggers: expression: |- (pull_request.comment eq "ngo" OR @@ -111,14 +111,11 @@ pr_code_changes_checks: - - - -# Run all tests on 6000.2 (latest supported editor) on nightly basis. +# Run all tests on default editor (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 6000.2 (latest supported editor) since it's daily and running all of them would add a lot of overhead +# Those tests are all running on default editor (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 [6000.2 and 2022]" + name: "\U0001F319 [Nightly] Run All Tests [default and 2022]" triggers: recurring: - branch: develop @@ -128,31 +125,31 @@ develop_nightly: # 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_6000.2 - - .yamato/project-standards.yml#standards_ubuntu_testproject_2022.3 + - .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 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_package_tests_6000.2 - - .yamato/_run-all.yml#run_all_package_tests_2022 - # Run project EditMode and PLaymode tests on desktop platforms on 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_project_tests_6000.2 - - .yamato/_run-all.yml#run_all_project_tests_2022 - # Run Runtime tests on desktop players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_6000.2 - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_2022 - # Run Runtime tests on mobile players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_6000.2 - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_2022 - # Run Runtime tests on console players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_6000.2 - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_2022 - # Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) - - .yamato/_run-all.yml#run_all_webgl_builds_6000.2 - - .yamato/_run-all.yml#run_all_webgl_builds_2022 - # Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_6000.2 - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2022.3 + # Run package EditMode and Playmode tests on desktop platforms on default editor (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 default editor (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 default editor (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 default editor (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 default editor (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 default editor (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 }} + # Run updated dependencies test on default editor (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 @@ -160,7 +157,7 @@ develop_nightly: # 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 6000.2). Running those on weekly basis and 6000.2 (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests +# This in contrast to nightly checks will run tests on all editors (not only default). Running those on weekly basis and default editor (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: @@ -183,7 +180,7 @@ develop_weekly_trunk: - .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 6000.2 (latest supported editor) + # Build player for webgl platform on default editor (latest supported editor) - .yamato/_run-all.yml#run_all_webgl_builds # Run code coverage test - - .yamato/code-coverage.yml#code_coverage_ubuntu_6000.2 + - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }} diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index fe4efb393b..667eab4f8f 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 (6000.2) since coverage would not vary between editors (no need for checks on more editors) + # 2. For default editor version (validation_editors.default) 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 diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index d53c2e613f..63eec72556 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 (6000.2) since standards would not vary between editors (no need for checks on more editors) + # 3. For default editor version (validation_editors.default) 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) @@ -45,9 +45,10 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: - 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 - - .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 }} --check # Runs standards check + - 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.metafile b/.yamato/project.metafile index 81733a3303..7c364546e0 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.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.small @@ -38,13 +38,13 @@ test_platforms: default: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.large standalone: StandaloneLinux64 desktop: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.large smaller_flavor: b1.medium standalone: StandaloneLinux64 @@ -157,11 +157,10 @@ test_platforms: validation_editors: default: - - 6000.2 + - 6000.0 all: - 2022.3 - 6000.0 - - 6000.2 minimal: - 2022.3 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index ceea12f722..7e9e1d8f4f 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -11,9 +11,6 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows metadata: Job Maintainers: '#rm-packageworks' Wrench: 1.3.0.0 @@ -344,166 +341,3 @@ preview_apv_-_6000_0_-_windows: Job Maintainers: '#rm-packageworks' Wrench: 1.3.0.0 -# Functional tests for dependents found in the latest 6000.2 manifest (MacOS). -preview_apv_-_6000_2_-_macos: - name: Preview APV - 6000.2 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - -# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu). -preview_apv_-_6000_2_-_ubuntu: - name: Preview APV - 6000.2 - ubuntu - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - -# Functional tests for dependents found in the latest 6000.2 manifest (Windows). -preview_apv_-_6000_2_-_windows: - name: Preview APV - 6000.2 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.2 --wrench-config=.yamato/wrench/wrench_config.json - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 5e44508101..ba14b4674f 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -86,36 +86,6 @@ publish_dry_run_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-windows - unzip: true - packages: - ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 UPMPVP_CONTEXT_WRENCH: 1.3.0.0 @@ -208,36 +178,6 @@ publish_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.2-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.2-windows - unzip: true - packages: - ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 UPMPVP_CONTEXT_WRENCH: 1.3.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 07df43038c..d19ccb4060 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -397,201 +397,3 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: labels: - Packages:netcode.gameobjects -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - macos (6000.2 - MacOS). -validate_-_netcode_gameobjects_-_6000_2_-_macos: - name: Validate - netcode.gameobjects - 6000.2 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - ubuntu (6000.2 - Ubuntu). -validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: - name: Validate - netcode.gameobjects - 6000.2 - ubuntu - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - windows (6000.2 - Windows). -validate_-_netcode_gameobjects_-_6000_2_-_windows: - name: Validate - netcode.gameobjects - 6000.2 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:netcode.gameobjects - diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index b9c00c13ac..3558695594 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -11,7 +11,7 @@ }, "InternalOnly": false, "NeverPublish": false, - "MaxEditorVersion": "6000.2", + "MaxEditorVersion": "6000.0", "coverageEnabled": false, "coverageCommands": [ "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs index f8cfd8ee04..1a25c41b04 100644 --- a/Tools/CI/Settings/NGOSettings.cs +++ b/Tools/CI/Settings/NGOSettings.cs @@ -23,7 +23,7 @@ public class NGOSettings : AnnotatedSettingsBase new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true }, - MaximumEditorVersion = "6000.2", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions + MaximumEditorVersion = "6000.0", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions ValidationOptions = validationOptions } } diff --git a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs index 15918aa401..3869fe9ce4 100644 --- a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs @@ -533,11 +533,8 @@ static AnimationParamEnumWrapper() /// private void SpawnCleanup() { - if (m_NetworkAnimatorStateChangeHandler != null) - { - m_NetworkAnimatorStateChangeHandler.DeregisterUpdate(); - m_NetworkAnimatorStateChangeHandler = null; - } + m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate(); + m_NetworkAnimatorStateChangeHandler = null; } public override void OnDestroy() diff --git a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs index 0e0405cef3..e87293925d 100644 --- a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs @@ -3385,6 +3385,6 @@ private static void DeregisterForTickUpdate(NetworkTransform networkTransform) internal interface INetworkTransformLogStateEntry { - void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false); + public void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 242b019ec2..82308337f8 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -608,8 +608,8 @@ internal T Value /// internal interface INetworkManagerHelper { - bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false); - void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false); + public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false); + public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false); } internal delegate void ResetNetworkManagerDelegate(NetworkManager manager); @@ -1255,11 +1255,8 @@ internal void ShutdownInternal() CustomMessagingManager = null; - if (MessageManager != null) - { - MessageManager.Dispose(); - MessageManager = null; - } + MessageManager?.Dispose(); + MessageManager = null; // We need to clean up NetworkObjects before we reset the IsServer // and IsClient properties. This provides consistency of these two diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs index 3b44715d68..bb91d72825 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs @@ -15,7 +15,7 @@ public interface INetworkUpdateSystem /// The update method that is being executed in the context of related . /// /// The that is being executed. - void NetworkUpdate(NetworkUpdateStage updateStage); + public void NetworkUpdate(NetworkUpdateStage updateStage); } /// diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs index 0a9ec917f3..bdd16f151b 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs @@ -17,20 +17,20 @@ internal enum TriggerType /// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed /// without the requested object ID being spawned, the triggers for it are automatically deleted. /// - void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context); + public void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context); /// /// Cleans up any trigger that's existed for more than a second. /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn. /// - void CleanupStaleTriggers(); + public void CleanupStaleTriggers(); - void ProcessTriggers(TriggerType trigger, ulong key); + public void ProcessTriggers(TriggerType trigger, ulong key); /// /// Cleans up any trigger that's existed for more than a second. /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn. /// - void CleanupAllTriggers(); + public void CleanupAllTriggers(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs index 7543a11255..20789df764 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs @@ -15,7 +15,7 @@ internal interface INetworkHooks /// The destination clientId /// The message being sent /// - void OnBeforeSendMessage(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage; + public void OnBeforeSendMessage(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage; /// /// Called after an individual message is sent. @@ -24,7 +24,7 @@ internal interface INetworkHooks /// The message being sent /// /// Number of bytes in the message, not including the message header - void OnAfterSendMessage(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage; + public void OnAfterSendMessage(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage; /// /// Called before an individual message is received. @@ -32,7 +32,7 @@ internal interface INetworkHooks /// The source clientId /// The type of the message being sent /// Number of bytes in the message, not including the message header - void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); + public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); /// /// Called after an individual message is received. @@ -40,7 +40,7 @@ internal interface INetworkHooks /// The source clientId /// The type of the message being sent /// Number of bytes in the message, not including the message header - void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); + public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); /// /// Called before a batch of messages is sent @@ -49,7 +49,7 @@ internal interface INetworkHooks /// Number of messages in the batch /// Number of bytes in the batch, including the batch header /// - void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); + public void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); /// /// Called after a batch of messages is sent @@ -58,7 +58,7 @@ internal interface INetworkHooks /// Number of messages in the batch /// Number of bytes in the batch, including the batch header /// - void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); + public void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); /// /// Called before a batch of messages is received @@ -66,7 +66,7 @@ internal interface INetworkHooks /// The source clientId /// Number of messages in the batch /// Number of bytes in the batch, including the batch header - void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); + public void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); /// /// Called after a batch of messages is received @@ -74,7 +74,7 @@ internal interface INetworkHooks /// The source clientId /// Number of messages in the batch /// Number of bytes in the batch, including the batch header - void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); + public void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); /// @@ -84,7 +84,7 @@ internal interface INetworkHooks /// The type of the message /// /// - bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery); + public bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery); /// /// Called before a message is received. If this returns false, the message will be discarded. @@ -94,7 +94,7 @@ internal interface INetworkHooks /// The FastBufferReader containing the message /// The NetworkContext the message is being processed in /// - bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context); + public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context); /// /// Called after a message is serialized, but before it's handled. @@ -103,7 +103,7 @@ internal interface INetworkHooks /// The message object /// The network context the message is being ahandled in /// - void OnBeforeHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; + public void OnBeforeHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; /// /// Called after a message is serialized and handled. @@ -112,6 +112,6 @@ internal interface INetworkHooks /// The message object /// The network context the message is being ahandled in /// - void OnAfterHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; + public void OnAfterHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs index 46267d5220..6f6aec3092 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs @@ -39,9 +39,9 @@ namespace Unity.Netcode /// internal interface INetworkMessage { - void Serialize(FastBufferWriter writer, int targetVersion); - bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion); - void Handle(ref NetworkContext context); - int Version { get; } + public void Serialize(FastBufferWriter writer, int targetVersion); + public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion); + public void Handle(ref NetworkContext context); + public int Version { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs index dcd0c1b2aa..bc731fe262 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs @@ -4,6 +4,6 @@ namespace Unity.Netcode { internal interface INetworkMessageProvider { - List GetMessages(); + public List GetMessages(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs index 5f20746976..f915bb0ced 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs @@ -2,6 +2,6 @@ namespace Unity.Netcode { internal interface INetworkMessageSender { - void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData); + public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs index 88aac5073e..fadcfe8d42 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs @@ -2,8 +2,8 @@ namespace Unity.Netcode { internal interface IGroupRpcTarget { - void Add(ulong clientId); - void Clear(); - BaseRpcTarget Target { get; } + public void Add(ulong clientId); + public void Clear(); + public BaseRpcTarget Target { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs index 0e654a8328..81bca626c2 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs @@ -2,7 +2,7 @@ namespace Unity.Netcode { internal interface IIndividualRpcTarget { - void SetClientId(ulong clientId); - BaseRpcTarget Target { get; } + public void SetClientId(ulong clientId); + public BaseRpcTarget Target { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs index 2d948dd87b..349759d553 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs @@ -8,11 +8,8 @@ internal class NotMeRpcTarget : BaseRpcTarget public override void Dispose() { m_ServerRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs index 5f31039598..9b3ac4374d 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs @@ -10,11 +10,8 @@ public override void Dispose() { m_ServerRpcTarget.Dispose(); m_LocalSendRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs index 316eba4942..b65751655e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs @@ -8,11 +8,8 @@ internal class NotServerRpcTarget : BaseRpcTarget public override void Dispose() { m_LocalSendRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs index 7c7829402d..bd7bafcb54 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs @@ -9,11 +9,8 @@ internal class OwnerRpcTarget : BaseRpcTarget public override void Dispose() { m_LocalRpcTarget.Dispose(); - if (m_UnderlyingTarget != null) - { - m_UnderlyingTarget.Target.Dispose(); - m_UnderlyingTarget = null; - } + m_UnderlyingTarget?.Target.Dispose(); + m_UnderlyingTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs index 09b789ddb9..ce19ddbc34 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs @@ -6,11 +6,8 @@ internal class ServerRpcTarget : BaseRpcTarget public override void Dispose() { - if (m_UnderlyingTarget != null) - { - m_UnderlyingTarget.Dispose(); - m_UnderlyingTarget = null; - } + m_UnderlyingTarget?.Dispose(); + m_UnderlyingTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs index 96a99b5cef..57f208f432 100644 --- a/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs +++ b/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs @@ -4,97 +4,97 @@ namespace Unity.Netcode { internal interface INetworkMetrics { - void SetConnectionId(ulong connectionId); + public void SetConnectionId(ulong connectionId); - void TrackTransportBytesSent(long bytesCount); + public void TrackTransportBytesSent(long bytesCount); - void TrackTransportBytesReceived(long bytesCount); + public void TrackTransportBytesReceived(long bytesCount); - void TrackNetworkMessageSent(ulong receivedClientId, string messageType, long bytesCount); + public void TrackNetworkMessageSent(ulong receivedClientId, string messageType, long bytesCount); - void TrackNetworkMessageReceived(ulong senderClientId, string messageType, long bytesCount); + public void TrackNetworkMessageReceived(ulong senderClientId, string messageType, long bytesCount); - void TrackNamedMessageSent(ulong receiverClientId, string messageName, long bytesCount); + public void TrackNamedMessageSent(ulong receiverClientId, string messageName, long bytesCount); - void TrackNamedMessageSent(IReadOnlyCollection receiverClientIds, string messageName, long bytesCount); + public void TrackNamedMessageSent(IReadOnlyCollection receiverClientIds, string messageName, long bytesCount); - void TrackNamedMessageReceived(ulong senderClientId, string messageName, long bytesCount); + public void TrackNamedMessageReceived(ulong senderClientId, string messageName, long bytesCount); - void TrackUnnamedMessageSent(ulong receiverClientId, long bytesCount); + public void TrackUnnamedMessageSent(ulong receiverClientId, long bytesCount); - void TrackUnnamedMessageSent(IReadOnlyCollection receiverClientIds, long bytesCount); + public void TrackUnnamedMessageSent(IReadOnlyCollection receiverClientIds, long bytesCount); - void TrackUnnamedMessageReceived(ulong senderClientId, long bytesCount); + public void TrackUnnamedMessageReceived(ulong senderClientId, long bytesCount); - void TrackNetworkVariableDeltaSent( + public void TrackNetworkVariableDeltaSent( ulong receiverClientId, NetworkObject networkObject, string variableName, string networkBehaviourName, long bytesCount); - void TrackNetworkVariableDeltaReceived( + public void TrackNetworkVariableDeltaReceived( ulong senderClientId, NetworkObject networkObject, string variableName, string networkBehaviourName, long bytesCount); - void TrackOwnershipChangeSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackOwnershipChangeSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackOwnershipChangeReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackOwnershipChangeReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectSpawnSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectSpawnSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectSpawnReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectSpawnReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectDestroySent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectDestroySent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectDestroyReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectDestroyReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackRpcSent( + public void TrackRpcSent( ulong receiverClientId, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackRpcSent( + public void TrackRpcSent( ulong[] receiverClientIds, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackRpcReceived( + public void TrackRpcReceived( ulong senderClientId, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount); + public void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount); - void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount); + public void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount); - void TrackSceneEventSent(IReadOnlyList receiverClientIds, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventSent(IReadOnlyList receiverClientIds, uint sceneEventType, string sceneName, long bytesCount); - void TrackSceneEventSent(ulong receiverClientId, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventSent(ulong receiverClientId, uint sceneEventType, string sceneName, long bytesCount); - void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, string sceneName, long bytesCount); - void TrackPacketSent(uint packetCount); + public void TrackPacketSent(uint packetCount); - void TrackPacketReceived(uint packetCount); + public void TrackPacketReceived(uint packetCount); - void UpdateRttToServer(int rtt); + public void UpdateRttToServer(int rtt); - void UpdateNetworkObjectsCount(int count); + public void UpdateNetworkObjectsCount(int count); - void UpdateConnectionsCount(int count); + public void UpdateConnectionsCount(int count); - void UpdatePacketLoss(float packetLoss); + public void UpdatePacketLoss(float packetLoss); - void DispatchFrame(); + public void DispatchFrame(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs index 240a5c94f6..c167de2982 100644 --- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs +++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs @@ -10,27 +10,27 @@ namespace Unity.Netcode /// internal interface ISceneManagerHandler { - AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress); + public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress); - AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress); + public AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress); - void PopulateLoadedScenes(ref Dictionary scenesLoaded, NetworkManager networkManager = null); - Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkManager = null); + public void PopulateLoadedScenes(ref Dictionary scenesLoaded, NetworkManager networkManager = null); + public Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkManager = null); - bool DoesSceneHaveUnassignedEntry(string sceneName, NetworkManager networkManager = null); + public bool DoesSceneHaveUnassignedEntry(string sceneName, NetworkManager networkManager = null); - void StopTrackingScene(int handle, string name, NetworkManager networkManager = null); + public void StopTrackingScene(int handle, string name, NetworkManager networkManager = null); - void StartTrackingScene(Scene scene, bool assigned, NetworkManager networkManager = null); + public void StartTrackingScene(Scene scene, bool assigned, NetworkManager networkManager = null); - void ClearSceneTracking(NetworkManager networkManager = null); + public void ClearSceneTracking(NetworkManager networkManager = null); - void UnloadUnassignedScenes(NetworkManager networkManager = null); + public void UnloadUnassignedScenes(NetworkManager networkManager = null); - void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkManager, Scene scene); + public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkManager, Scene scene); - void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode); + public void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode); - bool ClientShouldPassThrough(string sceneName, bool isPrimaryScene, LoadSceneMode clientSynchronizationMode, NetworkManager networkManager); + public bool ClientShouldPassThrough(string sceneName, bool isPrimaryScene, LoadSceneMode clientSynchronizationMode, NetworkManager networkManager); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs index da68a378af..10a51e0673 100644 --- a/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs +++ b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs @@ -13,6 +13,6 @@ public interface INetworkSerializable /// Either BufferSerializerReader or BufferSerializerWriter, depending whether the serializer /// is in read mode or write mode. /// - void NetworkSerialize(BufferSerializer serializer) where T : IReaderWriter; + public void NetworkSerialize(BufferSerializer serializer) where T : IReaderWriter; } } diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs index 676d09cf69..a4b262567e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs +++ b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs @@ -12,37 +12,37 @@ public interface IReaderWriter /// /// Check whether this implementation is a "reader" - if it's been constructed to deserialize data /// - bool IsReader { get; } + public bool IsReader { get; } /// /// Check whether this implementation is a "writer" - if it's been constructed to serialize data /// - bool IsWriter { get; } + public bool IsWriter { get; } /// /// Get the underlying FastBufferReader struct. /// Only valid when IsReader == true /// /// underlying FastBufferReader - FastBufferReader GetFastBufferReader(); + public FastBufferReader GetFastBufferReader(); /// /// Get the underlying FastBufferWriter struct. /// Only valid when IsWriter == true /// /// underlying FastBufferWriter - FastBufferWriter GetFastBufferWriter(); + public FastBufferWriter GetFastBufferWriter(); /// /// Read or write a string /// /// The value to read/write /// If true, characters will be limited to one-byte ASCII characters - void SerializeValue(ref string s, bool oneByteChars = false); + public void SerializeValue(ref string s, bool oneByteChars = false); /// /// Read or write a single byte /// /// The value to read/write - void SerializeValue(ref byte value); + public void SerializeValue(ref byte value); /// /// Read or write a primitive value (int, bool, etc) @@ -52,7 +52,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValue(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Read or write an array of primitive values (int, bool, etc) @@ -62,7 +62,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValue(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Read or write an enum value @@ -70,7 +70,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValue(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Read or write an array of enum values @@ -78,7 +78,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValue(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Read or write a struct value implementing ISerializeByMemcpy @@ -86,7 +86,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValue(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Read or write an array of struct values implementing ISerializeByMemcpy @@ -94,7 +94,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValue(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Read or write a NativeArray of struct values implementing ISerializeByMemcpy @@ -103,7 +103,7 @@ public interface IReaderWriter /// The allocator to use to construct the resulting NativeArray when reading /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValue(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT /// @@ -112,7 +112,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValue(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #endif /// @@ -121,7 +121,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); + public void SerializeValue(ref T value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); /// /// Read or write an array of struct or class values implementing INetworkSerializable @@ -129,7 +129,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); + public void SerializeValue(ref T[] value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); /// /// Read or write a FixedString value @@ -137,7 +137,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = default) + public void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = default) where T : unmanaged, INativeList, IUTF8Bytes; /// @@ -146,7 +146,7 @@ void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = de /// The value to read/write /// The allocator to use to construct the resulting NativeArray when reading /// The type being serialized - void SerializeValue(ref NativeArray value, Allocator allocator) + public void SerializeValue(ref NativeArray value, Allocator allocator) where T : unmanaged, INativeList, IUTF8Bytes; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT @@ -155,7 +155,7 @@ void SerializeValue(ref NativeArray value, Allocator allocator) /// /// The value to read/write /// The type being serialized - void SerializeValue(ref NativeList value) + public void SerializeValue(ref NativeList value) where T : unmanaged, INativeList, IUTF8Bytes; #endif @@ -163,133 +163,133 @@ void SerializeValue(ref NativeList value) /// Read or write a Vector2 value /// /// The value to read/write - void SerializeValue(ref Vector2 value); + public void SerializeValue(ref Vector2 value); /// /// Read or write an array of Vector2 values /// /// The values to read/write - void SerializeValue(ref Vector2[] value); + public void SerializeValue(ref Vector2[] value); /// /// Read or write a Vector3 value /// /// The value to read/write - void SerializeValue(ref Vector3 value); + public void SerializeValue(ref Vector3 value); /// /// Read or write an array of Vector3 values /// /// The values to read/write - void SerializeValue(ref Vector3[] value); + public void SerializeValue(ref Vector3[] value); /// /// Read or write a Vector2Int value /// /// The value to read/write - void SerializeValue(ref Vector2Int value); + public void SerializeValue(ref Vector2Int value); /// /// Read or write an array of Vector2Int values /// /// The values to read/write - void SerializeValue(ref Vector2Int[] value); + public void SerializeValue(ref Vector2Int[] value); /// /// Read or write a Vector3Int value /// /// The value to read/write - void SerializeValue(ref Vector3Int value); + public void SerializeValue(ref Vector3Int value); /// /// Read or write an array of Vector3Int values /// /// The values to read/write - void SerializeValue(ref Vector3Int[] value); + public void SerializeValue(ref Vector3Int[] value); /// /// Read or write a Vector4 value /// /// The value to read/write - void SerializeValue(ref Vector4 value); + public void SerializeValue(ref Vector4 value); /// /// Read or write an array of Vector4 values /// /// The values to read/write - void SerializeValue(ref Vector4[] value); + public void SerializeValue(ref Vector4[] value); /// /// Read or write a Quaternion value /// /// The value to read/write - void SerializeValue(ref Quaternion value); + public void SerializeValue(ref Quaternion value); /// /// Read or write an array of Quaternion values /// /// The values to read/write - void SerializeValue(ref Quaternion[] value); + public void SerializeValue(ref Quaternion[] value); /// /// Read or write a Pose value /// /// The value to read/write - void SerializeValue(ref Pose value); + public void SerializeValue(ref Pose value); /// /// Read or write an array of Pose values /// /// The values to read/write - void SerializeValue(ref Pose[] value); + public void SerializeValue(ref Pose[] value); /// /// Read or write a Color value /// /// The value to read/write - void SerializeValue(ref Color value); + public void SerializeValue(ref Color value); /// /// Read or write an array of Color values /// /// The values to read/write - void SerializeValue(ref Color[] value); + public void SerializeValue(ref Color[] value); /// /// Read or write a Color32 value /// /// The value to read/write - void SerializeValue(ref Color32 value); + public void SerializeValue(ref Color32 value); /// /// Read or write an array of Color32 values /// /// The values to read/write - void SerializeValue(ref Color32[] value); + public void SerializeValue(ref Color32[] value); /// /// Read or write a Ray value /// /// The value to read/write - void SerializeValue(ref Ray value); + public void SerializeValue(ref Ray value); /// /// Read or write an array of Ray values /// /// The values to read/write - void SerializeValue(ref Ray[] value); + public void SerializeValue(ref Ray[] value); /// /// Read or write a Ray2D value /// /// The value to read/write - void SerializeValue(ref Ray2D value); + public void SerializeValue(ref Ray2D value); /// /// Read or write an array of Ray2D values /// /// The values to read/write - void SerializeValue(ref Ray2D[] value); + public void SerializeValue(ref Ray2D[] value); /// /// Read or write a NetworkSerializable value. @@ -297,7 +297,7 @@ void SerializeValue(ref NativeList value) /// /// The value to read/write /// The network serializable type - void SerializeNetworkSerializable(ref T value) where T : INetworkSerializable, new(); + public void SerializeNetworkSerializable(ref T value) where T : INetworkSerializable, new(); /// /// Performs an advance check to ensure space is available to read/write one or more values. @@ -310,7 +310,7 @@ void SerializeValue(ref NativeList value) /// True if there is sufficient space for the specified amount of bytes. /// False if there isn't enough space available. /// - bool PreCheck(int amount); + public bool PreCheck(int amount); /// /// Serialize a string, "pre-checked", which skips buffer checks. @@ -320,7 +320,7 @@ void SerializeValue(ref NativeList value) /// /// The value to read/write /// If true, characters will be limited to one-byte ASCII characters - void SerializeValuePreChecked(ref string s, bool oneByteChars = false); + public void SerializeValuePreChecked(ref string s, bool oneByteChars = false); /// /// Serialize a byte, "pre-checked", which skips buffer checks. @@ -329,7 +329,7 @@ void SerializeValue(ref NativeList value) /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref byte value); + public void SerializeValuePreChecked(ref byte value); /// /// Serialize a primitive, "pre-checked", which skips buffer checks. @@ -340,7 +340,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Serialize an array of primitives, "pre-checked", which skips buffer checks. @@ -351,7 +351,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Serialize an enum, "pre-checked", which skips buffer checks. @@ -362,7 +362,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Serialize an array of enums, "pre-checked", which skips buffer checks. @@ -373,7 +373,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Serialize a struct, "pre-checked", which skips buffer checks. @@ -384,7 +384,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Serialize an array of structs, "pre-checked", which skips buffer checks. @@ -395,7 +395,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Serialize a NativeArray of structs, "pre-checked", which skips buffer checks. @@ -407,7 +407,7 @@ void SerializeValue(ref NativeList value) /// The values to read/write /// The allocator to use to construct the resulting NativeArray when reading /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValuePreChecked(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT /// @@ -419,7 +419,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValuePreChecked(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #endif /// @@ -431,7 +431,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings unused = default) + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings unused = default) where T : unmanaged, INativeList, IUTF8Bytes; /// @@ -441,7 +441,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector2 value); + public void SerializeValuePreChecked(ref Vector2 value); /// /// Serialize a Vector2 array, "pre-checked", which skips buffer checks. @@ -450,7 +450,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector2[] value); + public void SerializeValuePreChecked(ref Vector2[] value); /// /// Serialize a Vector3, "pre-checked", which skips buffer checks. @@ -459,7 +459,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3 value); + public void SerializeValuePreChecked(ref Vector3 value); /// /// Serialize a Vector3 array, "pre-checked", which skips buffer checks. @@ -468,7 +468,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector3[] value); + public void SerializeValuePreChecked(ref Vector3[] value); /// /// Serialize a Vector2Int, "pre-checked", which skips buffer checks. @@ -477,7 +477,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector2Int value); + public void SerializeValuePreChecked(ref Vector2Int value); /// /// Serialize a Vector2Int array, "pre-checked", which skips buffer checks. @@ -486,7 +486,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector2Int[] value); + public void SerializeValuePreChecked(ref Vector2Int[] value); /// /// Serialize a Vector3Int, "pre-checked", which skips buffer checks. @@ -495,7 +495,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3Int value); + public void SerializeValuePreChecked(ref Vector3Int value); /// /// Serialize a Vector3Int array, "pre-checked", which skips buffer checks. @@ -504,7 +504,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3Int[] value); + public void SerializeValuePreChecked(ref Vector3Int[] value); /// /// Serialize a Vector4, "pre-checked", which skips buffer checks. @@ -513,7 +513,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector4 value); + public void SerializeValuePreChecked(ref Vector4 value); /// /// Serialize a Vector4 array, "pre-checked", which skips buffer checks. @@ -522,7 +522,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector4[] value); + public void SerializeValuePreChecked(ref Vector4[] value); /// /// Serialize a Quaternion, "pre-checked", which skips buffer checks. @@ -531,7 +531,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Quaternion value); + public void SerializeValuePreChecked(ref Quaternion value); /// /// Serialize a Quaternion array, "pre-checked", which skips buffer checks. @@ -540,7 +540,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Quaternion[] value); + public void SerializeValuePreChecked(ref Quaternion[] value); /// /// Serialize a Pose, "pre-checked", which skips buffer checks. @@ -549,7 +549,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Pose value); + public void SerializeValuePreChecked(ref Pose value); /// /// Serialize a Pose array, "pre-checked", which skips buffer checks. @@ -558,7 +558,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Pose[] value); + public void SerializeValuePreChecked(ref Pose[] value); /// /// Serialize a Color, "pre-checked", which skips buffer checks. @@ -567,7 +567,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color value); + public void SerializeValuePreChecked(ref Color value); /// /// Serialize a Color array, "pre-checked", which skips buffer checks. @@ -576,7 +576,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color[] value); + public void SerializeValuePreChecked(ref Color[] value); /// /// Serialize a Color32, "pre-checked", which skips buffer checks. @@ -585,7 +585,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color32 value); + public void SerializeValuePreChecked(ref Color32 value); /// /// Serialize a Color32 array, "pre-checked", which skips buffer checks. @@ -594,7 +594,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color32[] value); + public void SerializeValuePreChecked(ref Color32[] value); /// /// Serialize a Ray, "pre-checked", which skips buffer checks. @@ -603,7 +603,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray value); + public void SerializeValuePreChecked(ref Ray value); /// /// Serialize a Ray array, "pre-checked", which skips buffer checks. @@ -612,7 +612,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray[] value); + public void SerializeValuePreChecked(ref Ray[] value); /// /// Serialize a Ray2D, "pre-checked", which skips buffer checks. @@ -621,7 +621,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray2D value); + public void SerializeValuePreChecked(ref Ray2D value); /// /// Serialize a Ray2D array, "pre-checked", which skips buffer checks. @@ -630,6 +630,6 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray2D[] value); + public void SerializeValuePreChecked(ref Ray2D[] value); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs index fe0dd270e9..db2678822c 100644 --- a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs +++ b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs @@ -25,7 +25,7 @@ public interface INetworkPrefabInstanceHandler /// the initial/default position for the to be instantiated /// the initial/default rotation for the to be instantiated /// The instantiated NetworkObject instance. Returns null if instantiation fails. - NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation); + public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation); /// /// Invoked on Client and Server @@ -41,7 +41,7 @@ public interface INetworkPrefabInstanceHandler /// The most common approach is to make the inactive by calling . /// /// The being destroyed - void Destroy(NetworkObject networkObject); + public void Destroy(NetworkObject networkObject); } /// diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs index 07740c8702..109f52d070 100644 --- a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs +++ b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs @@ -2,9 +2,9 @@ namespace Unity.Netcode { internal interface IRealTimeProvider { - float RealTimeSinceStartup { get; } - float UnscaledTime { get; } - float UnscaledDeltaTime { get; } - float DeltaTime { get; } + public float RealTimeSinceStartup { get; } + public float UnscaledTime { get; } + public float UnscaledDeltaTime { get; } + public float DeltaTime { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index c3ca650418..a9f20dae73 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -44,7 +44,7 @@ public interface INetworkStreamDriverConstructor /// The UnreliableFragmented NetworkPipeline /// The UnreliableSequencedFragmented NetworkPipeline /// The ReliableSequenced NetworkPipeline - void CreateDriver( + public void CreateDriver( UnityTransport transport, out NetworkDriver driver, out NetworkPipeline unreliableFragmentedPipeline, diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs index 6745ae78a4..f9cfd6601d 100644 --- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs +++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs @@ -43,18 +43,18 @@ public interface IConditionalPredicate /// /// Test the conditions of the test to be reached /// - bool HasConditionBeenReached(); + public bool HasConditionBeenReached(); /// /// Wait for condition has started /// - void Started(); + public void Started(); /// /// Wait for condition has finished: /// Condition(s) met or timed out /// - void Finished(bool timedOut); + public void Finished(bool timedOut); } } diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs index 81cc7e7bb2..8a779bbd2b 100644 --- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs @@ -333,11 +333,8 @@ private class TestNoHandlerMessageProvider : INetworkMessageProvider public void WhenReceivingAMessageWithoutAHandler_ExceptionIsLogged() { // If a NetworkMessageManager already exists then dispose of it before creating a new NetworkMessageManager (otherwise memory leak) - if (m_MessageManager != null) - { - m_MessageManager.Dispose(); - m_MessageManager = null; - } + m_MessageManager?.Dispose(); + m_MessageManager = null; // Since m_MessageManager is disposed during teardown we don't need to worry about that here. m_MessageManager = new NetworkMessageManager(new NopMessageSender(), this, new TestNoHandlerMessageProvider()); diff --git a/testproject/Assets/Scripts/MenuManagement/SceneReference.cs b/testproject/Assets/Scripts/MenuManagement/SceneReference.cs index 7fed48716f..85e466d34a 100644 --- a/testproject/Assets/Scripts/MenuManagement/SceneReference.cs +++ b/testproject/Assets/Scripts/MenuManagement/SceneReference.cs @@ -64,6 +64,6 @@ public List GetReferencedScenes() public interface ISceneReference { - string GetDisplayName(); - List GetReferencedScenes(); + public string GetDisplayName(); + public List GetReferencedScenes(); } diff --git a/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs b/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs index 7c7b6499f9..4385b82fde 100644 --- a/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs +++ b/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs @@ -2,6 +2,6 @@ namespace TestProject.ManualTests { public interface IPlayerMovement { - void Move(int speed); + public void Move(int speed); } }