diff --git a/.yamato/README.md b/.yamato/README.md index f5eafa856b..4838352f26 100644 --- a/.yamato/README.md +++ b/.yamato/README.md @@ -70,7 +70,7 @@ Currently, the CI implementation supports the following platforms: - Ubuntu - macOS 4. Unity Editor Versions - - Supports NGOv1.X (2021.3+ editors) + - Supports NGOv1.X (2022.3+ editors) 5. Architectures - x64 - ARM64 (This is present for consoles/mobiles but will be extended. More information is present in specific standalone test files) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 5dc59dea66..9624533cb4 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -48,7 +48,7 @@ pr_minimal_required_checks: name: Minimal PR checks dependencies: - - .yamato/package-pack.yml#package_pack_-_ngo_win + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - .yamato/project-standards.yml#standards_ubuntu_testproject_6000.2 triggers: expression: |- diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index 8cb877e00f..5702f905c1 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -44,6 +44,6 @@ code_coverage_{{ platform.name }}_{{ editor }}: paths: - "test-results/**/*" dependencies: - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} {% endfor -%} \ No newline at end of file diff --git a/.yamato/console-standalone-test.yml b/.yamato/console-standalone-test.yml index bd52489c08..fa0e71885f 100644 --- a/.yamato/console-standalone-test.yml +++ b/.yamato/console-standalone-test.yml @@ -8,7 +8,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops (separate build phase and run phase). Worth noting that run phase uses the build as dependency: # 1. For all console platform (Switch, ps4, ps5, xbox360, xboxOne) - # 2. For all supported Unity Editor versions (for NGOv1.X this means 2021.3+ editors) + # 2. For all supported Unity Editor versions (for NGOv1.X this means 2022.3+ editors) # 3. For the default project. # TECHNICAL CONSIDERATIONS--------------------------------------------------------------- diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml index ec17d182fc..b1b34c15e9 100644 --- a/.yamato/desktop-standalone-tests.yml +++ b/.yamato/desktop-standalone-tests.yml @@ -8,7 +8,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops (separate build phase and run phase). Worth noting that run phase uses the build as dependency: # 1. For all desktop platform (Windows, macOS, Ubuntu) - # 2. For all supported Unity Editor versions (for NGOv1.X this means 2021.3+ editors) + # 2. For all supported Unity Editor versions (for NGOv1.X this means 2022.3+ editors) # 3. For the default project. # 4. For all scripting backends (mono, il2cpp) diff --git a/.yamato/mobile-standalone-test.yml b/.yamato/mobile-standalone-test.yml index 2d2de6893f..70152ececb 100644 --- a/.yamato/mobile-standalone-test.yml +++ b/.yamato/mobile-standalone-test.yml @@ -8,7 +8,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops through: # 1. For all mobile platform (Android, iOS) - # 2. For all supported Unity Editor versions (for NGOv1.X this means 2021.3+ editors) + # 2. For all supported Unity Editor versions (for NGOv1.X this means 2022.3+ editors) # 3. For the default project. # TECHNICAL CONSIDERATIONS--------------------------------------------------------------- diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml index 3e40205625..55a0f8e53c 100644 --- a/.yamato/package-pack.yml +++ b/.yamato/package-pack.yml @@ -23,23 +23,23 @@ #------------------------------------------------------------------------------------ -{% for platform in test_platforms.desktop -%} -package_pack_-_ngo_{{ platform.name }}: - name: Package Pack (and x-ray) - NGO [{{ platform.name }}] - agent: - type: {{ platform.type }} - image: {{ platform.image }} - flavor: {{ platform.flavor }} -{% if platform.model %} - model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile) -{% endif %} +# Note that a package pack job on ubuntu will return the same tarball as windows or macOS based job +# It may be confusing that a mac package test job depends on ubuntu pack, but it simplifies the configuration so this comment should help clarifying +# This also reduces overhead since there is no point of running essentially 2 same jobs +package_pack_-_ngo_ubuntu: + name: Package Pack (and x-ray) - NGO [ubuntu] + agent: { type: Unity::VM, flavor: b1.small, image: package-ci/ubuntu-22.04:v4 } timeout: 0.25 variables: XRAY_PROFILE: "supported ./pvpExceptions.json" commands: + # Remove ValidationExceptions.json and its .meta file if they exist. For this specific test it's necessary (otherwise we want to keep them since we use those for release). + - rm -f com.unity.netcode.gameobjects/ValidationExceptions.json + - rm -f com.unity.netcode.gameobjects/ValidationExceptions.json.meta + - upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages - upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results - - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing + - upm-pvp require "$XRAY_PROFILE" --results pvp-results --allow-missing artifacts: logs: paths: @@ -47,4 +47,3 @@ package_pack_-_ngo_{{ platform.name }}: packages: paths: - "upm-ci~/**" -{% endfor -%} diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml index 0e6cda0da5..3394bdc2a0 100644 --- a/.yamato/package-tests.yml +++ b/.yamato/package-tests.yml @@ -9,7 +9,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops through: # 1. For all desktop platforms (Windows, Ubuntu, macOS) - # 2. For all supported Unity Editor versions (for NGOv1.X this means 2021.3+ editors) + # 2. For all supported Unity Editor versions (for NGOv1.X this means 2022.3+ editors) # TECHNICAL CONSIDERATIONS--------------------------------------------------------------- # This job runs in Editor context only (no player builds required) @@ -55,6 +55,6 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: - "pvp-results/*" dependencies: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} {% endfor -%} \ No newline at end of file diff --git a/.yamato/performance-tests.yml b/.yamato/performance-tests.yml index e18b2ff19d..b5e8cea458 100644 --- a/.yamato/performance-tests.yml +++ b/.yamato/performance-tests.yml @@ -9,7 +9,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs configurations are generated using nested loops through: # 1. For all desktop platforms (Windows, Ubuntu, macOS) - # 2. For all supported Unity Editor versions (For NGOv1.X it means 2021.3+) + # 2. For all supported Unity Editor versions (For NGOv1.X it means 2022.3+) # 3. For the default project (project is used only as a context for the build). TODO-comment: if performance tests would be included in projects then we should make an appropriate split. # TECHNICAL CONSIDERATIONS--------------------------------------------------------------- diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index 153f452170..45181874c9 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -10,7 +10,7 @@ # Jobs configurations are generated using nested loops through: # 1. For all projects WITH TESTS (filtered by has_tests flag) (testproject, testproject-tools-interation) [For more info look into project.metafile configuration] # 2. For all desktop platforms (Windows, Ubuntu, macOS) - # 3. For all supported Unity Editor versions (for NGOv1.X this means 2021.3+ editors) + # 3. For all supported Unity Editor versions (for NGOv1.X this means 2022.3+ editors) # TECHNICAL CONSIDERATIONS--------------------------------------------------------------- # This job runs in Editor context only (no player builds is required) diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml index 5b7530ac60..38671cf496 100644 --- a/.yamato/project-updated-dependencies-test.yml +++ b/.yamato/project-updated-dependencies-test.yml @@ -9,7 +9,7 @@ # Jobs configurations are generated using nested loops through: # 1. For all projects (testproject, minimalproject, testproject-tools-integration). # 2. For all desktop platforms (Win, Ubuntu, Mac) - # 3. For all supported editors (For NGOv1.X it means 2021.3+) + # 3. For all supported editors (For NGOv1.X it means 2022.3+) # TECHNICAL CONSIDERATIONS---------------------------------------------------------------- # This job requires successful project packaging before execution (job dependency) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 3046ea0869..313f5a0e2b 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -155,12 +155,11 @@ validation_editors: default: - 6000.2 all: - - 2021.3 - 2022.3 - 6000.0 - 6000.2 minimal: - - 2021.3 + - 2022.3 # Scripting backends used by Standalone RunTimeTests--------------------------------------------------- diff --git a/.yamato/webgl-build.yml b/.yamato/webgl-build.yml index ae2eb84e58..8abca34c5f 100644 --- a/.yamato/webgl-build.yml +++ b/.yamato/webgl-build.yml @@ -10,7 +10,7 @@ # Jobs configurations are generated using nested loops through: # 1. For the default project (project is used only as a context for the build). # 2. For all desktop platforms (Windows, Ubuntu, macOS) - # 3. For all supported Unity Editor versions (For NGOv1.X it means 2021.3+) + # 3. For all supported Unity Editor versions (For NGOv1.X it means 2022.3+) # TECHNICAL CONSIDERATIONS---------------------------------------------------------------- # WebGL requires IL2CPP scripting backend (Mono is not supported) diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index c2200f1dc6..305607dfb1 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -3,24 +3,24 @@ all_api_validation_jobs: name: All API Validation Jobs dependencies: - - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2021_3_-_windows + - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_windows -# upm-ci validation tests for API Validation - netcode.gameobjects - 2021.3 - windows (2021.3 - Windows). -api_validation_-_netcode_gameobjects_-_2021_3_-_windows: - name: API Validation - netcode.gameobjects - 2021.3 - windows +# upm-ci validation tests for API Validation - netcode.gameobjects - 2022.3 - windows (2022.3 - Windows). +api_validation_-_netcode_gameobjects_-_2022_3_-_windows: + name: API Validation - netcode.gameobjects - 2022.3 - 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 2021.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - command: python PythonScripts/PackageJsonCondersor.py @@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index f6b8dcded8..2a93f65be6 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index db6b918f9c..575b7a2a27 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -5,9 +5,6 @@ all_preview_apv_jobs: name: All Preview APV Jobs dependencies: - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2021_3_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2021_3_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2021_3_-_windows - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_windows @@ -19,170 +16,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - -# Functional tests for dependents found in the latest 2021.3 manifest (MacOS). -preview_apv_-_2021_3_-_macos: - name: Preview APV - 2021.3 - 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/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=2021.3 --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - -# Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu). -preview_apv_-_2021_3_-_ubuntu: - name: Preview APV - 2021.3 - ubuntu - agent: - image: package-ci/ubuntu-20.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/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=2021.3 --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - -# Functional tests for dependents found in the latest 2021.3 manifest (Windows). -preview_apv_-_2021_3_-_windows: - name: Preview APV - 2021.3 - 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/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=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=2021.3 --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS). preview_apv_-_2022_3_-_macos: @@ -192,7 +26,7 @@ preview_apv_-_2022_3_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -233,10 +67,10 @@ preview_apv_-_2022_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). preview_apv_-_2022_3_-_ubuntu: @@ -246,7 +80,7 @@ preview_apv_-_2022_3_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -287,10 +121,10 @@ preview_apv_-_2022_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Windows). preview_apv_-_2022_3_-_windows: @@ -301,7 +135,7 @@ preview_apv_-_2022_3_-_windows: 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -342,10 +176,10 @@ preview_apv_-_2022_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -355,7 +189,7 @@ preview_apv_-_6000_0_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -396,10 +230,10 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: @@ -409,7 +243,7 @@ preview_apv_-_6000_0_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -450,10 +284,10 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -464,7 +298,7 @@ preview_apv_-_6000_0_-_windows: 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -505,10 +339,10 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS). preview_apv_-_6000_2_-_macos: @@ -518,7 +352,7 @@ preview_apv_-_6000_2_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -559,10 +393,10 @@ preview_apv_-_6000_2_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu). preview_apv_-_6000_2_-_ubuntu: @@ -572,7 +406,7 @@ preview_apv_-_6000_2_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -613,10 +447,10 @@ preview_apv_-_6000_2_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (Windows). preview_apv_-_6000_2_-_windows: @@ -627,7 +461,7 @@ preview_apv_-_6000_2_-_windows: 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -668,8 +502,8 @@ preview_apv_-_6000_2_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index b2dfd346e7..5ab794c414 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -26,36 +26,6 @@ publish_dry_run_netcode_gameobjects: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos specific_options: UTR: @@ -148,10 +118,10 @@ publish_dry_run_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -161,7 +131,7 @@ publish_netcode_gameobjects: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 @@ -178,36 +148,6 @@ publish_netcode_gameobjects: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-2021.3-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-2021.3-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos specific_options: UTR: @@ -300,8 +240,8 @@ publish_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 971de08eee..62a520dcbd 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index ee0ebea037..521e877109 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -1,204 +1,6 @@ # Auto-generated by Recipe Engine, do not modify manually. # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2021.3 - macos (2021.3 - MacOS). -validate_-_netcode_gameobjects_-_2021_3_-_macos: - name: Validate - netcode.gameobjects - 2021.3 - 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2021.3 - ubuntu (2021.3 - Ubuntu). -validate_-_netcode_gameobjects_-_2021_3_-_ubuntu: - name: Validate - netcode.gameobjects - 2021.3 - ubuntu - agent: - image: package-ci/ubuntu-20.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2021.3 - windows (2021.3 - Windows). -validate_-_netcode_gameobjects_-_2021_3_-_windows: - name: Validate - netcode.gameobjects - 2021.3 - 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-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 2021.3/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --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.1.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 - labels: - - Packages:netcode.gameobjects - # PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - macos (2022.3 - MacOS). validate_-_netcode_gameobjects_-_2022_3_-_macos: name: Validate - netcode.gameobjects - 2022.3 - macos @@ -207,14 +9,14 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 2022.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -258,10 +60,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -273,14 +75,14 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 2022.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -324,10 +126,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -339,14 +141,14 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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 2022.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -390,10 +192,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -405,14 +207,14 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -456,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -471,14 +273,14 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -522,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -537,14 +339,14 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -588,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -603,14 +405,14 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -654,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -669,14 +471,14 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -720,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects @@ -735,14 +537,14 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip + - 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" --unity .Editor + - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor timeout: 10 retries: 1 - command: echo No internal packages to add. @@ -786,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.1.2.0 + UPMPVP_CONTEXT_WRENCH: 1.2.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.1.2.0 + Wrench: 1.2.0.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index e7109080ff..0b17741928 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -24,14 +24,14 @@ ], "jobs_to_monitor": { "com.unity.netcode.gameobjects": [ - ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2021_3_-_windows", + ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_windows", ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs", ".yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects" ] }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "1.1.2.0", + "wrench_version": "1.2.0.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/NGO.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj index e7661d4bc1..32894c081a 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -9,10 +9,10 @@ - + - + diff --git a/Tools/scripts/ReleaseAutomation/release_config.py b/Tools/scripts/ReleaseAutomation/release_config.py index e9d40387ba..de2085d016 100644 --- a/Tools/scripts/ReleaseAutomation/release_config.py +++ b/Tools/scripts/ReleaseAutomation/release_config.py @@ -33,7 +33,7 @@ class ReleaseConfig: def __init__(self): self.manifest_path = 'com.unity.netcode.gameobjects/package.json' self.changelog_path = 'com.unity.netcode.gameobjects/CHANGELOG.md' - self.validation_exceptions_path = './ValidationExceptions.json' + self.validation_exceptions_path = 'com.unity.netcode.gameobjects/ValidationExceptions.json' self.github_repo = 'Unity-Technologies/com.unity.netcode.gameobjects' self.default_repo_branch = 'develop' # Changelog and package version change will be pushed to this branch self.yamato_project_id = '1201' diff --git a/Tools/scripts/Utils/verifyReleaseConditions.py b/Tools/scripts/Utils/verifyReleaseConditions.py index 61b7a050ef..e1f3d0a8c6 100644 --- a/Tools/scripts/Utils/verifyReleaseConditions.py +++ b/Tools/scripts/Utils/verifyReleaseConditions.py @@ -40,11 +40,17 @@ def is_release_date(weekday, release_week_cycle, anchor_date): return weeks_since_anchor % release_week_cycle == 0 -def is_changelog_empty(changelog_path): +# Note that exceptions parameter can include changelog entries that are not considered "meaningful". +# That means that if Changelog consists ONLY of these entries, it is still considered empty. +def is_changelog_empty(changelog_path, exceptions=None): """ Checks if the [Unreleased] section in the CHANGELOG.md contains meaningful entries. It is considered "empty" if the section only contains headers (like ### Added) but no actual content. """ + + if exceptions is None: + exceptions = [] + if not os.path.exists(changelog_path): raise FileNotFoundError(f"Changelog file not found at {changelog_path}") @@ -55,11 +61,28 @@ def is_changelog_empty(changelog_path): # Then it matches in the first group all empty sections (only lines that are empty or start with ##) # The second group matches the start of the next Changelog entry (## [). # if both groups are matched it means that the Unreleased section is empty. - pattern = re.compile(r"^## \[Unreleased\]\n((?:^###.*\n|^\s*\n)*)(^## \[)", re.MULTILINE) - match = pattern.search(content) - - # If we find a match for the "empty unreleased changelog entry" pattern, it means the changelog IS empty. - return match + unreleased_match = re.search(r"^## \[Unreleased\][ \t]*\n((?:.*\n)*?)(?=^## \[)", content, re.MULTILINE) + + if not unreleased_match: + print("Could not find [Unreleased] section in the changelog.") + return True # No [Unreleased] section found, treat as empty + + unreleased_content = unreleased_match.group(1) + # Split into lines and filter out headers and empty lines + entries = [line.strip() for line in unreleased_content.splitlines() + if line.strip() and not line.strip().startswith("###")] + + # If no entries, changelog is empty + if not entries: + print("The [Unreleased] section in the changelog is empty.") + return True + + # If all entries are in exceptions, changelog is empty + if all(entry in exceptions for entry in entries): + print("The [Unreleased] section in the changelog has no meaningful entries (only exceptions).") + return True + + return False def verifyReleaseConditions(config: ReleaseConfig): @@ -72,12 +95,15 @@ def verifyReleaseConditions(config: ReleaseConfig): """ error_messages = [] + exceptions = [ + "* Changed minimum Unity version supported to 2022.3 LTS" + ] try: if not is_release_date(config.release_weekday, config.release_week_cycle, config.anchor_date): error_messages.append(f"Condition not met: Today is not the scheduled release day. It should be weekday: {config.release_weekday}, every {config.release_week_cycle} weeks starting from {config.anchor_date}.") - if is_changelog_empty(config.changelog_path): + if is_changelog_empty(config.changelog_path, exceptions): error_messages.append("Condition not met: The [Unreleased] section of the changelog has no meaningful entries.") if config.github_manager.is_branch_present(config.release_branch_name): diff --git a/Tools/scripts/release.py b/Tools/scripts/release.py index f448dc861d..8533f4bff7 100644 --- a/Tools/scripts/release.py +++ b/Tools/scripts/release.py @@ -41,7 +41,7 @@ def make_package_release_ready(manifest_path, changelog_path, validation_excepti if __name__ == '__main__': manifest_path = 'com.unity.netcode.gameobjects/package.json' changelog_path = 'com.unity.netcode.gameobjects/CHANGELOG.md' - validation_exceptions_path = './ValidationExceptions.json' + validation_exceptions_path = 'com.unity.netcode.gameobjects/ValidationExceptions.json' package_version = get_package_version_from_manifest(manifest_path) make_package_release_ready(manifest_path, changelog_path, validation_exceptions_path, package_version) diff --git a/ValidationExceptions.json b/ValidationExceptions.json deleted file mode 100644 index c6b271631e..0000000000 --- a/ValidationExceptions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "ErrorExceptions": [], - "WarningExceptions": [] -} diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index 8b37ead2a4..d6270dadca 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -13,6 +13,7 @@ Additional documentation and release notes are available at [Multiplayer Documen ### Changed +* Changed minimum Unity version supported to 2022.3 LTS ### Deprecated diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs deleted file mode 100644 index 474ce75eae..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs +++ /dev/null @@ -1,308 +0,0 @@ -#if UNITY_UNET_PRESENT -#pragma warning disable 618 // disable is obsolete -#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member -using System; -using UnityEngine; -using UnityEngine.Networking; - -namespace Unity.Netcode.Transports.UNET -{ - [AddComponentMenu("Netcode/UNet Transport")] - public class UNetTransport : NetworkTransport - { - public enum SendMode - { - Immediately, - Queued - } - - private int m_UnreliableChannelId; - private int m_UnreliableSequencedChannelId; - private int m_ReliableChannelId; - private int m_ReliableSequencedChannelId; - private int m_ReliableFragmentedSequencedChannelId; - - // Inspector / settings - public int MessageBufferSize = 1024 * 5; - public int MaxConnections = 100; - public int MaxSentMessageQueueSize = 128; - - public string ConnectAddress = "127.0.0.1"; - public int ConnectPort = 7777; - public int ServerListenPort = 7777; - - public SendMode MessageSendMode = SendMode.Immediately; - - // Runtime / state - private byte[] m_MessageBuffer; - private WeakReference m_TemporaryBufferReference; - - // Lookup / translation - private int m_ServerConnectionId; - private int m_ServerHostId; - - public override ulong ServerClientId => GetNetcodeClientId(0, 0, true); - - internal NetworkManager NetworkManager; - - protected void LateUpdate() - { - if (UnityEngine.Networking.NetworkTransport.IsStarted && MessageSendMode == SendMode.Queued) - { -#if UNITY_WEBGL - Debug.LogError("Cannot use queued sending mode for WebGL"); -#else - if (NetworkManager != null && NetworkManager.IsServer) - { - foreach (var targetClient in NetworkManager.Singleton.ConnectedClientsList) - { - SendQueued(targetClient.ClientId); - } - } - else - { - SendQueued(NetworkManager.Singleton.LocalClientId); - } -#endif - } - } - - public override void Send(ulong clientId, ArraySegment payload, NetworkDelivery networkDelivery) - { - GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId); - - byte[] buffer; - if (payload.Offset > 0) - { - // UNET cant handle this, do a copy - - if (m_MessageBuffer.Length >= payload.Count) - { - buffer = m_MessageBuffer; - } - else - { - object bufferRef; - if (m_TemporaryBufferReference != null && ((bufferRef = m_TemporaryBufferReference.Target) != null) && ((byte[])bufferRef).Length >= payload.Count) - { - buffer = (byte[])bufferRef; - } - else - { - buffer = new byte[payload.Count]; - m_TemporaryBufferReference = new WeakReference(buffer); - } - } - - Buffer.BlockCopy(payload.Array, payload.Offset, buffer, 0, payload.Count); - } - else - { - buffer = payload.Array; - } - - int channelId = -1; - switch (networkDelivery) - { - case NetworkDelivery.Unreliable: - channelId = m_UnreliableChannelId; - break; - case NetworkDelivery.UnreliableSequenced: - channelId = m_UnreliableSequencedChannelId; - break; - case NetworkDelivery.Reliable: - channelId = m_ReliableChannelId; - break; - case NetworkDelivery.ReliableSequenced: - channelId = m_ReliableSequencedChannelId; - break; - case NetworkDelivery.ReliableFragmentedSequenced: - channelId = m_ReliableFragmentedSequencedChannelId; - break; - } - - if (MessageSendMode == SendMode.Queued) - { -#if UNITY_WEBGL - Debug.LogError("Cannot use queued sending mode for WebGL"); -#else - UnityEngine.Networking.NetworkTransport.QueueMessageForSending(hostId, connectionId, channelId, buffer, payload.Count, out byte error); -#endif - } - else - { - UnityEngine.Networking.NetworkTransport.Send(hostId, connectionId, channelId, buffer, payload.Count, out byte error); - } - } - -#if !UNITY_WEBGL - private void SendQueued(ulong clientId) - { - GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId); - - UnityEngine.Networking.NetworkTransport.SendQueuedMessages(hostId, connectionId, out _); - } -#endif - - public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment payload, out float receiveTime) - { - var eventType = UnityEngine.Networking.NetworkTransport.Receive(out int hostId, out int connectionId, out _, m_MessageBuffer, m_MessageBuffer.Length, out int receivedSize, out byte error); - - clientId = GetNetcodeClientId((byte)hostId, (ushort)connectionId, false); - receiveTime = NetworkManager.RealTimeProvider.RealTimeSinceStartup; - - var networkError = (NetworkError)error; - if (networkError == NetworkError.MessageToLong) - { - byte[] tempBuffer; - - if (m_TemporaryBufferReference != null && m_TemporaryBufferReference.IsAlive && ((byte[])m_TemporaryBufferReference.Target).Length >= receivedSize) - { - tempBuffer = (byte[])m_TemporaryBufferReference.Target; - } - else - { - tempBuffer = new byte[receivedSize]; - m_TemporaryBufferReference = new WeakReference(tempBuffer); - } - - eventType = UnityEngine.Networking.NetworkTransport.Receive(out hostId, out connectionId, out _, tempBuffer, tempBuffer.Length, out receivedSize, out error); - payload = new ArraySegment(tempBuffer, 0, receivedSize); - } - else - { - payload = new ArraySegment(m_MessageBuffer, 0, receivedSize); - } - - if (networkError == NetworkError.Timeout) - { - // In UNET. Timeouts are not disconnects. We have to translate that here. - eventType = NetworkEventType.DisconnectEvent; - } - - // Translate NetworkEventType to NetEventType - switch (eventType) - { - case NetworkEventType.DataEvent: - return NetworkEvent.Data; - case NetworkEventType.ConnectEvent: - return NetworkEvent.Connect; - case NetworkEventType.DisconnectEvent: - return NetworkEvent.Disconnect; - case NetworkEventType.BroadcastEvent: - case NetworkEventType.Nothing: - default: - return NetworkEvent.Nothing; - } - } - - public override bool StartClient() - { - m_ServerHostId = UnityEngine.Networking.NetworkTransport.AddHost(new HostTopology(GetConfig(), 1), 0, null); - m_ServerConnectionId = UnityEngine.Networking.NetworkTransport.Connect(m_ServerHostId, ConnectAddress, GetConnectPort(), 0, out byte error); - return (NetworkError)error == NetworkError.Ok; - } - - public override bool StartServer() - { - var topology = new HostTopology(GetConfig(), MaxConnections); - // Undocumented, but AddHost returns -1 in case of any type of failure. See UNET::NetLibraryManager::AddHost - return -1 != UnityEngine.Networking.NetworkTransport.AddHost(topology, GetServerListenPort(), null); - } - - public override void DisconnectRemoteClient(ulong clientId) - { - GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId); - - UnityEngine.Networking.NetworkTransport.Disconnect(hostId, connectionId, out byte error); - } - - public override void DisconnectLocalClient() - { - UnityEngine.Networking.NetworkTransport.Disconnect(m_ServerHostId, m_ServerConnectionId, out byte error); - } - - public override ulong GetCurrentRtt(ulong clientId) - { - GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId); - - return (ulong)UnityEngine.Networking.NetworkTransport.GetCurrentRTT(hostId, connectionId, out byte error); - } - - public override void Shutdown() - { - UnityEngine.Networking.NetworkTransport.Shutdown(); - } - - public override void Initialize(NetworkManager networkManager = null) - { - NetworkManager = networkManager; - - m_MessageBuffer = new byte[MessageBufferSize]; - - UnityEngine.Networking.NetworkTransport.Init(); - } - - private ulong GetNetcodeClientId(byte hostId, ushort connectionId, bool isServer) - { - if (isServer) - { - return 0; - } - - return (connectionId | (ulong)hostId << 16) + 1; - } - - private void GetUNetConnectionDetails(ulong clientId, out byte hostId, out ushort connectionId) - { - if (clientId == 0) - { - hostId = (byte)m_ServerHostId; - connectionId = (ushort)m_ServerConnectionId; - } - else - { - hostId = (byte)((clientId - 1) >> 16); - connectionId = (ushort)((clientId - 1)); - } - } - - private ConnectionConfig GetConfig() - { - var connectionConfig = new ConnectionConfig(); - - m_UnreliableChannelId = connectionConfig.AddChannel(QosType.Unreliable); - m_UnreliableSequencedChannelId = connectionConfig.AddChannel(QosType.UnreliableSequenced); - m_ReliableChannelId = connectionConfig.AddChannel(QosType.Reliable); - m_ReliableSequencedChannelId = connectionConfig.AddChannel(QosType.ReliableSequenced); - m_ReliableFragmentedSequencedChannelId = connectionConfig.AddChannel(QosType.ReliableFragmentedSequenced); - - connectionConfig.MaxSentMessageQueueSize = (ushort)MaxSentMessageQueueSize; - - return connectionConfig; - } - - private int GetConnectPort() - { - if (NetworkManager && NetworkManager.PortOverride.Overidden) - { - return NetworkManager.PortOverride.Value; - } - - return ConnectPort; - } - - private int GetServerListenPort() - { - if (NetworkManager && NetworkManager.PortOverride.Overidden) - { - return NetworkManager.PortOverride.Value; - } - - return ServerListenPort; - } - } -} -#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member -#pragma warning restore 618 // restore is obsolete -#endif diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs.meta deleted file mode 100644 index 6af193fde7..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b84c2d8dfe509a34fb59e2b81f8e1319 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef index 2f2005a1cb..8b5704f8c4 100644 --- a/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef +++ b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef @@ -22,11 +22,6 @@ "expression": "", "define": "MULTIPLAYER_TOOLS" }, - { - "name": "Unity", - "expression": "(0,2022.2.0a5)", - "define": "UNITY_UNET_PRESENT" - }, { "name": "com.unity.multiplayer.tools", "expression": "1.0.0-pre.7", diff --git a/com.unity.netcode.gameobjects/ValidationExceptions.json b/com.unity.netcode.gameobjects/ValidationExceptions.json new file mode 100644 index 0000000000..23aea8e278 --- /dev/null +++ b/com.unity.netcode.gameobjects/ValidationExceptions.json @@ -0,0 +1,10 @@ +{ + "ErrorExceptions": [ + { + "ValidationTest": "API Validation", + "ExceptionMessage": "Breaking changes require a new major version.", + "PackageVersion": "1.15.0" + } + ], + "WarningExceptions": [] +} diff --git a/com.unity.netcode.gameobjects/ValidationExceptions.json.meta b/com.unity.netcode.gameobjects/ValidationExceptions.json.meta new file mode 100644 index 0000000000..9f41e5383c --- /dev/null +++ b/com.unity.netcode.gameobjects/ValidationExceptions.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6a50dca79ee8064eaaadd00dab584ce +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index c6433006cd..8bb029f2c7 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -2,11 +2,11 @@ "name": "com.unity.netcode.gameobjects", "displayName": "Netcode for GameObjects", "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.", - "version": "1.14.2", - "unity": "2021.3", + "version": "1.15.0", + "unity": "2022.3", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.transport": "1.5.0" }, "samples": [ { diff --git a/minimalproject/Assets/DefaultNetworkPrefabs.asset b/minimalproject/Assets/DefaultNetworkPrefabs.asset new file mode 100644 index 0000000000..0b6f21b5e9 --- /dev/null +++ b/minimalproject/Assets/DefaultNetworkPrefabs.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3} + m_Name: DefaultNetworkPrefabs + m_EditorClassIdentifier: + IsDefault: 1 + List: [] diff --git a/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta b/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta new file mode 100644 index 0000000000..c2ddcd703e --- /dev/null +++ b/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f13d1673f0b7b294199e47148c9b2a2f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index e589852174..74506eef18 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -1,7 +1,7 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.37", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects" }, "testables": [ diff --git a/minimalproject/Packages/packages-lock.json b/minimalproject/Packages/packages-lock.json index de84d1b222..2c61ca625d 100644 --- a/minimalproject/Packages/packages-lock.json +++ b/minimalproject/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.19", "depth": 2, "source": "registry", "dependencies": { @@ -22,11 +22,20 @@ }, "com.unity.ext.nunit": { "version": "1.0.6", - "depth": 4, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.ide.rider": { + "version": "3.0.37", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 2, @@ -39,12 +48,12 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.transport": "1.5.0" } }, "com.unity.nuget.mono-cecil": { - "version": "1.10.1", + "version": "1.11.6", "depth": 1, "source": "registry", "dependencies": {}, diff --git a/minimalproject/ProjectSettings/ProjectVersion.txt b/minimalproject/ProjectSettings/ProjectVersion.txt index 8386a05236..41a11b2d05 100644 --- a/minimalproject/ProjectSettings/ProjectVersion.txt +++ b/minimalproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.45f1 -m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) +m_EditorVersion: 2022.3.61f1 +m_EditorVersionWithRevision: 2022.3.61f1 (6c53ebaf375d) diff --git a/minimalproject/ProjectSettings/boot.config b/minimalproject/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index be21abb21b..83e6fe2207 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -1,12 +1,12 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.37", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "1.1.33", - "com.unity.test-framework.performance": "2.8.0-preview", - "com.unity.transport": "1.5.0", + "com.unity.test-framework": "1.4.6", + "com.unity.test-framework.performance": "3.1.0", + "com.unity.transport": "2.5.3", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/testproject-tools-integration/Packages/packages-lock.json b/testproject-tools-integration/Packages/packages-lock.json index cff16581a8..5c80abefd2 100644 --- a/testproject-tools-integration/Packages/packages-lock.json +++ b/testproject-tools-integration/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.19", "depth": 1, "source": "registry", "dependencies": { @@ -11,24 +11,26 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.2.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.8", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.test-framework.performance": "3.0.2" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.37", "depth": 0, "source": "registry", "dependencies": { @@ -37,7 +39,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -61,12 +63,12 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.transport": "1.5.0" } }, "com.unity.nuget.mono-cecil": { - "version": "1.10.1", + "version": "1.11.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -87,34 +89,34 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.4.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.test-framework.performance": { - "version": "2.8.0-preview", + "version": "3.1.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.0", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.5.0", + "version": "2.5.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.collections": "1.2.4", - "com.unity.mathematics": "1.2.6" + "com.unity.burst": "1.8.12", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.1" }, "url": "https://packages.unity.com" }, @@ -250,17 +252,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/testproject-tools-integration/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset b/testproject-tools-integration/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset new file mode 100644 index 0000000000..0f059e0cd3 --- /dev/null +++ b/testproject-tools-integration/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6762c37d3236e2a4382cd018dcdf221e, type: 3} + m_Name: + m_EditorClassIdentifier: + colors: + m_Keys: + m_Values: [] diff --git a/testproject-tools-integration/ProjectSettings/ProjectSettings.asset b/testproject-tools-integration/ProjectSettings/ProjectSettings.asset index 106944f0cc..996568a06c 100644 --- a/testproject-tools-integration/ProjectSettings/ProjectSettings.asset +++ b/testproject-tools-integration/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: 285f1beddbcafee49afc8151a497821f AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -74,6 +76,8 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -81,10 +85,12 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +125,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +138,9 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -145,16 +152,20 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -172,12 +183,17 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -220,13 +236,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -241,6 +260,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -248,6 +268,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -261,18 +282,112 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -282,7 +397,9 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -295,6 +412,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -302,10 +420,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -379,7 +498,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -421,6 +539,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -431,10 +550,13 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -505,6 +627,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -517,6 +640,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -529,21 +653,41 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -569,11 +713,13 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -614,8 +760,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -623,7 +775,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 - uploadClearedTextureDataAfterCreationFromScript: 0 + insecureHttpOption: 0 diff --git a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt index 8386a05236..41a11b2d05 100644 --- a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt +++ b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.45f1 -m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) +m_EditorVersion: 2022.3.61f1 +m_EditorVersionWithRevision: 2022.3.61f1 (6c53ebaf375d) diff --git a/testproject-tools-integration/ProjectSettings/boot.config b/testproject-tools-integration/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UNET.meta b/testproject/Assets/Scenes/ZooSam.meta similarity index 77% rename from com.unity.netcode.gameobjects/Runtime/Transports/UNET.meta rename to testproject/Assets/Scenes/ZooSam.meta index 44298182e6..716470bede 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UNET.meta +++ b/testproject/Assets/Scenes/ZooSam.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 901256c415b484744b9da9551d85073a +guid: 4273cf127aa72354c95d8308984538f9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index e044d87635..d37058ba4a 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,22 +1,22 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.addressables": "1.21.9", - "com.unity.ai.navigation": "1.1.1", - "com.unity.collab-proxy": "2.6.0", - "com.unity.ide.rider": "3.0.34", + "com.unity.addressables": "1.22.3", + "com.unity.ai.navigation": "1.1.6", + "com.unity.collab-proxy": "2.7.1", + "com.unity.ide.rider": "3.0.37", "com.unity.ide.visualstudio": "2.0.22", "com.unity.mathematics": "1.2.6", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.transport": "1.5.0", "com.unity.package-validation-suite": "0.49.0-preview", "com.unity.services.authentication": "2.7.4", "com.unity.services.core": "1.14.0", "com.unity.services.relay": "1.0.5", "com.unity.test-framework": "1.3.3", - "com.unity.test-framework.performance": "2.8.1-preview", - "com.unity.textmeshpro": "3.0.6", + "com.unity.test-framework.performance": "3.1.0", + "com.unity.textmeshpro": "3.0.7", "com.unity.timeline": "1.8.2", + "com.unity.transport": "1.5.0", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index b6da7ab69b..3b3992d7d9 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.21.9", + "version": "1.22.3", "depth": 0, "source": "registry", "dependencies": { @@ -9,13 +9,13 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.21.3", + "com.unity.scriptablebuildpipeline": "1.21.25", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.1", + "version": "1.1.6", "depth": 0, "source": "registry", "dependencies": { @@ -24,8 +24,8 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", - "depth": 2, + "version": "1.8.21", + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -34,7 +34,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.6.0", + "version": "2.7.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -42,7 +42,7 @@ }, "com.unity.collections": { "version": "1.2.4", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.6.6", @@ -58,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.37", "depth": 0, "source": "registry", "dependencies": { @@ -87,12 +87,12 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.transport": "1.5.0" } }, "com.unity.nuget.mono-cecil": { - "version": "1.10.1", + "version": "1.11.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -115,7 +115,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.3", + "version": "1.21.25", "depth": 1, "source": "registry", "dependencies": {}, @@ -187,17 +187,17 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework.performance": { - "version": "2.8.1-preview", + "version": "3.1.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.0", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -219,7 +219,7 @@ }, "com.unity.transport": { "version": "1.5.0", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": { "com.unity.burst": "1.6.6", @@ -369,17 +369,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/testproject/ProjectSettings/ProjectSettings.asset b/testproject/ProjectSettings/ProjectSettings.asset index 717a85d5e1..b24fb36cf9 100644 --- a/testproject/ProjectSettings/ProjectSettings.asset +++ b/testproject/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 26 productGUID: bba99b16607b94720b7d04f7f1a82989 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000000000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -68,6 +70,14 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -75,10 +85,12 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -113,20 +125,22 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -138,22 +152,26 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: Standalone: com.UnityTechnologies.testproject buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: nimt-trampolines=1024 @@ -166,12 +184,17 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -196,7 +219,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -204,22 +227,26 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: + iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -234,12 +261,15 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: + AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -252,13 +282,105 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - AndroidMinifyWithR8: 0 + chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -275,6 +397,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -310,7 +433,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -326,6 +449,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -335,59 +460,66 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 1 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - switchNMETAOverride: - switchNetLibKey: + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 + switchNMETAOverride: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchTitleNames_15: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchPublisherNames_15: + switchNSODependencies: + switchCompilerFlags: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchTitleNames_15: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -420,19 +552,18 @@ PlayerSettings: switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} switchSmallIcons_15: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: switchMainThreadStackSize: 1048576 - switchPresenceGroupId: + switchPresenceGroupId: switchLogoHandling: 0 switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 - switchApplicationErrorCodeCategory: + switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 @@ -452,14 +583,14 @@ PlayerSettings: switchRatingsInt_10: 0 switchRatingsInt_11: 0 switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 switchAllowsVideoCapturing: 1 @@ -471,6 +602,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -481,40 +613,43 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 @@ -542,9 +677,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -555,22 +690,24 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - monoEnv: + monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -579,39 +716,58 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: - 1: DEBUG_NETWORKTRANSFORM;UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT + Standalone: DEBUG_NETWORKTRANSFORM;UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT additionalCompilerArguments: - 1: + Standalone: - -warnaserror platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 - additionalIl2CppArgs: + additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Template_3D wsaImages: {} - metroTileShortName: + metroTileShortName: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -624,24 +780,26 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -654,8 +812,8 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: Analytics: 0 @@ -667,23 +825,32 @@ PlayerSettings: UNet: 1 Unity Ads: 0 luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: luminCert: - m_CertPath: + m_CertPath: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 - m_VersionName: + m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 - cloudProjectId: + windowsGamepadBackendHint: 0 + cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] projectName: relay-stg organizationId: relay-stg cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt index 8386a05236..b852362343 100644 --- a/testproject/ProjectSettings/ProjectVersion.txt +++ b/testproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.45f1 -m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) +m_EditorVersion: 2022.3.62f2 +m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9)