diff --git a/.gitignore b/.gitignore index 41fc25d7..6a3db807 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ .npmrc .vsconfig packages-lock.json +Tools/CI/bin diff --git a/.yamato/config.metadata b/.yamato/config.metadata index b40e07eb..d2cd2192 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -1,6 +1,5 @@ test_editors: - - version: 2022.3 - version: 6000.0 - version: 6000.3 - - version: 6000.4 + - version: 6000.5 - version: trunk \ No newline at end of file diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 5859a7d6..f98ad97e 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -1,15 +1,20 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_api_validation_jobs: name: All API Validation Jobs dependencies: - - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_android-logcat_-_2021_3_-_windows + - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_android-logcat_-_6000_0_-_win10 -# upm-ci validation tests for API Validation - mobile.android-logcat - 2021.3 - windows (2021.3 - Windows). -api_validation_-_mobile_android-logcat_-_2021_3_-_windows: - name: API Validation - mobile.android-logcat - 2021.3 - windows +# upm-ci validation tests for API Validation - mobile.android-logcat - 6000.0 - win10 (6000.0 - Windows). +api_validation_-_mobile_android-logcat_-_6000_0_-_win10: + name: API Validation - mobile.android-logcat - 6000.0 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -20,7 +25,7 @@ api_validation_-_mobile_android-logcat_-_2021_3_-_windows: - 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 -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - command: python PythonScripts/PackageJsonCondersor.py @@ -55,8 +60,8 @@ api_validation_-_mobile_android-logcat_-_2021_3_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 7adc418e..d9c0b315 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -1,11 +1,16 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Pack Android Logcat package_pack_-_mobile_android-logcat: name: Package Pack - mobile.android-logcat agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -26,5 +31,5 @@ package_pack_-_mobile_android-logcat: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/player-build.yml b/.yamato/wrench/player-build.yml new file mode 100644 index 00000000..045bc445 --- /dev/null +++ b/.yamato/wrench/player-build.yml @@ -0,0 +1,9 @@ +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerBuild +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb +{} + diff --git a/.yamato/wrench/player-test.yml b/.yamato/wrench/player-test.yml new file mode 100644 index 00000000..987c2213 --- /dev/null +++ b/.yamato/wrench/player-test.yml @@ -0,0 +1,9 @@ +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerTest +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb +{} + diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index c68e93da..c69a468f 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -1,34 +1,39 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PreviewAPV # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Parent Preview APV Job. all_preview_apv_jobs: name: All Preview APV Jobs dependencies: - - 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 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_windows + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_win10 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_win10 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_win10 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 2022.3 manifest (MacOS). -preview_apv_-_2022_3_-_macos: - name: Preview APV - 2022.3 - macos +# Functional tests for dependents found in the latest 6000.0 manifest (MacOS). +preview_apv_-_6000_0_-_macos13: + name: Preview APV - 6000.0 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -39,10 +44,10 @@ preview_apv_-_2022_3_-_macos: - 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 2022.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.0/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=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --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 @@ -77,16 +82,16 @@ preview_apv_-_2022_3_-_macos: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). -preview_apv_-_2022_3_-_ubuntu: - name: Preview APV - 2022.3 - ubuntu +# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). +preview_apv_-_6000_0_-_ubuntu2204: + name: Preview APV - 6000.0 - ubuntu2204 agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -97,10 +102,10 @@ preview_apv_-_2022_3_-_ubuntu: - 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 2022.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.0/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=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --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 @@ -135,16 +140,16 @@ preview_apv_-_2022_3_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 2022.3 manifest (Windows). -preview_apv_-_2022_3_-_windows: - name: Preview APV - 2022.3 - windows +# Functional tests for dependents found in the latest 6000.0 manifest (Windows). +preview_apv_-_6000_0_-_win10: + name: Preview APV - 6000.0 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -156,11 +161,11 @@ preview_apv_-_2022_3_-_windows: - 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 2022.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.0/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=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=2022.3 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -194,16 +199,16 @@ preview_apv_-_2022_3_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.0 manifest (MacOS). -preview_apv_-_6000_0_-_macos: - name: Preview APV - 6000.0 - macos +# Functional tests for dependents found in the latest 6000.3 manifest (MacOS). +preview_apv_-_6000_3_-_macos13: + name: Preview APV - 6000.3 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -214,10 +219,10 @@ preview_apv_-_6000_0_-_macos: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.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=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.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 @@ -252,14 +257,14 @@ preview_apv_-_6000_0_-_macos: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). -preview_apv_-_6000_0_-_ubuntu: - name: Preview APV - 6000.0 - ubuntu +# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). +preview_apv_-_6000_3_-_ubuntu2204: + name: Preview APV - 6000.3 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -272,10 +277,10 @@ preview_apv_-_6000_0_-_ubuntu: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.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=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.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 @@ -310,16 +315,16 @@ preview_apv_-_6000_0_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.0 manifest (Windows). -preview_apv_-_6000_0_-_windows: - name: Preview APV - 6000.0 - windows +# Functional tests for dependents found in the latest 6000.3 manifest (Windows). +preview_apv_-_6000_3_-_win10: + name: Preview APV - 6000.3 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -331,11 +336,11 @@ preview_apv_-_6000_0_-_windows: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.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=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -369,16 +374,16 @@ preview_apv_-_6000_0_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.3 manifest (MacOS). -preview_apv_-_6000_3_-_macos: - name: Preview APV - 6000.3 - macos +# Functional tests for dependents found in the latest 6000.4 manifest (MacOS). +preview_apv_-_6000_4_-_macos13: + name: Preview APV - 6000.4 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -389,10 +394,10 @@ preview_apv_-_6000_3_-_macos: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --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 @@ -427,14 +432,14 @@ preview_apv_-_6000_3_-_macos: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). -preview_apv_-_6000_3_-_ubuntu: - name: Preview APV - 6000.3 - ubuntu +# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu). +preview_apv_-_6000_4_-_ubuntu2204: + name: Preview APV - 6000.4 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -447,10 +452,10 @@ preview_apv_-_6000_3_-_ubuntu: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --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 @@ -485,16 +490,16 @@ preview_apv_-_6000_3_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.3 manifest (Windows). -preview_apv_-_6000_3_-_windows: - name: Preview APV - 6000.3 - windows +# Functional tests for dependents found in the latest 6000.4 manifest (Windows). +preview_apv_-_6000_4_-_win10: + name: Preview APV - 6000.4 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -506,11 +511,11 @@ preview_apv_-_6000_3_-_windows: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.4 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -544,16 +549,16 @@ preview_apv_-_6000_3_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.4 manifest (MacOS). -preview_apv_-_6000_4_-_macos: - name: Preview APV - 6000.4 - macos +# Functional tests for dependents found in the latest 6000.5 manifest (MacOS). +preview_apv_-_6000_5_-_macos13: + name: Preview APV - 6000.5 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -564,10 +569,10 @@ preview_apv_-_6000_4_-_macos: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --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 @@ -602,14 +607,14 @@ preview_apv_-_6000_4_-_macos: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu). -preview_apv_-_6000_4_-_ubuntu: - name: Preview APV - 6000.4 - ubuntu +# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). +preview_apv_-_6000_5_-_ubuntu2204: + name: Preview APV - 6000.5 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -622,10 +627,10 @@ preview_apv_-_6000_4_-_ubuntu: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --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 @@ -660,16 +665,16 @@ preview_apv_-_6000_4_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.4 manifest (Windows). -preview_apv_-_6000_4_-_windows: - name: Preview APV - 6000.4 - windows +# Functional tests for dependents found in the latest 6000.5 manifest (Windows). +preview_apv_-_6000_5_-_win10: + name: Preview APV - 6000.5 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -681,11 +686,11 @@ preview_apv_-_6000_4_-_windows: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.4 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -719,16 +724,16 @@ preview_apv_-_6000_4_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.5 manifest (MacOS). -preview_apv_-_6000_5_-_macos: - name: Preview APV - 6000.5 - macos +# Functional tests for dependents found in the latest 6000.6 manifest (MacOS). +preview_apv_-_6000_6_-_macos13: + name: Preview APV - 6000.6 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -742,7 +747,7 @@ preview_apv_-_6000_5_-_macos: - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --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 @@ -777,14 +782,14 @@ preview_apv_-_6000_5_-_macos: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). -preview_apv_-_6000_5_-_ubuntu: - name: Preview APV - 6000.5 - ubuntu +# Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu). +preview_apv_-_6000_6_-_ubuntu2204: + name: Preview APV - 6000.6 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -800,7 +805,7 @@ preview_apv_-_6000_5_-_ubuntu: - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --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 @@ -835,16 +840,16 @@ preview_apv_-_6000_5_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 6000.5 manifest (Windows). -preview_apv_-_6000_5_-_windows: - name: Preview APV - 6000.5 - windows +# Functional tests for dependents found in the latest 6000.6 manifest (Windows). +preview_apv_-_6000_6_-_win10: + name: Preview APV - 6000.6 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -859,8 +864,8 @@ preview_apv_-_6000_5_-_windows: - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.6 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -894,8 +899,8 @@ preview_apv_-_6000_5_-_windows: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 024f823a..4ae3ff71 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PromotionJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Trigger for mobile.android-logcat Custom Checks @@ -13,7 +18,7 @@ mobile_android-logcat_custom_checks: publish_dry_run_mobile_android-logcat: name: Publish Dry Run mobile.android-logcat agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: @@ -34,198 +39,168 @@ publish_dry_run_mobile_android-logcat: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-macos + location: results/pvp/validate-mobile.android-logcat-6000.0-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-macos + location: results/UTR/validate-mobile.android-logcat-6000.0-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.0-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.0-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-windows + location: results/pvp/validate-mobile.android-logcat-6000.0-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-windows + location: results/UTR/validate-mobile.android-logcat-6000.0-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-macos + location: results/pvp/validate-mobile.android-logcat-6000.3-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-macos + location: results/UTR/validate-mobile.android-logcat-6000.3-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.3-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.3-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-windows + location: results/pvp/validate-mobile.android-logcat-6000.3-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-windows + location: results/UTR/validate-mobile.android-logcat-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-macos + location: results/pvp/validate-mobile.android-logcat-6000.4-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-macos + location: results/UTR/validate-mobile.android-logcat-6000.4-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.4-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.4-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-windows + location: results/pvp/validate-mobile.android-logcat-6000.4-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-windows + location: results/UTR/validate-mobile.android-logcat-6000.4-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-macos + location: results/pvp/validate-mobile.android-logcat-6000.5-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-macos + location: results/UTR/validate-mobile.android-logcat-6000.5-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.5-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.5-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-windows + location: results/pvp/validate-mobile.android-logcat-6000.5-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-windows + location: results/UTR/validate-mobile.android-logcat-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-macos + location: results/pvp/validate-mobile.android-logcat-6000.6-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-macos + location: results/UTR/validate-mobile.android-logcat-6000.6-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.6-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.6-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-windows + location: results/pvp/validate-mobile.android-logcat-6000.6-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-windows - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_macos - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-macos - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-macos - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_ubuntu - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-ubuntu - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-ubuntu - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_windows - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-windows - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-windows + location: results/UTR/validate-mobile.android-logcat-6000.6-win10 unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 # Publish for mobile.android-logcat to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_mobile_android-logcat: name: Publish mobile.android-logcat agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: @@ -246,190 +221,160 @@ publish_mobile_android-logcat: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_macos - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-macos - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-macos - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_ubuntu - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-ubuntu - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-ubuntu - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2021_3_-_windows - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.android-logcat-2021.3-windows - unzip: true - UTR: - location: results/UTR/validate-mobile.android-logcat-2021.3-windows - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-macos + location: results/pvp/validate-mobile.android-logcat-6000.0-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-macos + location: results/UTR/validate-mobile.android-logcat-6000.0-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.0-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.0-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_2022_3_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-2022.3-windows + location: results/pvp/validate-mobile.android-logcat-6000.0-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-2022.3-windows + location: results/UTR/validate-mobile.android-logcat-6000.0-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-macos + location: results/pvp/validate-mobile.android-logcat-6000.3-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-macos + location: results/UTR/validate-mobile.android-logcat-6000.3-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.3-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.3-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_0_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.0-windows + location: results/pvp/validate-mobile.android-logcat-6000.3-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.0-windows + location: results/UTR/validate-mobile.android-logcat-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-macos + location: results/pvp/validate-mobile.android-logcat-6000.4-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-macos + location: results/UTR/validate-mobile.android-logcat-6000.4-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.4-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.4-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_3_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.3-windows + location: results/pvp/validate-mobile.android-logcat-6000.4-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.3-windows + location: results/UTR/validate-mobile.android-logcat-6000.4-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-macos + location: results/pvp/validate-mobile.android-logcat-6000.5-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-macos + location: results/UTR/validate-mobile.android-logcat-6000.5-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.5-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.5-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_4_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.4-windows + location: results/pvp/validate-mobile.android-logcat-6000.5-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.4-windows + location: results/UTR/validate-mobile.android-logcat-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_macos + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-macos + location: results/pvp/validate-mobile.android-logcat-6000.6-macos13 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-macos + location: results/UTR/validate-mobile.android-logcat-6000.6-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_ubuntu + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-ubuntu + location: results/pvp/validate-mobile.android-logcat-6000.6-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-ubuntu + location: results/UTR/validate-mobile.android-logcat-6000.6-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_5_-_windows + - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_android-logcat_-_6000_6_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-mobile.android-logcat-6000.5-windows + location: results/pvp/validate-mobile.android-logcat-6000.6-win10 unzip: true UTR: - location: results/UTR/validate-mobile.android-logcat-6000.5-windows + location: results/UTR/validate-mobile.android-logcat-6000.6-win10 unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml index 65082a10..8dc838f6 100644 --- a/.yamato/wrench/publish-trigger.yml +++ b/.yamato/wrench/publish-trigger.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PublishTrigger # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_promotion_related_jobs_promotiontrigger: name: All Promotion Related Jobs PromotionTrigger diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 34bbd599..d7602473 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -1,11 +1,16 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.RecipeRegeneration # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Test that Generated Wrench Jobs are up to date. test_-_wrench_jobs_up_to_date: name: Test - Wrench Jobs up to date agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -26,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 7d093538..b0517e10 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -1,11 +1,16 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ValidationJobs # 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 - mobile.android-logcat - 2021.3 - macos (2021.3 - MacOS). -validate_-_mobile_android-logcat_-_2021_3_-_macos: - name: Validate - mobile.android-logcat - 2021.3 - macos +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - macos13 (6000.0 - MacOS). +validate_-_mobile_android-logcat_-_6000_0_-_macos13: + name: Validate - mobile.android-logcat - 6000.0 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -13,212 +18,8 @@ validate_-_mobile_android-logcat_-_2021_3_-_macos: - 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 -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - 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: echo No additional PVP profiles to declared to check. - - command: 'UnifiedTestRunner --testproject=test-mobile.android-logcat --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 20 - 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/**/* - - test-mobile.android-logcat/Logs/** - - test-mobile.android-logcat/Library/*.log - - test-mobile.android-logcat/*.log - - test-mobile.android-logcat/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 - labels: - - Packages:mobile.android-logcat - -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 2021.3 - ubuntu (2021.3 - Ubuntu). -validate_-_mobile_android-logcat_-_2021_3_-_ubuntu: - name: Validate - mobile.android-logcat - 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-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 2021.3 -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - 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: echo No additional PVP profiles to declared to check. - - command: 'UnifiedTestRunner --testproject=test-mobile.android-logcat --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 20 - 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/**/* - - test-mobile.android-logcat/Logs/** - - test-mobile.android-logcat/Library/*.log - - test-mobile.android-logcat/*.log - - test-mobile.android-logcat/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 - labels: - - Packages:mobile.android-logcat - -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 2021.3 - windows (2021.3 - Windows). -validate_-_mobile_android-logcat_-_2021_3_-_windows: - name: Validate - mobile.android-logcat - 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-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 2021.3 -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - 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: echo No additional PVP profiles to declared to check. - - command: 'UnifiedTestRunner.exe --testproject=test-mobile.android-logcat --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' + - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast timeout: 20 - 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/**/* - - test-mobile.android-logcat/Logs/** - - test-mobile.android-logcat/Library/*.log - - test-mobile.android-logcat/*.log - - test-mobile.android-logcat/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 - labels: - - Packages:mobile.android-logcat - -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 2022.3 - macos (2022.3 - MacOS). -validate_-_mobile_android-logcat_-_2022_3_-_macos: - name: Validate - mobile.android-logcat - 2022.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-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 test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -266,18 +67,18 @@ validate_-_mobile_android-logcat_-_2022_3_-_macos: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 2022.3 - ubuntu (2022.3 - Ubuntu). -validate_-_mobile_android-logcat_-_2022_3_-_ubuntu: - name: Validate - mobile.android-logcat - 2022.3 - ubuntu +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - ubuntu2204 (6000.0 - Ubuntu). +validate_-_mobile_android-logcat_-_6000_0_-_ubuntu2204: + name: Validate - mobile.android-logcat - 6000.0 - ubuntu2204 agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -285,8 +86,8 @@ validate_-_mobile_android-logcat_-_2022_3_-_ubuntu: - 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 + - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -334,18 +135,18 @@ validate_-_mobile_android-logcat_-_2022_3_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 2022.3 - windows (2022.3 - Windows). -validate_-_mobile_android-logcat_-_2022_3_-_windows: - name: Validate - mobile.android-logcat - 2022.3 - windows +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - win10 (6000.0 - Windows). +validate_-_mobile_android-logcat_-_6000_0_-_win10: + name: Validate - mobile.android-logcat - 6000.0 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -353,8 +154,8 @@ validate_-_mobile_android-logcat_-_2022_3_-_windows: - 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 + - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -402,18 +203,18 @@ validate_-_mobile_android-logcat_-_2022_3_-_windows: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - macos (6000.0 - MacOS). -validate_-_mobile_android-logcat_-_6000_0_-_macos: - name: Validate - mobile.android-logcat - 6000.0 - macos +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - macos13 (6000.3 - MacOS). +validate_-_mobile_android-logcat_-_6000_3_-_macos13: + name: Validate - mobile.android-logcat - 6000.3 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -421,8 +222,8 @@ validate_-_mobile_android-logcat_-_6000_0_-_macos: - 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 + - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -470,16 +271,16 @@ validate_-_mobile_android-logcat_-_6000_0_-_macos: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - ubuntu (6000.0 - Ubuntu). -validate_-_mobile_android-logcat_-_6000_0_-_ubuntu: - name: Validate - mobile.android-logcat - 6000.0 - ubuntu +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - ubuntu2204 (6000.3 - Ubuntu). +validate_-_mobile_android-logcat_-_6000_3_-_ubuntu2204: + name: Validate - mobile.android-logcat - 6000.3 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -489,8 +290,8 @@ validate_-_mobile_android-logcat_-_6000_0_-_ubuntu: - 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 + - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -538,18 +339,18 @@ validate_-_mobile_android-logcat_-_6000_0_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.0 - windows (6000.0 - Windows). -validate_-_mobile_android-logcat_-_6000_0_-_windows: - name: Validate - mobile.android-logcat - 6000.0 - windows +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - win10 (6000.3 - Windows). +validate_-_mobile_android-logcat_-_6000_3_-_win10: + name: Validate - mobile.android-logcat - 6000.3 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -557,8 +358,8 @@ validate_-_mobile_android-logcat_-_6000_0_-_windows: - 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 + - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -606,18 +407,18 @@ validate_-_mobile_android-logcat_-_6000_0_-_windows: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - macos (6000.3 - MacOS). -validate_-_mobile_android-logcat_-_6000_3_-_macos: - name: Validate - mobile.android-logcat - 6000.3 - macos +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - macos13 (6000.4 - MacOS). +validate_-_mobile_android-logcat_-_6000_4_-_macos13: + name: Validate - mobile.android-logcat - 6000.4 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -625,8 +426,8 @@ validate_-_mobile_android-logcat_-_6000_3_-_macos: - 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.3/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -674,16 +475,16 @@ validate_-_mobile_android-logcat_-_6000_3_-_macos: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - ubuntu (6000.3 - Ubuntu). -validate_-_mobile_android-logcat_-_6000_3_-_ubuntu: - name: Validate - mobile.android-logcat - 6000.3 - ubuntu +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - ubuntu2204 (6000.4 - Ubuntu). +validate_-_mobile_android-logcat_-_6000_4_-_ubuntu2204: + name: Validate - mobile.android-logcat - 6000.4 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -693,8 +494,8 @@ validate_-_mobile_android-logcat_-_6000_3_-_ubuntu: - 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.3/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -742,18 +543,18 @@ validate_-_mobile_android-logcat_-_6000_3_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.3 - windows (6000.3 - Windows). -validate_-_mobile_android-logcat_-_6000_3_-_windows: - name: Validate - mobile.android-logcat - 6000.3 - windows +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - win10 (6000.4 - Windows). +validate_-_mobile_android-logcat_-_6000_4_-_win10: + name: Validate - mobile.android-logcat - 6000.4 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -761,8 +562,8 @@ validate_-_mobile_android-logcat_-_6000_3_-_windows: - 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.3/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -810,18 +611,18 @@ validate_-_mobile_android-logcat_-_6000_3_-_windows: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - macos (6000.4 - MacOS). -validate_-_mobile_android-logcat_-_6000_4_-_macos: - name: Validate - mobile.android-logcat - 6000.4 - macos +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - macos13 (6000.5 - MacOS). +validate_-_mobile_android-logcat_-_6000_5_-_macos13: + name: Validate - mobile.android-logcat - 6000.5 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -829,8 +630,8 @@ validate_-_mobile_android-logcat_-_6000_4_-_macos: - 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.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -878,16 +679,16 @@ validate_-_mobile_android-logcat_-_6000_4_-_macos: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - ubuntu (6000.4 - Ubuntu). -validate_-_mobile_android-logcat_-_6000_4_-_ubuntu: - name: Validate - mobile.android-logcat - 6000.4 - ubuntu +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - ubuntu2204 (6000.5 - Ubuntu). +validate_-_mobile_android-logcat_-_6000_5_-_ubuntu2204: + name: Validate - mobile.android-logcat - 6000.5 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -897,8 +698,8 @@ validate_-_mobile_android-logcat_-_6000_4_-_ubuntu: - 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.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -946,18 +747,18 @@ validate_-_mobile_android-logcat_-_6000_4_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.4 - windows (6000.4 - Windows). -validate_-_mobile_android-logcat_-_6000_4_-_windows: - name: Validate - mobile.android-logcat - 6000.4 - windows +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - win10 (6000.5 - Windows). +validate_-_mobile_android-logcat_-_6000_5_-_win10: + name: Validate - mobile.android-logcat - 6000.5 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -965,8 +766,8 @@ validate_-_mobile_android-logcat_-_6000_4_-_windows: - 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.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -1014,18 +815,18 @@ validate_-_mobile_android-logcat_-_6000_4_-_windows: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - macos (6000.5 - MacOS). -validate_-_mobile_android-logcat_-_6000_5_-_macos: - name: Validate - mobile.android-logcat - 6000.5 - macos +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.6 - macos13 (6000.6 - MacOS). +validate_-_mobile_android-logcat_-_6000_6_-_macos13: + name: Validate - mobile.android-logcat - 6000.6 - macos13 agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: @@ -1034,7 +835,7 @@ validate_-_mobile_android-logcat_-_6000_5_-_macos: - 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 trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -1082,16 +883,16 @@ validate_-_mobile_android-logcat_-_6000_5_-_macos: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - ubuntu (6000.5 - Ubuntu). -validate_-_mobile_android-logcat_-_6000_5_-_ubuntu: - name: Validate - mobile.android-logcat - 6000.5 - ubuntu +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.6 - ubuntu2204 (6000.6 - Ubuntu). +validate_-_mobile_android-logcat_-_6000_6_-_ubuntu2204: + name: Validate - mobile.android-logcat - 6000.6 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -1102,7 +903,7 @@ validate_-_mobile_android-logcat_-_6000_5_-_ubuntu: - 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 trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -1150,18 +951,18 @@ validate_-_mobile_android-logcat_-_6000_5_-_ubuntu: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat -# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.5 - windows (6000.5 - Windows). -validate_-_mobile_android-logcat_-_6000_5_-_windows: - name: Validate - mobile.android-logcat - 6000.5 - windows +# PVP Editor and Playmode tests for Validate - mobile.android-logcat - 6000.6 - win10 (6000.6 - Windows). +validate_-_mobile_android-logcat_-_6000_6_-_win10: + name: Validate - mobile.android-logcat - 6000.6 - win10 agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: @@ -1170,7 +971,7 @@ validate_-_mobile_android-logcat_-_6000_5_-_windows: - 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 trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-mobile.android-logcat --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.android-logcat com.unity.mobile.android-logcat.tests" --unity .Editor timeout: 10 @@ -1218,10 +1019,10 @@ validate_-_mobile_android-logcat_-_6000_5_-_windows: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.4.8.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.4.8.0 + Wrench: 2.6.0.0 labels: - Packages:mobile.android-logcat diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 326d2e87..bcd3015e 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -5,16 +5,23 @@ "directory": "com.unity.mobile.android-logcat/", "prePackCommands": [], "preTestCommands": { - "MacOS": [], - "Ubuntu": [], - "Windows": [] + "MacOs13": [], + "MacOs13Arm": [], + "Ubuntu1804": [], + "Ubuntu2004": [], + "Ubuntu2204": [], + "Win10": [], + "Win10GPU": [], + "Win11": [], + "Win11Arm": [], + "Win11GPU": [] }, "InternalOnly": false, "NeverPublish": false, "MaxEditorVersion": "", "coverageEnabled": false, "coverageCommands": [ - "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" + "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;" ], "dependantsToIgnoreInPreviewApv": {}, "postPackCommands": [] @@ -25,7 +32,7 @@ ], "jobs_to_monitor": { "com.unity.mobile.android-logcat": [ - ".yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_android-logcat_-_2021_3_-_windows", + ".yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_android-logcat_-_6000_0_-_win10", ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs", ".yamato/wrench/promotion-jobs.yml#mobile_android-logcat_custom_checks", ".yamato/wrench/promotion-jobs.yml#publish_dry_run_mobile_android-logcat" @@ -33,7 +40,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_mobile_android-logcat", "branch_pattern": "ReleaseSlash", - "wrench_version": "1.4.8.0", + "wrench_version": "2.6.0.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/UnityMobileLogcat.Cookbook.csproj" } \ No newline at end of file diff --git a/TestProjects/ForceCrash/Packages/manifest.json b/TestProjects/ForceCrash/Packages/manifest.json index aba109c0..ef5d70f1 100644 --- a/TestProjects/ForceCrash/Packages/manifest.json +++ b/TestProjects/ForceCrash/Packages/manifest.json @@ -1,46 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.2", - "com.unity.ide.rider": "3.0.15", - "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.vscode": "1.2.5", + "com.unity.ide.rider": "3.0.39", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.mobile.android-logcat": "file:../../../com.unity.mobile.android-logcat", - "com.unity.test-framework": "1.1.31", - "com.unity.test-framework.performance": "1.3.3-preview", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", - "com.unity.ugui": "1.0.0", - "com.unity.modules.ai": "1.0.0", + "com.unity.test-framework": "1.6.0", + "com.unity.ugui": "2.0.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.uielements": "1.0.0" }, "testables": [ "com.unity.mobile.android-logcat", diff --git a/TestProjects/ForceCrash/ProjectSettings/MemorySettings.asset b/TestProjects/ForceCrash/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/ForceCrash/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/TestProjects/ForceCrash/ProjectSettings/PackageManagerSettings.asset b/TestProjects/ForceCrash/ProjectSettings/PackageManagerSettings.asset index be4a7974..b2527462 100644 --- a/TestProjects/ForceCrash/ProjectSettings/PackageManagerSettings.asset +++ b/TestProjects/ForceCrash/ProjectSettings/PackageManagerSettings.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 0 - m_EnablePackageDependencies: 0 + m_EnablePreReleasePackages: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 1 m_Registries: - m_Id: main m_Name: @@ -24,20 +26,15 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 + m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -896 + m_OriginalInstanceId: -898 + m_LoadAssets: 0 diff --git a/TestProjects/ForceCrash/ProjectSettings/ProjectVersion.txt b/TestProjects/ForceCrash/ProjectSettings/ProjectVersion.txt index 7f075db3..ba577c5b 100644 --- a/TestProjects/ForceCrash/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/ForceCrash/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.40f1 -m_EditorVersionWithRevision: 2020.3.40f1 (ef997aeef7ca) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/TestProjects/InputTests/Packages/manifest.json b/TestProjects/InputTests/Packages/manifest.json index 3e0eed5a..21a7bd41 100644 --- a/TestProjects/InputTests/Packages/manifest.json +++ b/TestProjects/InputTests/Packages/manifest.json @@ -1,41 +1,14 @@ { "dependencies": { - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.inputsystem": "1.6.2", + "com.unity.ide.visualstudio": "2.0.27", + "com.unity.inputsystem": "1.19.0", "com.unity.mobile.android-logcat": "file:../../../com.unity.mobile.android-logcat", - "com.unity.package-manager-doctools": "1.1.1-preview.5", - "com.unity.test-framework": "1.3.7", - "com.unity.modules.ai": "1.0.0", + "com.unity.package-manager-doctools": "3.14.7-preview", + "com.unity.test-framework": "1.6.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.uielements": "1.0.0" }, "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "testables": [ diff --git a/TestProjects/InputTests/ProjectSettings/ProjectVersion.txt b/TestProjects/InputTests/ProjectSettings/ProjectVersion.txt index 9eb947de..ba577c5b 100644 --- a/TestProjects/InputTests/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/InputTests/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.2.0a18 -m_EditorVersionWithRevision: 2023.2.0a18 (06ed1d5f1502) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/TestProjects/MemoryTests/Assets/MemoryAllocations.cs b/TestProjects/MemoryTests/Assets/MemoryAllocations.cs index d97ac823..f4a74ffb 100644 --- a/TestProjects/MemoryTests/Assets/MemoryAllocations.cs +++ b/TestProjects/MemoryTests/Assets/MemoryAllocations.cs @@ -47,14 +47,17 @@ void Start() throw new Exception("Failed to find com.unity3d.player.JavaMemory"); Application.lowMemory += () => Log("Application.lowMemory called"); -#if UNITY_2022_3_OR_NEWER - Application.memoryUsageChanged += (in ApplicationMemoryUsageChange usage) => Log($"Application.memoryUsageChanged called with usage: {usage.memoryUsage}"); -#endif + Application.memoryUsageChanged += OnMemoryUsageChanged; + } + + void OnDestroy() + { + Application.memoryUsageChanged -= OnMemoryUsageChanged; } - // Update is called once per frame - void Update() + void OnMemoryUsageChanged(in ApplicationMemoryUsageChange usage) { + Log($"Application.memoryUsageChanged called with usage: {usage.memoryUsage}"); } private static void Log(string message) diff --git a/TestProjects/MemoryTests/Packages/manifest.json b/TestProjects/MemoryTests/Packages/manifest.json index 918a30c3..ecfb7ecb 100644 --- a/TestProjects/MemoryTests/Packages/manifest.json +++ b/TestProjects/MemoryTests/Packages/manifest.json @@ -1,47 +1,15 @@ { "dependencies": { - "com.unity.collab-proxy": "2.3.1", - "com.unity.ide.rider": "3.0.28", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.39", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.ide.vscode": "1.2.5", "com.unity.mobile.android-logcat": "file:../../../com.unity.mobile.android-logcat", - "com.unity.test-framework": "1.1.33", - "com.unity.test-framework.performance": "1.3.3-preview", - "com.unity.textmeshpro": "3.0.6", - "com.unity.modules.ai": "1.0.0", + "com.unity.test-framework": "1.6.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.imgui": "1.0.0" }, "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "testables": [ - "com.unity.mobile.android-logcat", - "com.unity.test-framework.performance" + "com.unity.mobile.android-logcat" ] } diff --git a/TestProjects/MemoryTests/ProjectSettings/MemorySettings.asset b/TestProjects/MemoryTests/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/MemoryTests/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/TestProjects/MemoryTests/ProjectSettings/PackageManagerSettings.asset b/TestProjects/MemoryTests/ProjectSettings/PackageManagerSettings.asset index 8e5b2583..df23c39f 100644 --- a/TestProjects/MemoryTests/ProjectSettings/PackageManagerSettings.asset +++ b/TestProjects/MemoryTests/ProjectSettings/PackageManagerSettings.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 0 - m_EnablePackageDependencies: 0 + m_EnablePreReleasePackages: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 1 m_Registries: - m_Id: main m_Name: @@ -24,20 +26,15 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 0 + m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -892 + m_OriginalInstanceId: -894 + m_LoadAssets: 0 diff --git a/TestProjects/MemoryTests/ProjectSettings/ProjectVersion.txt b/TestProjects/MemoryTests/ProjectSettings/ProjectVersion.txt index c45af135..ba577c5b 100644 --- a/TestProjects/MemoryTests/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/MemoryTests/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.37f1 -m_EditorVersionWithRevision: 2021.3.37f1 (3b6005ad5ad6) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/TestProjects/SampleProject1/Packages/manifest.json b/TestProjects/SampleProject1/Packages/manifest.json index aa7d6fbd..a30c799a 100644 --- a/TestProjects/SampleProject1/Packages/manifest.json +++ b/TestProjects/SampleProject1/Packages/manifest.json @@ -1,9 +1,9 @@ { "dependencies": { - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.mobile.android-logcat": "file:../../../com.unity.mobile.android-logcat", - "com.unity.package-manager-doctools": "1.1.1-preview.5", - "com.unity.test-framework": "1.1.33" + "com.unity.package-manager-doctools": "3.14.7-preview", + "com.unity.test-framework": "1.6.0" }, "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "testables": [ diff --git a/TestProjects/SampleProject1/ProjectSettings/MemorySettings.asset b/TestProjects/SampleProject1/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/SampleProject1/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/TestProjects/SampleProject1/ProjectSettings/ProjectVersion.txt b/TestProjects/SampleProject1/ProjectSettings/ProjectVersion.txt index c45af135..f2af5208 100644 --- a/TestProjects/SampleProject1/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/SampleProject1/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.37f1 -m_EditorVersionWithRevision: 2021.3.37f1 (3b6005ad5ad6) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (cffd6ff00b65) diff --git a/TestProjects/TestWarnings/Assets/Scenes/SampleScene.unity b/TestProjects/TestWarnings/Assets/Scenes/SampleScene.unity index 7cdec2a0..91b0cf7b 100644 --- a/TestProjects/TestWarnings/Assets/Scenes/SampleScene.unity +++ b/TestProjects/TestWarnings/Assets/Scenes/SampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,24 +38,22 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -63,13 +61,11 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -77,26 +73,36 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: 2c574eb25488bd44ab2f90c6f3e9aced, + type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 102dc6a16c6026a438d87008f9c1911b, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -109,7 +115,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -117,7 +125,8 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 705507995} @@ -133,15 +142,17 @@ GameObject: Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 11 m_Type: 1 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -151,6 +162,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -158,32 +187,43 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 963194228} @@ -200,24 +240,35 @@ GameObject: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_Enabled: 1 --- !u!20 &963194227 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -248,12 +299,20 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} diff --git a/TestProjects/TestWarnings/Packages/manifest.json b/TestProjects/TestWarnings/Packages/manifest.json index ff0e7ecc..181f1fe4 100644 --- a/TestProjects/TestWarnings/Packages/manifest.json +++ b/TestProjects/TestWarnings/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { - "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ext.nunit": "2.0.5", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.mobile.android-logcat": "file:../../../com.unity.mobile.android-logcat", - "com.unity.test-framework": "1.1.31", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework": "1.6.0", + "com.unity.ugui": "2.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/TestProjects/TestWarnings/ProjectSettings/MemorySettings.asset b/TestProjects/TestWarnings/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/TestWarnings/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/TestProjects/TestWarnings/ProjectSettings/ProjectSettings.asset b/TestProjects/TestWarnings/ProjectSettings/ProjectSettings.asset index af824918..b52215ae 100644 --- a/TestProjects/TestWarnings/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/TestWarnings/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 16 + serializedVersion: 28 productGUID: 5a0a859107272ed4781000f8d657715d AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,13 +48,17 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 0 - iosAllowHTTPDownload: 1 + iosUseCustomAppBackgroundBehavior: 0 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -65,18 +69,30 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 + androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 + androidResizeableActivity: 1 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 + androidApplicationEntry: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 - captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -84,7 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - graphicsJobs: 0 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -92,7 +108,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -105,6 +120,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -112,13 +128,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -127,42 +150,29 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: {} - buildNumber: {} + buildNumber: + Standalone: 0 + VisionOS: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -172,37 +182,26 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -221,7 +220,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -229,36 +227,54 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 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 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@2.3.3 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -268,9 +284,106 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 200 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - 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_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_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -287,16 +400,63 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: PS5Player + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreXboxOneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreScarlettSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: VisionOSPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: CloudRendering + m_GraphicsJobs: 0 + - m_BuildTarget: EmbeddedLinux + m_GraphicsJobs: 0 + - m_BuildTarget: QNX + m_GraphicsJobs: 0 + - m_BuildTarget: Kepler + m_GraphicsJobs: 0 + - m_BuildTarget: Switch2 + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 @@ -306,7 +466,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR - m_BuildTargetEnableVuforiaSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -316,24 +477,35 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -349,6 +521,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -364,6 +537,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -379,6 +553,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -394,6 +569,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -403,7 +579,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -425,6 +600,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -444,6 +620,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -454,7 +631,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 + switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -481,6 +665,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -506,6 +691,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -522,15 +708,21 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -539,21 +731,57 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 + webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 0 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} + managedStrippingLevel: + Android: 1 + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Kepler: 1 + Nintendo Switch: 1 + Nintendo Switch 2: 1 + PS4: 1 + PS5: 1 + QNX: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D @@ -578,11 +806,13 @@ PlayerSettings: 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: @@ -601,18 +831,16 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -626,19 +854,26 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 + hmiPlayerDataPath: + hmiForceSRGBBlit: 0 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} + activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 + virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/TestProjects/TestWarnings/ProjectSettings/ProjectVersion.txt b/TestProjects/TestWarnings/ProjectSettings/ProjectVersion.txt index 7f075db3..ba577c5b 100644 --- a/TestProjects/TestWarnings/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/TestWarnings/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.40f1 -m_EditorVersionWithRevision: 2020.3.40f1 (ef997aeef7ca) +m_EditorVersion: 6000.0.72f1 +m_EditorVersionWithRevision: 6000.0.72f1 (b731fd3ae857) diff --git a/TestProjects/TestWarnings/ProjectSettings/UnityConnectSettings.asset b/TestProjects/TestWarnings/ProjectSettings/UnityConnectSettings.asset index fa0b1465..5ef56984 100644 --- a/TestProjects/TestWarnings/ProjectSettings/UnityConnectSettings.asset +++ b/TestProjects/TestWarnings/ProjectSettings/UnityConnectSettings.asset @@ -9,10 +9,15 @@ UnityConnectSettings: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 + InsightsSettings: + m_EngineDiagnosticsEnabled: 0 + m_Enabled: 0 CrashReportingSettings: + serializedVersion: 2 m_EventUrl: https://perf-events.cloud.unity3d.com - m_Enabled: 0 + m_EnableCloudDiagnosticsReporting: 0 m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: @@ -22,6 +27,7 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 m_InitializeOnStartup: 1 + m_PackageRequiringCoreStatsPresent: 0 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 diff --git a/Tools/CI/UnityMobileLogcat.Cookbook.csproj b/Tools/CI/UnityMobileLogcat.Cookbook.csproj index 87de8b37..944ed1a6 100644 --- a/Tools/CI/UnityMobileLogcat.Cookbook.csproj +++ b/Tools/CI/UnityMobileLogcat.Cookbook.csproj @@ -9,7 +9,7 @@ - + diff --git a/com.unity.mobile.android-logcat/CHANGELOG.md b/com.unity.mobile.android-logcat/CHANGELOG.md index 695492c4..cfe34db8 100644 --- a/com.unity.mobile.android-logcat/CHANGELOG.md +++ b/com.unity.mobile.android-logcat/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Changes & Improvements: + - Unity 6.0 or later is required. + ## [1.4.7] - 2025-12-12 ### Fixes & Improvements - Periodic device queries no longer occur when no devices are connected and Logcat window is unfocused. diff --git a/com.unity.mobile.android-logcat/Editor/AndroidLogcatLayoutViewerWindow.cs b/com.unity.mobile.android-logcat/Editor/AndroidLogcatLayoutViewerWindow.cs index 77bc7800..aacd5d1c 100644 --- a/com.unity.mobile.android-logcat/Editor/AndroidLogcatLayoutViewerWindow.cs +++ b/com.unity.mobile.android-logcat/Editor/AndroidLogcatLayoutViewerWindow.cs @@ -17,7 +17,6 @@ internal static void ShowWindow() window.Show(); } -#if UNITY_2022_3_OR_NEWER const string Name = nameof(Name); const string Value = nameof(Value); @@ -398,11 +397,5 @@ void DoLayoutImage() AndroidLogcatUtilities.DrawRectangle(rc, 3, Color.black); AndroidLogcatUtilities.DrawRectangle(rc, 2, Color.red); } -#else - public void OnGUI() - { - EditorGUILayout.HelpBox("Layout Viewer requires Unity 2022.3 or higher.", MessageType.Error); - } -#endif } } diff --git a/com.unity.mobile.android-logcat/package.json b/com.unity.mobile.android-logcat/package.json index 897afdb1..08e91d96 100644 --- a/com.unity.mobile.android-logcat/package.json +++ b/com.unity.mobile.android-logcat/package.json @@ -1,8 +1,8 @@ { "name": "com.unity.mobile.android-logcat", "displayName": "Android Logcat", - "version": "1.4.7", - "unity": "2021.3", + "version": "1.5.0", + "unity": "6000.0", "description": "Android Logcat package provides support for:\n - Android log messages\n - Android application memory statistics\n - Input injection\n - Android Screen Capture\n - Android Screen Recorder\n - Stacktrace Utility\n\nClick the 'View documentation' link above for more information.\n\nThe window can be accessed in Unity Editor via 'Window > Analysis > Android Logcat', or simply by pressing 'Alt+6' on Windows or 'Option+6' on macOS. \n\nMake sure to have Android module loaded and switch to Android build target in 'Build Settings' window if the menu doesn't exist.", "keywords": ["Mobile", "Android", "Logcat"], "dependencies": {