diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index e26aee97..b6b4801a 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -4,8 +4,6 @@ test_editors: - version: 6000.4 - version: 6000.3 - version: 6000.0 - - version: 2022.3 - - version: 2021.3 artifactory: production: https://artifactory.prd.it.unity3d.com/artifactory/api/ diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index e2cf3d47..9bd078ff 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -8,11 +8,11 @@ all_api_validation_jobs: name: All API Validation Jobs dependencies: - - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_notifications_-_2021_3_-_win10 + - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_notifications_-_6000_0_-_win10 -# upm-ci validation tests for API Validation - mobile.notifications - 2021.3 - win10 (2021.3 - Windows). -api_validation_-_mobile_notifications_-_2021_3_-_win10: - name: API Validation - mobile.notifications - 2021.3 - win10 +# upm-ci validation tests for API Validation - mobile.notifications - 6000.0 - win10 (6000.0 - Windows). +api_validation_-_mobile_notifications_-_6000_0_-_win10: + name: API Validation - mobile.notifications - 6000.0 - win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -25,7 +25,7 @@ api_validation_-_mobile_notifications_-_2021_3_-_win10: - 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 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 1f835ede..f5e8fd5a 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -10,9 +10,6 @@ all_preview_apv_jobs: name: All Preview APV Jobs dependencies: - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos13 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu1804 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_win10 - 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 @@ -32,181 +29,6 @@ all_preview_apv_jobs: Job Maintainers: '#rm-packageworks' Wrench: 2.6.0.0 -# Functional tests for dependents found in the latest 2022.3 manifest (MacOS). -preview_apv_-_2022_3_-_macos13: - name: Preview APV - 2022.3 - macos13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 2022.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=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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_CONTEXT_WRENCH: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - -# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). -preview_apv_-_2022_3_-_ubuntu1804: - name: Preview APV - 2022.3 - ubuntu1804 - agent: - image: package-ci/ubuntu-18.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 2022.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=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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_CONTEXT_WRENCH: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - -# Functional tests for dependents found in the latest 2022.3 manifest (Windows). -preview_apv_-_2022_3_-_win10: - name: Preview APV - 2022.3 - win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 2022.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=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 - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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_CONTEXT_WRENCH: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: name: Preview APV - 6000.0 - macos13 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 24475539..0caa81d3 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -39,66 +39,6 @@ publish_dry_run_mobile_notifications: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-macos13 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_ubuntu1804 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-ubuntu1804 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-ubuntu1804 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-win10 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-win10 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-macos13 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_ubuntu1804 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-ubuntu1804 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-ubuntu1804 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-win10 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-win10 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_6000_0_-_macos13 specific_options: packages: @@ -281,66 +221,6 @@ publish_mobile_notifications: browsable: onNonSuccess dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-macos13 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_ubuntu1804 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-ubuntu1804 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-ubuntu1804 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2021_3_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2021.3-win10 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2021.3-win10 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-macos13 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_ubuntu1804 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-ubuntu1804 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-ubuntu1804 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_2022_3_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-mobile.notifications-2022.3-win10 - unzip: true - UTR: - location: results/UTR/validate-mobile.notifications-2022.3-win10 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_mobile_notifications_-_6000_0_-_macos13 specific_options: packages: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 1edc9a7c..9cb32adf 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -6,414 +6,6 @@ # 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.notifications - 2021.3 - macos13 (2021.3 - MacOS). -validate_-_mobile_notifications_-_2021_3_-_macos13: - name: Validate - mobile.notifications - 2021.3 - macos13 - agent: - image: package-ci/macos-13:v4 - 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 2021.3 -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - -# PVP Editor and Playmode tests for Validate - mobile.notifications - 2021.3 - ubuntu1804 (2021.3 - Ubuntu). -validate_-_mobile_notifications_-_2021_3_-_ubuntu1804: - name: Validate - mobile.notifications - 2021.3 - ubuntu1804 - agent: - image: package-ci/ubuntu-18.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 2021.3 -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - -# PVP Editor and Playmode tests for Validate - mobile.notifications - 2021.3 - win10 (2021.3 - Windows). -validate_-_mobile_notifications_-_2021_3_-_win10: - name: Validate - mobile.notifications - 2021.3 - win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 2021.3 -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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: .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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - -# PVP Editor and Playmode tests for Validate - mobile.notifications - 2022.3 - macos13 (2022.3 - MacOS). -validate_-_mobile_notifications_-_2022_3_-_macos13: - name: Validate - mobile.notifications - 2022.3 - macos13 - agent: - image: package-ci/macos-13:v4 - 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: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - -# PVP Editor and Playmode tests for Validate - mobile.notifications - 2022.3 - ubuntu1804 (2022.3 - Ubuntu). -validate_-_mobile_notifications_-_2022_3_-_ubuntu1804: - name: Validate - mobile.notifications - 2022.3 - ubuntu1804 - agent: - image: package-ci/ubuntu-18.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - -# PVP Editor and Playmode tests for Validate - mobile.notifications - 2022.3 - win10 (2022.3 - Windows). -validate_-_mobile_notifications_-_2022_3_-_win10: - name: Validate - mobile.notifications - 2022.3 - win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-mobile.notifications --packages "upm-ci~/packages/*.tgz" --filter "com.unity.mobile.notifications com.unity.mobile.notifications.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.notifications --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: .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.notifications/Logs/** - - test-mobile.notifications/Library/*.log - - test-mobile.notifications/*.log - - test-mobile.notifications/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications - 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: 2.6.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.6.0.0 - labels: - - Packages:mobile.notifications - # PVP Editor and Playmode tests for Validate - mobile.notifications - 6000.0 - macos13 (6000.0 - MacOS). validate_-_mobile_notifications_-_6000_0_-_macos13: name: Validate - mobile.notifications - 6000.0 - macos13 diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index e45b66f3..ff66c6e9 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -32,7 +32,7 @@ ], "jobs_to_monitor": { "com.unity.mobile.notifications": [ - ".yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_notifications_-_2021_3_-_win10", + ".yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_notifications_-_6000_0_-_win10", ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs", ".yamato/wrench/promotion-jobs.yml#mobile_notifications_custom_checks", ".yamato/wrench/promotion-jobs.yml#publish_dry_run_mobile_notifications" diff --git a/TestProjects/AndroidBigPicture/ProjectSettings/MemorySettings.asset b/TestProjects/AndroidBigPicture/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/AndroidBigPicture/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/AndroidBigPicture/ProjectSettings/ProjectSettings.asset b/TestProjects/AndroidBigPicture/ProjectSettings/ProjectSettings.asset index 26a0719a..922cef12 100644 --- a/TestProjects/AndroidBigPicture/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/AndroidBigPicture/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 28 productGUID: b1ca14412cc96a245afc6c2a7f73f460 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,17 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -67,24 +70,29 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 - androidResizableWindow: 0 + androidResizeableActivity: 0 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 @@ -92,6 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -119,21 +128,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -145,23 +153,27 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: com.unity.AndroidBigPicture buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 21 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 aotOptions: @@ -171,15 +183,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -204,7 +221,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -212,22 +228,25 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: 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 @@ -242,16 +261,21 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 1 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -261,12 +285,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -377,6 +401,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -428,6 +453,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -437,11 +464,18 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 01000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -449,6 +483,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -456,9 +491,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -532,7 +569,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -574,6 +610,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -584,12 +621,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -673,6 +712,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -685,25 +725,53 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 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: Android: 1 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 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D @@ -727,6 +795,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -774,8 +843,16 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 0 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -783,4 +860,9 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/TestProjects/AndroidBigPicture/ProjectSettings/ProjectVersion.txt b/TestProjects/AndroidBigPicture/ProjectSettings/ProjectVersion.txt index 1d617241..54bf3c3c 100644 --- a/TestProjects/AndroidBigPicture/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/AndroidBigPicture/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.41f1 -m_EditorVersionWithRevision: 2020.3.41f1 (7c19dc9acfda) +m_EditorVersion: 6000.0.73f1 +m_EditorVersionWithRevision: 6000.0.73f1 (3ad55a55f786) diff --git a/TestProjects/AndroidBigPicture/UserSettings/EditorUserSettings.asset b/TestProjects/AndroidBigPicture/UserSettings/EditorUserSettings.asset index b5434559..1e2ea958 100644 --- a/TestProjects/AndroidBigPicture/UserSettings/EditorUserSettings.asset +++ b/TestProjects/AndroidBigPicture/UserSettings/EditorUserSettings.asset @@ -5,6 +5,12 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + QuickInstaller_com.unity.purchasing_installRecorded: + value: 2550581500 + flags: 0 + QuickInstaller_com.unity.services.levelplay_installRecorded: + value: 2550581500 + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 @@ -16,9 +22,15 @@ EditorUserSettings: m_VCDebugCmd: 0 m_VCDebugOut: 0 m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 9 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 m_VCShowFailedCheckout: 1 m_VCOverwriteFailedCheckoutAssets: 1 m_VCProjectOverlayIcons: 1 m_VCHierarchyOverlayIcons: 1 m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 1 + m_VCScanLocalPackagesOnConnect: 1 + m_ArtifactGarbageCollection: 1 + m_CompressAssetsOnImport: 1 diff --git a/TestProjects/AutomatedTests/Packages/manifest.json b/TestProjects/AutomatedTests/Packages/manifest.json index 91a8d01d..d222ce63 100644 --- a/TestProjects/AutomatedTests/Packages/manifest.json +++ b/TestProjects/AutomatedTests/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.mobile.notifications": "file:../../../com.unity.mobile.notifications", - "com.unity.test-framework": "1.4.6", + "com.unity.test-framework": "1.6.0", "com.unity.modules.androidjni": "1.0.0" }, "testables": [ diff --git a/TestProjects/AutomatedTests/ProjectSettings/ProjectSettings.asset b/TestProjects/AutomatedTests/ProjectSettings/ProjectSettings.asset index 414d42d7..3f5e4cab 100644 --- a/TestProjects/AutomatedTests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/AutomatedTests/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 28 productGUID: 51bd1fb8f600544bead0aac3f4947961 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,17 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -67,24 +70,29 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 - androidResizableWindow: 0 + androidResizeableActivity: 0 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 @@ -92,6 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -119,21 +128,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -146,22 +154,26 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + androidMinAspectRatio: 1 + applicationIdentifier: + Android: com.DefaultCompany.AutomatedTests buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -171,15 +183,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -204,7 +221,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -212,7 +228,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -222,13 +237,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -243,16 +261,21 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -262,12 +285,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -441,13 +464,27 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Android + - serializedVersion: 2 + m_BuildTarget: Android m_EncodingQuality: 1 - - m_BuildTarget: iPhone + - serializedVersion: 2 + m_BuildTarget: iOS m_EncodingQuality: 1 - - m_BuildTarget: tvOS + - serializedVersion: 2 + m_BuildTarget: tvOS + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - serializedVersion: 2 + m_BuildTarget: Android + m_EncodingQuality: 1 + - serializedVersion: 2 + m_BuildTarget: iOS + m_EncodingQuality: 1 + - serializedVersion: 2 + m_BuildTarget: tvOS m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: - m_BuildTarget: Android m_Encoding: 1 @@ -456,11 +493,13 @@ PlayerSettings: - m_BuildTarget: tvOS m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - - m_BuildTarget: Android - m_Format: 3 + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 03000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -468,6 +507,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -475,10 +515,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -552,7 +593,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -594,6 +634,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -604,13 +645,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -694,6 +736,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -706,25 +749,53 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 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 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D @@ -748,6 +819,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -795,7 +867,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: @@ -805,6 +884,9 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/TestProjects/AutomatedTests/ProjectSettings/ProjectVersion.txt b/TestProjects/AutomatedTests/ProjectSettings/ProjectVersion.txt index eabd6337..54bf3c3c 100644 --- a/TestProjects/AutomatedTests/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/AutomatedTests/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 6000.0.73f1 +m_EditorVersionWithRevision: 6000.0.73f1 (3ad55a55f786) diff --git a/TestProjects/AutomatedTests/UserSettings/EditorUserSettings.asset b/TestProjects/AutomatedTests/UserSettings/EditorUserSettings.asset index e93947f9..4b585262 100644 --- a/TestProjects/AutomatedTests/UserSettings/EditorUserSettings.asset +++ b/TestProjects/AutomatedTests/UserSettings/EditorUserSettings.asset @@ -5,6 +5,12 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + QuickInstaller_com.unity.purchasing_installRecorded: + value: 2550581500 + flags: 0 + QuickInstaller_com.unity.services.levelplay_installRecorded: + value: 2550581500 + flags: 0 RecentlyUsedSceneGuid-0: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 @@ -25,4 +31,6 @@ EditorUserSettings: m_VCHierarchyOverlayIcons: 1 m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 1 + m_VCScanLocalPackagesOnConnect: 1 m_ArtifactGarbageCollection: 1 + m_CompressAssetsOnImport: 1 diff --git a/TestProjects/Main/Packages/manifest.json b/TestProjects/Main/Packages/manifest.json index 91a30577..b2444e76 100644 --- a/TestProjects/Main/Packages/manifest.json +++ b/TestProjects/Main/Packages/manifest.json @@ -1,8 +1,8 @@ { "dependencies": { "com.unity.mobile.notifications": "file:../../../com.unity.mobile.notifications", - "com.unity.test-framework": "1.4.6", - "com.unity.ugui": "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.imgui": "1.0.0", diff --git a/TestProjects/Main/ProjectSettings/MemorySettings.asset b/TestProjects/Main/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/TestProjects/Main/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/Main/ProjectSettings/ProjectSettings.asset b/TestProjects/Main/ProjectSettings/ProjectSettings.asset index ee90ca33..7df36480 100644 --- a/TestProjects/Main/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/Main/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 28 productGUID: 1d0e3e38f643446188bf094310026640 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +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 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -67,18 +70,29 @@ PlayerSettings: 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: 0 - 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 @@ -86,6 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -113,20 +128,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -138,23 +153,28 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: com.unity3d.mobilenotificationtests iPhone: com.unity3d.mobilenotificationtests buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 21 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: nimt-trampolines=1024 @@ -164,15 +184,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -197,7 +222,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -205,22 +229,25 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: Z6SFPV59E3 iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -235,15 +262,21 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -253,11 +286,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: - m_BuildTarget: m_Icons: @@ -472,6 +506,7 @@ PlayerSettings: - m_BuildTarget: iPhone m_StaticBatching: 1 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -516,7 +551,12 @@ PlayerSettings: - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 + - m_BuildTarget: AndroidPlayer + m_APIs: 0b000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -526,17 +566,26 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 01000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 cameraUsageDescription: Required for augmented reality support. locationUsageDescription: Required to enable location triggering for notifications. microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -544,9 +593,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -620,7 +671,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -662,6 +712,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -672,8 +723,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -744,6 +801,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -756,6 +814,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -768,6 +827,18 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 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: @@ -775,20 +846,36 @@ PlayerSettings: scriptingBackend: Android: 1 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 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: iPhone: 3 + editorAssembliesCompatibilityLevel: 2 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: ios_notification_test_env copy 2 @@ -813,11 +900,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: @@ -858,8 +947,16 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 0 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -867,4 +964,9 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/TestProjects/Main/ProjectSettings/ProjectVersion.txt b/TestProjects/Main/ProjectSettings/ProjectVersion.txt index eabd6337..54bf3c3c 100644 --- a/TestProjects/Main/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/Main/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 6000.0.73f1 +m_EditorVersionWithRevision: 6000.0.73f1 (3ad55a55f786) diff --git a/TestProjects/Main/ProjectSettings/UnityConnectSettings.asset b/TestProjects/Main/ProjectSettings/UnityConnectSettings.asset index fa0b1465..5ef56984 100644 --- a/TestProjects/Main/ProjectSettings/UnityConnectSettings.asset +++ b/TestProjects/Main/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/com.unity.mobile.notifications/CHANGELOG.md b/com.unity.mobile.notifications/CHANGELOG.md index ccc65b7c..8e71aee2 100644 --- a/com.unity.mobile.notifications/CHANGELOG.md +++ b/com.unity.mobile.notifications/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this package will be documented in this file. +## [Unreleased] + +### Changes & Improvements: +- Unity 6.0 or later is required + ## [2.4.3] - 2026-01-29 ### Changes & Improvements: diff --git a/com.unity.mobile.notifications/Documentation~/index.md b/com.unity.mobile.notifications/Documentation~/index.md index b2b16519..022e7ab5 100644 --- a/com.unity.mobile.notifications/Documentation~/index.md +++ b/com.unity.mobile.notifications/Documentation~/index.md @@ -10,7 +10,7 @@ Notification functionality works differently on Android and iOS platforms. The m ### Requirements -- Compatible with Unity 2021.3 or above. +- Compatible with Unity 6.0 or above. - Compatible with same minimum Android and iOS versions as the oldest supported Unity version. - Requires Android SDK with API level 33 or higher. - Requires Xcode with SDK for iOS 15.2 or newer. diff --git a/com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs b/com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs index 4787b112..afbab111 100644 --- a/com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs +++ b/com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs @@ -4,14 +4,7 @@ using System.Collections.Generic; using System.IO; using UnityEditor.Android; - -#if UNITY_6000_0_OR_NEWER using Unity.Android.Gradle.Manifest; -#else -using System.Linq; -using System.Xml; -using UnityEditor; -#endif namespace Unity.Notifications { @@ -57,7 +50,6 @@ private static T GetSetting(List settings, string key) } } -#if UNITY_6000_0_OR_NEWER class AndroidNotificationPostProcessor : AndroidProjectFilesModifier { private string ToIconPath(string name) @@ -168,176 +160,5 @@ private static void InjectAndroidManifest(Manifest manifest, ManifestSettings se } } -#else - class AndroidNotificationPostProcessor : IPostGenerateGradleAndroidProject - { - const string kAndroidNamespaceURI = "http://schemas.android.com/apk/res/android"; - - const string kNotificationsDefaultManifest = @" - - - - - - - -"; - - public int callbackOrder { get { return 0; } } - - public void OnPostGenerateGradleAndroidProject(string projectPath) - { - projectPath = Path.Combine(projectPath, "mobilenotifications.androidlib"); - if (!Directory.Exists(projectPath)) - throw new Exception("mobilenotifications module not found in gradle project"); - - CopyNotificationResources(projectPath); - - InjectAndroidManifest(projectPath); - } - - private void CopyNotificationResources(string projectPath) - { - // Get the icons set in the UnityNotificationEditorManager and write them to the res folder, then we can use the icons as res. - var icons = NotificationSettingsManager.Initialize().GenerateDrawableResourcesForExport(); - foreach (var icon in icons) - { - var fileInfo = new FileInfo(string.Format("{0}/src/main/res/{1}", projectPath, icon.Key)); - if (fileInfo.Directory != null) - { - fileInfo.Directory.Create(); - File.WriteAllBytes(fileInfo.FullName, icon.Value); - } - } - } - - private void InjectAndroidManifest(string projectPath) - { - var manifestPath = string.Format("{0}/src/main/AndroidManifest.xml", projectPath); - XmlDocument manifestDoc = new XmlDocument(); - manifestDoc.LoadXml(kNotificationsDefaultManifest); - - var manifestSettings = AndroidNotificationPostProcessorUtils.GetManifestSettings(); - - InjectAndroidManifest(manifestPath, manifestDoc, manifestSettings); - - manifestDoc.Save(manifestPath); - } - - internal static void InjectAndroidManifest(string manifestPath, XmlDocument manifestDoc, ManifestSettings settings) - { - if (settings.UseCustomActivity) - AppendAndroidMetadataField(manifestPath, manifestDoc, "custom_notification_android_activity", settings.CustomActivity); - - if (settings.RescheduleOnRestart) - { - var manifestNode = manifestDoc.SelectSingleNode("manifest"); - var applicationNode = manifestNode.SelectSingleNode("application"); - var receiver = manifestDoc.CreateElement("receiver"); - receiver.SetAttribute("name", kAndroidNamespaceURI, "com.unity.androidnotifications.UnityNotificationRestartReceiver"); - receiver.SetAttribute("exported", kAndroidNamespaceURI, "false"); - applicationNode.AppendChild(receiver); - var filterNode = manifestDoc.CreateElement("intent-filter"); - receiver.AppendChild(filterNode); - var actionNode = manifestDoc.CreateElement("action"); - actionNode.SetAttribute("name", kAndroidNamespaceURI, "android.intent.action.BOOT_COMPLETED"); - filterNode.AppendChild(actionNode); - - AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.RECEIVE_BOOT_COMPLETED"); - } - - bool enableExact = (settings.ExactAlarm & AndroidExactSchedulingOption.ExactWhenAvailable) != 0; - AppendAndroidMetadataField(manifestPath, manifestDoc, "com.unity.androidnotifications.exact_scheduling", enableExact ? "1" : "0"); - if (enableExact) - { - bool scheduleExact = (settings.ExactAlarm & AndroidExactSchedulingOption.AddScheduleExactPermission) != 0; - bool useExact = (settings.ExactAlarm & AndroidExactSchedulingOption.AddUseExactAlarmPermission) != 0; - // as documented here: https://developer.android.com/reference/android/Manifest.permission#USE_EXACT_ALARM - // only one of these two attributes should be used or max sdk set so on any device it's one or the other - if (scheduleExact) - AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.SCHEDULE_EXACT_ALARM", useExact ? "32" : null); - if (useExact) - AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.USE_EXACT_ALARM"); - - // Battery optimizations must use "uses-permission-sdk-23", regular uses-permission does not work - if ((settings.ExactAlarm & AndroidExactSchedulingOption.AddRequestIgnoreBatteryOptimizationsPermission) != 0) - AppendAndroidPermissionField(manifestPath, manifestDoc, "uses-permission-sdk-23", "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", null); - } - } - - internal static void AppendAndroidPermissionField(string manifestPath, XmlDocument xmlDoc, string name, string maxSdk = null) - { - AppendAndroidPermissionField(manifestPath, xmlDoc, "uses-permission", name, maxSdk); - } - - internal static void AppendAndroidPermissionField(string manifestPath, XmlDocument xmlDoc, string tagName, string name, string maxSdk) - { - var manifestNode = xmlDoc.SelectSingleNode("manifest"); - if (manifestNode == null) - throw new ArgumentException(string.Format("Missing 'manifest' node in '{0}'.", manifestPath)); - - XmlElement metaDataNode = null; - foreach (XmlNode node in manifestNode.ChildNodes) - { - if (!(node is XmlElement) || node.Name != tagName) - continue; - - var element = (XmlElement)node; - var elementName = element.GetAttribute("name", kAndroidNamespaceURI); - if (elementName == name) - { - if (maxSdk == null) - return; - var maxSdkAttr = element.GetAttribute("maxSdkVersion", kAndroidNamespaceURI); - if (!string.IsNullOrEmpty(maxSdkAttr)) - return; - metaDataNode = element; - } - } - - if (metaDataNode == null) - { - metaDataNode = xmlDoc.CreateElement(tagName); - metaDataNode.SetAttribute("name", kAndroidNamespaceURI, name); - } - if (maxSdk != null) - metaDataNode.SetAttribute("maxSdkVersion", kAndroidNamespaceURI, maxSdk); - - manifestNode.AppendChild(metaDataNode); - } - - internal static void AppendAndroidMetadataField(string manifestPath, XmlDocument xmlDoc, string name, string value) - { - var applicationNode = xmlDoc.SelectSingleNode("manifest/application"); - if (applicationNode == null) - throw new ArgumentException(string.Format("Missing 'application' node in '{0}'.", manifestPath)); - - var nodes = xmlDoc.SelectNodes("manifest/application/meta-data"); - if (nodes != null) - { - // Check if there is a 'meta-data' with the same name. - foreach (XmlNode node in nodes) - { - var element = node as XmlElement; - if (element == null) - continue; - - var elementName = element.GetAttribute("name", kAndroidNamespaceURI); - if (elementName == name) - { - element.SetAttribute("value", kAndroidNamespaceURI, value); - return; - } - } - } - - XmlElement metaDataNode = xmlDoc.CreateElement("meta-data"); - metaDataNode.SetAttribute("name", kAndroidNamespaceURI, name); - metaDataNode.SetAttribute("value", kAndroidNamespaceURI, value); - - applicationNode.AppendChild(metaDataNode); - } - } -#endif } #endif diff --git a/com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs b/com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs index 6382aaf1..90f1409d 100644 --- a/com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs +++ b/com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs @@ -4,13 +4,8 @@ using UnityEngine; using UnityEngine.Android; -#if UNITY_2022_2_OR_NEWER using JniMethodID = System.IntPtr; using JniFieldID = System.IntPtr; -#else -using JniMethodID = System.String; -using JniFieldID = System.String; -#endif namespace Unity.Notifications.Android { @@ -160,13 +155,10 @@ public void SetNotificationColor(AndroidJavaObject builder, int color) { if (color == null) return null; -#if UNITY_2022_2_OR_NEWER + int val; AndroidJNIHelper.Unbox(color.GetRawObject(), out val); return val.ToColor(); -#else - return color.Call("intValue").ToColor(); -#endif } } @@ -572,26 +564,18 @@ public JniApi(AndroidJavaClass notificationManagerClass, AndroidJavaObject notif public static JniFieldID FindField(AndroidJavaClass clazz, string name, string signature, bool isStatic) { -#if UNITY_2022_2_OR_NEWER var field = AndroidJNIHelper.GetFieldID(clazz.GetRawClass(), name, signature, isStatic); if (field == IntPtr.Zero) - throw new Exception($"Field {name} with signature {signature} not found"); + throw new MissingFieldException($"Field {name} with signature {signature} not found"); return field; -#else - return name; -#endif } public static JniMethodID FindMethod(AndroidJavaClass clazz, string name, string signature, bool isStatic) { -#if UNITY_2022_2_OR_NEWER var method = AndroidJNIHelper.GetMethodID(clazz.GetRawClass(), name, signature, isStatic); if (method == IntPtr.Zero) - throw new Exception($"Method {name} with signature {signature} not found"); + throw new MissingMethodException($"Method {name} with signature {signature} not found"); return method; -#else - return name; -#endif } } @@ -733,13 +717,7 @@ public static bool ShouldShowPermissionToPostRationale return false; if (CanRequestPermissionToPost) - { -#if UNITY_2023_1_OR_NEWER return Permission.ShouldShowRequestPermissionRationale(PERMISSION_POST_NOTIFICATIONS); -#else - return s_CurrentActivity.Call("shouldShowRequestPermissionRationale", PERMISSION_POST_NOTIFICATIONS); -#endif - } return false; } diff --git a/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs b/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs deleted file mode 100644 index f8d8d1bc..00000000 --- a/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs +++ /dev/null @@ -1,213 +0,0 @@ -using System.Xml; -using NUnit.Framework; - -namespace Unity.Notifications.Tests -{ - internal class PostprocessorTests - { - [Test] - public void DummmyTest() - { - Assert.AreEqual(true, true); - } - - const string kManifestTemplate = @" - - - - - - - - - - - - - - {0} - - - - - {1} - - - -"; - const string kRescheduleOnRestartFalse = ""; - const string kRescheduleOnRestartTrue = ""; - const string kExactSchedulingOn = ""; - const string kExactSchedulingOff = ""; - const string kReceiveBookCompletedPermission = ""; - const string kScheduleExactAlarmPermission = ""; - const string kUseExactAlarmPermission = ""; - const string kRequestIgnoreBatteryOptimizationsPermission = ""; - - string GetSourceXml(string metaDataExtra, string permissionExtra) - { - if (metaDataExtra == null) - metaDataExtra = ""; - if (permissionExtra == null) - permissionExtra = ""; - return string.Format(kManifestTemplate, metaDataExtra, permissionExtra); - } - -#if UNITY_ANDROID -#if UNITY_6000_0_OR_NEWER -// Use AndroidProjectFilesModifier instead -#else - [Test] - public void AppendMetadataToManifest_WhenSameValue_Works() - { - string sourceXmlContent = GetSourceXml(kRescheduleOnRestartTrue, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidMetadataField(null, xmlDoc, "reschedule_notifications_on_restart", "true"); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kRescheduleOnRestartTrue)); - } - - [Test] - public void AppendMetadataToManifest_WhenOtherValue_Works() - { - string sourceXmlContent = GetSourceXml(kRescheduleOnRestartFalse, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidMetadataField(null, xmlDoc, "reschedule_notifications_on_restart", "true"); - - Assert.IsFalse(xmlDoc.InnerXml.Contains(kRescheduleOnRestartFalse)); - Assert.IsTrue(xmlDoc.InnerXml.Contains(kRescheduleOnRestartTrue)); - } - - [Test] - public void AppendMetadataToManifest_WhenNotPresent_Works() - { - string sourceXmlContent = GetSourceXml(null, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidMetadataField(null, xmlDoc, "reschedule_notifications_on_restart", "true"); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kRescheduleOnRestartTrue)); - } - - [Test] - public void AppendMetadataToManifest_WhenOtherFieldPresentWorks() - { - string sourceXmlContent = GetSourceXml(kRescheduleOnRestartTrue, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidMetadataField(null, xmlDoc, "do_something", "true"); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kRescheduleOnRestartTrue)); - Assert.IsTrue(xmlDoc.InnerXml.Contains("")); - } - - [Test] - public void AppendPermissionToManifest_WhenNoPresentWorks() - { - string sourceXmlContent = GetSourceXml(null, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidPermissionField(null, xmlDoc, "android.permission.RECEIVE_BOOT_COMPLETED"); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kReceiveBookCompletedPermission)); - } - - [Test] - public void AppendPermissionToManifest_WhenAlreadyPresentWorks() - { - string sourceXmlContent = GetSourceXml(null, kReceiveBookCompletedPermission); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - - - AndroidNotificationPostProcessor.AppendAndroidPermissionField(null, xmlDoc, "android.permission.RECEIVE_BOOT_COMPLETED"); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kReceiveBookCompletedPermission)); - } - - [Test] - public void InjectAndroidManifest_AddsScheduleExactWhenEnabled() - { - InjectAndroidManifest_AddsPermissionWhenEnabled(AndroidExactSchedulingOption.AddScheduleExactPermission, kScheduleExactAlarmPermission); - } - - [Test] - public void InjectAndroidManifest_AddsUseExactWhenEnabled() - { - InjectAndroidManifest_AddsPermissionWhenEnabled(AndroidExactSchedulingOption.AddUseExactAlarmPermission, kUseExactAlarmPermission); - } - - [Test] - public void InjectAndroidManifest_AddsBatteryOptimizationsWhenEnabled() - { - InjectAndroidManifest_AddsPermissionWhenEnabled(AndroidExactSchedulingOption.AddRequestIgnoreBatteryOptimizationsPermission, kRequestIgnoreBatteryOptimizationsPermission); - //InjectAndroidManifest_AddsPermissionWhenEnabled(AndroidExactSchedulingOption.AddRequestIgnoreBatteryOptimizationsPermission, "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"); - } - - public void InjectAndroidManifest_AddsPermissionWhenEnabled(AndroidExactSchedulingOption flag, string permission) - { - string sourceXmlContent = GetSourceXml(null, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - var settings = new ManifestSettings() - { - ExactAlarm = AndroidExactSchedulingOption.ExactWhenAvailable | flag, - }; - - AndroidNotificationPostProcessor.InjectAndroidManifest("test", xmlDoc, settings); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kExactSchedulingOn)); - Assert.IsTrue(xmlDoc.InnerXml.Contains(permission)); - } - - [Test] - public void InjectAndroidManifest_DoesNotAddScheduleExactWhenExactNotEnabled() - { - InjectAndroidManifest_DoesNotAddPermissionWhenExactNotEnabled("android.permission.SCHEDULE_EXACT_ALARM"); - } - - [Test] - public void InjectAndroidManifest_DoesNotAddUseExactWhenExactNotEnabled() - { - InjectAndroidManifest_DoesNotAddPermissionWhenExactNotEnabled("android.permission.USE_EXACT_ALARM"); - } - - [Test] - public void InjectAndroidManifest_DoesNotAddBatteryOptimizationsWhenExactNotEnabled() - { - InjectAndroidManifest_DoesNotAddPermissionWhenExactNotEnabled("android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"); - } - - public void InjectAndroidManifest_DoesNotAddPermissionWhenExactNotEnabled(string permission) - { - string sourceXmlContent = GetSourceXml(null, null); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(sourceXmlContent); - var settings = new ManifestSettings() - { - // AndroidExactSchedulingOption.ExactWhenAvailable absent, so this one is ignored - ExactAlarm = AndroidExactSchedulingOption.AddScheduleExactPermission, - }; - - AndroidNotificationPostProcessor.InjectAndroidManifest("test", xmlDoc, settings); - - Assert.IsTrue(xmlDoc.InnerXml.Contains(kExactSchedulingOff)); - Assert.IsFalse(xmlDoc.InnerXml.Contains(permission)); - } - -#endif -#endif - } -} diff --git a/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs.meta b/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs.meta deleted file mode 100644 index 82ab3541..00000000 --- a/com.unity.mobile.notifications/Tests/Editor/PostprocessorTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad29723af4e864cf2bce62d266ce900a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.mobile.notifications/package.json b/com.unity.mobile.notifications/package.json index e70286f8..86309fc0 100644 --- a/com.unity.mobile.notifications/package.json +++ b/com.unity.mobile.notifications/package.json @@ -1,8 +1,8 @@ { "name": "com.unity.mobile.notifications", "displayName": "Mobile Notifications", - "version": "2.4.3", - "unity": "2021.3", + "version": "2.5.0", + "unity": "6000.0", "description": "Mobile Notifications package adds support for scheduling local repeatable or one-time notifications on iOS and Android.\n\nOn iOS receiving of push notifications is also supported.", "keywords": [ "Android",