diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 947b287f22..a580843b4a 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -1,7 +1,6 @@ editors: - version: 2022.3 - version: 6000.0 - - version: 6000.2 - version: 6000.3 - version: 6000.4 - version: trunk diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index c8951b7b7f..99de5a7843 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -110,61 +110,6 @@ inputsystem-editorfunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.2 - MacOS -inputsystem-editorfunctionaltests_-_6000_2_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.2_project;flags:inputsystem_MacOS_6000.2_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorFunctionalTests - 6000.2 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_2_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.2_project;flags:inputsystem_Ubuntu_6000.2_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorFunctionalTests - 6000.2 - Windows -inputsystem-editorfunctionaltests_-_6000_2_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.2_project;flags:inputsystem_Windows_6000.2_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorFunctionalTests - 6000.3 - MacOS inputsystem-editorfunctionaltests_-_6000_3_-_macos: name: InputSystem-EditorFunctionalTests - 6000.3 - MacOS diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index d2537002b5..80a349b1cf 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -110,61 +110,6 @@ inputsystem-editorperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.2 - MacOS -inputsystem-editorperformancetests_-_6000_2_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu -inputsystem-editorperformancetests_-_6000_2_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorPerformanceTests - 6000.2 - Windows -inputsystem-editorperformancetests_-_6000_2_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorPerformanceTests - 6000.3 - MacOS inputsystem-editorperformancetests_-_6000_3_-_macos: name: InputSystem-EditorPerformanceTests - 6000.3 - MacOS diff --git a/.yamato/input-system-mobile-functional-build-jobs.yml b/.yamato/input-system-mobile-functional-build-jobs.yml index 40df161192..dcc9094249 100644 --- a/.yamato/input-system-mobile-functional-build-jobs.yml +++ b/.yamato/input-system-mobile-functional-build-jobs.yml @@ -178,95 +178,6 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos: paths: - build/players/**/* -# InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - il2cpp -inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp: - name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - il2cpp - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - mono -inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono: - name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - mono - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobileFunctionalBuildJobs - 6000.2 - IOS -inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_ios: - name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c iOS --fast --wait - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalBuildJobs - 6000.2 - TvOS -inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_tvos: - name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c AppleTV --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - # InputSystem-MobileFunctionalBuildJobs - 6000.3 - Android - il2cpp inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobileFunctionalBuildJobs - 6000.3 - Android - il2cpp diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index a689daa361..e40267ef2c 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -25,6 +25,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 2022.3 - Android - mono inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: @@ -51,6 +53,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 2022.3 - IOS inputsystem-mobilefunctionaltests_-_2022_3_-_ios: @@ -119,6 +123,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.0 - Android - mono inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: @@ -145,6 +151,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.0 - IOS inputsystem-mobilefunctionaltests_-_6000_0_-_ios: @@ -188,100 +196,6 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_tvos: dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos -# InputSystem-MobileFunctionalTests - 6000.2 - Android - il2cpp -inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp: - name: InputSystem-MobileFunctionalTests - 6000.2 - Android - il2cpp - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp - -# InputSystem-MobileFunctionalTests - 6000.2 - Android - mono -inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono: - name: InputSystem-MobileFunctionalTests - 6000.2 - Android - mono - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono - -# InputSystem-MobileFunctionalTests - 6000.2 - IOS -inputsystem-mobilefunctionaltests_-_6000_2_-_ios: - name: InputSystem-MobileFunctionalTests - 6000.2 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::iPhone - flavor: m1.mac - model: SE - commands: - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_ios - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalTests - 6000.2 - TvOS -inputsystem-mobilefunctionaltests_-_6000_2_-_tvos: - name: InputSystem-MobileFunctionalTests - 6000.2 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::appletv - flavor: m1.mac - commands: - - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_tvos - # InputSystem-MobileFunctionalTests - 6000.3 - Android - il2cpp inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.3 - Android - il2cpp @@ -307,6 +221,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.3 - Android - mono inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: @@ -333,6 +249,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.3 - IOS inputsystem-mobilefunctionaltests_-_6000_3_-_ios: @@ -401,6 +319,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.4 - Android - mono inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: @@ -427,6 +347,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.4 - IOS inputsystem-mobilefunctionaltests_-_6000_4_-_ios: @@ -495,6 +417,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.5 - Android - mono inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono: @@ -521,6 +445,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.5 - IOS inputsystem-mobilefunctionaltests_-_6000_5_-_ios: diff --git a/.yamato/input-system-mobile-performance-build-jobs.yml b/.yamato/input-system-mobile-performance-build-jobs.yml index 0a4292823c..0a899a3812 100644 --- a/.yamato/input-system-mobile-performance-build-jobs.yml +++ b/.yamato/input-system-mobile-performance-build-jobs.yml @@ -178,95 +178,6 @@ inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos: paths: - build/players/**/* -# InputSystem-MobilePerformanceBuildJobs - 6000.2 - Android - il2cpp -inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_il2cpp: - name: InputSystem-MobilePerformanceBuildJobs - 6000.2 - Android - il2cpp - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobilePerformanceBuildJobs - 6000.2 - Android - mono -inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_mono: - name: InputSystem-MobilePerformanceBuildJobs - 6000.2 - Android - mono - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobilePerformanceBuildJobs - 6000.2 - IOS -inputsystem-mobileperformancebuildjobs_-_6000_2_-_ios: - name: InputSystem-MobilePerformanceBuildJobs - 6000.2 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c iOS --fast --wait - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceBuildJobs - 6000.2 - TvOS -inputsystem-mobileperformancebuildjobs_-_6000_2_-_tvos: - name: InputSystem-MobilePerformanceBuildJobs - 6000.2 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c AppleTV --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - # InputSystem-MobilePerformanceBuildJobs - 6000.3 - Android - il2cpp inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobilePerformanceBuildJobs - 6000.3 - Android - il2cpp diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index d94e69e4b2..a8b0e7d6f7 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -25,6 +25,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 2022.3 - Android - mono inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: @@ -51,6 +53,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 2022.3 - IOS inputsystem-mobileperformancetests_-_2022_3_-_ios: @@ -119,6 +123,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.0 - Android - mono inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: @@ -145,6 +151,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.0 - IOS inputsystem-mobileperformancetests_-_6000_0_-_ios: @@ -188,100 +196,6 @@ inputsystem-mobileperformancetests_-_6000_0_-_tvos: dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos -# InputSystem-MobilePerformanceTests - 6000.2 - Android - il2cpp -inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: - name: InputSystem-MobilePerformanceTests - 6000.2 - Android - il2cpp - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_il2cpp - -# InputSystem-MobilePerformanceTests - 6000.2 - Android - mono -inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: - name: InputSystem-MobilePerformanceTests - 6000.2 - Android - mono - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_mono - -# InputSystem-MobilePerformanceTests - 6000.2 - IOS -inputsystem-mobileperformancetests_-_6000_2_-_ios: - name: InputSystem-MobilePerformanceTests - 6000.2 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::iPhone - flavor: m1.mac - model: SE - commands: - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_ios - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceTests - 6000.2 - TvOS -inputsystem-mobileperformancetests_-_6000_2_-_tvos: - name: InputSystem-MobilePerformanceTests - 6000.2 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::appletv - flavor: m1.mac - commands: - - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_tvos - # InputSystem-MobilePerformanceTests - 6000.3 - Android - il2cpp inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.3 - Android - il2cpp @@ -307,6 +221,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.3 - Android - mono inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: @@ -333,6 +249,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.3 - IOS inputsystem-mobileperformancetests_-_6000_3_-_ios: @@ -401,6 +319,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.4 - Android - mono inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: @@ -427,6 +347,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.4 - IOS inputsystem-mobileperformancetests_-_6000_4_-_ios: @@ -495,6 +417,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.5 - Android - mono inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono: @@ -521,6 +445,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.5 - IOS inputsystem-mobileperformancetests_-_6000_5_-_ios: diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index 80df3c6dbf..10e5c2fc22 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -110,61 +110,6 @@ inputsystem-standalonefunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.2 - MacOS -inputsystem-standalonefunctionaltests_-_6000_2_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneFunctionalTests - 6000.2 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_2_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneFunctionalTests - 6000.2 - Windows -inputsystem-standalonefunctionaltests_-_6000_2_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneFunctionalTests - 6000.3 - MacOS inputsystem-standalonefunctionaltests_-_6000_3_-_macos: name: InputSystem-StandaloneFunctionalTests - 6000.3 - MacOS diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index ef1e7c2c19..e59c1b98a0 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -110,61 +110,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOS inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOS diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index e4c2897a56..96cc2fe05e 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -110,61 +110,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_2_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_2_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_2_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOS inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOS diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index 3fab71344f..f27b4d6f17 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -110,61 +110,6 @@ inputsystem-standaloneperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.2 - MacOS -inputsystem-standaloneperformancetests_-_6000_2_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.2 - MacOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandalonePerformanceTests - 6000.2 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_2_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.2 - Ubuntu - agent: - image: package-ci/ubuntu-22.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandalonePerformanceTests - 6000.2 - Windows -inputsystem-standaloneperformancetests_-_6000_2_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.2 - Windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes' - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandalonePerformanceTests - 6000.3 - MacOS inputsystem-standaloneperformancetests_-_6000_3_-_macos: name: InputSystem-StandalonePerformanceTests - 6000.3 - MacOS diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index 78edc65054..6ca4d0af1f 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -8,9 +8,6 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_2_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_2_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_2_-_windows - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_windows @@ -22,7 +19,6 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_windows - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_tvos @@ -32,9 +28,6 @@ all_functional_tests: - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_0_-_ios - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_2_-_ios - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_ios @@ -50,9 +43,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_2_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_2_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_2_-_windows - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_windows @@ -66,8 +56,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_2022_3_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos @@ -91,9 +79,6 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_2_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_2_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_2_-_windows - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_windows @@ -105,7 +90,6 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_windows - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_tvos @@ -115,9 +99,6 @@ all_performance_tests: - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_0_-_ios - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_2_-_ios - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_ios @@ -133,9 +114,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_2_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_2_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_2_-_windows - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_windows @@ -151,9 +129,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_2_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_2_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_2_-_windows - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_windows @@ -168,7 +143,6 @@ nightly_trigger: dependencies: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_2022_3_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_2_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index a3cda92742..cc6bea3d58 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -11,9 +11,6 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows @@ -353,169 +350,6 @@ preview_apv_-_6000_0_-_windows: Job Maintainers: '#rm-packageworks' Wrench: 1.3.0.0 -# Functional tests for dependents found in the latest 6000.2 manifest (MacOS). -preview_apv_-_6000_2_-_macos: - name: Preview APV - 6000.2 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - -# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu). -preview_apv_-_6000_2_-_ubuntu: - name: Preview APV - 6000.2 - ubuntu - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - -# Functional tests for dependents found in the latest 6000.2 manifest (Windows). -preview_apv_-_6000_2_-_windows: - name: Preview APV - 6000.2 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.2 --wrench-config=.yamato/wrench/wrench_config.json - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos: name: Preview APV - 6000.3 - macos diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 3d33d164b8..2457208603 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -86,36 +86,6 @@ publish_dry_run_inputsystem: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_macos - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-macos - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_windows - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-windows - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_3_-_macos specific_options: UTR: @@ -298,36 +268,6 @@ publish_inputsystem: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_macos - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-macos - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_2_-_windows - specific_options: - UTR: - location: results/UTR/validate-inputsystem-6000.2-windows - unzip: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.2-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_3_-_macos specific_options: UTR: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index ebce920375..9237f6e1ed 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -415,213 +415,6 @@ validate_-_inputsystem_-_6000_0_-_windows: labels: - Packages:inputsystem -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.2 - macos (6000.2 - MacOS). -validate_-_inputsystem_-_6000_2_-_macos: - name: Validate - inputsystem - 6000.2 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.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: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.2;flags:inputsystem_MacOS_6000.2" ' - timeout: 20 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:inputsystem - -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.2 - ubuntu (6000.2 - Ubuntu). -validate_-_inputsystem_-_6000_2_-_ubuntu: - name: Validate - inputsystem - 6000.2 - ubuntu - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.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: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.2;flags:inputsystem_Ubuntu_6000.2" ' - timeout: 20 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:inputsystem - -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.2 - windows (6000.2 - Windows). -validate_-_inputsystem_-_6000_2_-_windows: - name: Validate - inputsystem - 6000.2 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.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: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.2;flags:inputsystem_Windows_6000.2" ' - timeout: 20 - retries: 1 - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 - labels: - - Packages:inputsystem - # PVP Editor and Playmode tests for Validate - inputsystem - 6000.3 - macos (6000.3 - MacOS). validate_-_inputsystem_-_6000_3_-_macos: name: Validate - inputsystem - 6000.3 - macos diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 729d49ac37..7904e9ab3c 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -26,6 +26,14 @@ "com.unity.polyspatial.visionos", "com.unity.polyspatial.xr", "com.unity.xr.visionos" + ], + "6000.5": [ + "com.unity.charactercontroller", + "com.unity.polyspatial", + "com.unity.polyspatial.extensions", + "com.unity.polyspatial.visionos", + "com.unity.polyspatial.xr", + "com.unity.xr.visionos" ] } } diff --git a/Assets/Editor/DumpInputActionReferences.cs b/Assets/Editor/DumpInputActionReferences.cs index c3703b453b..235c55f77f 100644 --- a/Assets/Editor/DumpInputActionReferences.cs +++ b/Assets/Editor/DumpInputActionReferences.cs @@ -19,8 +19,10 @@ private static void DumpReferences(StringBuilder sb, string prefix, InputActionR private static void DumpReferences() { var sb = new StringBuilder(); +#pragma warning disable CS0618 // Type or member is obsolete DumpReferences(sb, "Loaded objects", Object.FindObjectsByType( FindObjectsInactive.Include, FindObjectsSortMode.InstanceID)); +#pragma warning restore CS0618 // Type or member is obsolete DumpReferences(sb, "All objects:", Resources.FindObjectsOfTypeAll()); Debug.Log(sb.ToString()); } diff --git a/Assets/QA/Tests/Touch/ISX_Touch.meta b/Assets/QA/Tests/Touch/ISX_Touch.meta new file mode 100644 index 0000000000..d38d87bd9f --- /dev/null +++ b/Assets/QA/Tests/Touch/ISX_Touch.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb144b56ac1e24e4090bf0faa2c5c212 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/GamepadMouseCursor/GamepadMouseCursorSample.unity b/Assets/Samples/GamepadMouseCursor/GamepadMouseCursorSample.unity index 78f4d748c0..40c5de21eb 100644 --- a/Assets/Samples/GamepadMouseCursor/GamepadMouseCursorSample.unity +++ b/Assets/Samples/GamepadMouseCursor/GamepadMouseCursorSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -977,10 +974,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -1100,15 +1097,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832288260} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 12 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 2 m_Resolution: -1 @@ -1152,8 +1148,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &832288262 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs index 74c455f45b..e75d26fe90 100644 --- a/Assets/Samples/InGameHints/InGameHintsActions.cs +++ b/Assets/Samples/InGameHints/InGameHintsActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.17.1 +// version 1.18.1 // from Assets/Samples/InGameHints/InGameHintsActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Assets/Samples/SimpleDemo/SimpleControls.cs b/Assets/Samples/SimpleDemo/SimpleControls.cs index d55b3d0c2b..dfc82a596c 100644 --- a/Assets/Samples/SimpleDemo/SimpleControls.cs +++ b/Assets/Samples/SimpleDemo/SimpleControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.17.1 +// version 1.18.1 // from Assets/Samples/SimpleDemo/SimpleControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Assets/Samples/SimpleDemo/SimpleDemo_UsingActionAsset.meta b/Assets/Samples/SimpleDemo/SimpleDemo_UsingActionAsset.meta new file mode 100644 index 0000000000..9e7df9ba29 --- /dev/null +++ b/Assets/Samples/SimpleDemo/SimpleDemo_UsingActionAsset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a1bdd1ea898b4f558508f664457f7c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs b/Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs index 5d31d5e306..96a51f9a7a 100644 --- a/Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs +++ b/Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs @@ -19,6 +19,7 @@ public override void OneTimeSetUp() { base.OneTimeSetUp(); m_Asset = AssetDatabaseUtils.CreateAsset(); + m_Asset.AddControlScheme(new InputControlScheme("test")); var actionMap = m_Asset.AddActionMap("First Name"); m_Asset.AddActionMap("Second Name"); m_Asset.AddActionMap("Third Name"); @@ -234,5 +235,28 @@ public IEnumerator CanRenameAction() // Check on the asset side Assert.That(m_Window.currentAssetInEditor.actionMaps[0].actions[1].name, Is.EqualTo("New Name")); } + + /// + /// ISXB-1607 + /// Fix an out of range exception when pressing undo after creating and editing a new control scheme. + /// + /// + [UnityTest] + [Ignore("Currently this is difficult to test, Darren - re-visit once we have converted the advanced dropdown to UIToolkit")] + public IEnumerator CanUndoActionMap_ControlSchemeEdit() + { + var controlSchemeToolbarMenu = m_Window.rootVisualElement.Q("control-schemes-toolbar-menu"); + + // changing the selection triggers a state change, wait for the scheduler to process the frame + yield return WaitForSchedulerLoop(); + yield return WaitForNotDirty(); + + SimulateClickOn(controlSchemeToolbarMenu); + + yield return WaitForSchedulerLoop(); + yield return WaitForNotDirty(); + + yield return WaitForFocus(m_Window.rootVisualElement.Q("control-schemes-toolbar-menu")); + } } #endif diff --git a/Assets/Tests/InputSystem.Editor/UGUITests.cs b/Assets/Tests/InputSystem.Editor/UGUITests.cs index 6dd636e33f..e189960c1f 100644 --- a/Assets/Tests/InputSystem.Editor/UGUITests.cs +++ b/Assets/Tests/InputSystem.Editor/UGUITests.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER +#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER && UNITY_INPUT_SYSTEM_ENABLE_UI using System; using NUnit.Framework; using UnityEditor; diff --git a/Assets/Tests/InputSystem/CoreTests_Controls.cs b/Assets/Tests/InputSystem/CoreTests_Controls.cs index 61051d802f..2bcd768c6b 100644 --- a/Assets/Tests/InputSystem/CoreTests_Controls.cs +++ b/Assets/Tests/InputSystem/CoreTests_Controls.cs @@ -17,6 +17,9 @@ using UnityEngine.Profiling; using UnityEngine.TestTools.Constraints; using Is = NUnit.Framework.Is; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif partial class CoreTests { @@ -1545,7 +1548,11 @@ public void Controls_PrecompiledLayouts_AllChildControlPropertiesHaveSetters() var inputDevice = typeof(InputDevice); var inputControlType = typeof(InputControl); var checkedTypes = new HashSet(); +#if UNITY_6000_5_OR_NEWER + foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies()) +#else foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) +#endif { try { @@ -1600,4 +1607,30 @@ static void CheckChildControls(Type type, HashSet checkedTypes) Assert.That(setMethod.IsPublic, Is.True, inputControlMessage); } } + + [Test] + [Category("Controls")] + public void Controls_MatchPathComponent_CollapsesConsecutiveWildcards() + { + var component = "leftTrigger"; + var componentType = InputControlPath.PathComponentType.Name; + + var patterns = new[] + { + "*Trigger", + "**Trigger", + "***Trigger" + }; + + foreach (var path in patterns) + { + var indexInPath = 0; + var result = InputControlPath.MatchPathComponent(component, path, ref indexInPath, componentType); + + // All patterns should match + Assert.IsTrue(result, $"Pattern '{path}' should match '{component}'"); + Assert.AreEqual(path.Length, indexInPath, + $"Index should advance past entire pattern for '{path}'"); + } + } } diff --git a/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs b/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs index b06f893a75..13541204a6 100644 --- a/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs +++ b/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.17.1 +// version 1.18.1 // from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 49fb80f2a1..fb7dbba1bb 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -10,7 +10,35 @@ however, it has to be formatted properly to pass verification tests. ## [Unreleased] - yyyy-mm-dd +### Changed + +- Updated `m_ActionAssetInstanceID` in PlayerInputEditor.cs to use `EntityId` instead of `InstanceID`. +- Consecutive wildcard characters ('*') used in input control-paths are now collapsed into a single wildcard when multiple consecutive wildcard characters are present. + +### Fixed + +- Fixed the `Auto-Save` toggle button with some extra pixels to align the text in the window better. +- Align title font size with toolbar style in `Input Action` window. +- Updated Action Properties headers to use colors consistent with GameObject component headers. +- Fixed misaligned Virtual Cursor when changing resolution [ISXB-1119](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1119) + +### Added + +- Added `keywords` for InputSystem project settings window. + +## [1.18.0] - 2026-01-14 + +### Changed +- Updated documentation to reflect that the OnMouse MonoBehaviour events are now supported in Unity 6.4 and above. +- Updated the supported devices documentation to clarify that touchscreens are supported on Linux. +- Updated documentation to reflect PS5 controller support on Linux. + +### Fixed +- Fixed add buttons use add icon in input actions window (ISX-2340) +- Fixed warnings being generated on Unity 6.4 and 6.5. (ISX-2395). +- Fixed extra empty lines being displayed in the control binding list when mouse buttons are pressed [ISXB-1677](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1677) +- Fixed InputActionReference not being set when attempting to set it on a Prefab or ScriptableObject [ISXB-1787](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1787) ## [1.17.0] - 2025-11-25 @@ -77,6 +105,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed the compilation warnings when used with Unity 6.4 (ISX-2349). - Fixed an issue where `InputSystemUIInputModule.localMultiPlayerRoot` could not be set to `null` when using `MultiplayerEventSystem`. [ISXB-1610](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1610) - Fixed an issue in `Keyboard` where the sub-script operator would return a `null` key control for the deprecated key `Key.IMESelected`. Now, an aliased `KeyControl`mapping to the IMESelected bit is returned for compability reasons. It is still strongly advised to not rely on this key since `IMESelected` bit isn't strictly a key and will be removed from the `Key` enumeration type in a future major revision. [ISXB-1541](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1541). +- Fixed an ArgumentOutOfRangeException that was thrown when pressing the undo shortcut while changing a control scheme name. [ISXB-1607](https://issuetracker.unity3d.com/issues/argumentoutofrangeexception-error-is-thrown-when-pressing-the-undo-shortcut-while-changing-the-control-scheme-name) - Fixed an issue where the onAnyButtonPress callback would be triggered multiple times during unrelated events when a button is held down. See [ISXB-1005](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1005). - Fixed InputControl picker not updating correctly when the Input Actions Window was dirty. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221) - Fixed formatting issues on processor documentation page. diff --git a/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md b/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md index 770dfae231..7b1e358c53 100644 --- a/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md +++ b/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md @@ -34,5 +34,4 @@ The following is a list of known limitations that the Input System currently has ## Features Supported by Old Input Manager -* `MonoBehaviour` mouse methods (`OnMouseEnter`, `OnMouseDrag`, etc) will not be called by the Input System. * Unity Remote doesn't currently support the Input System. This is being worked on. diff --git a/Packages/com.unity.inputsystem/Documentation~/Migration.md b/Packages/com.unity.inputsystem/Documentation~/Migration.md index 20a8486cd6..883ff37a07 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Migration.md +++ b/Packages/com.unity.inputsystem/Documentation~/Migration.md @@ -99,6 +99,8 @@ Directly reading hardware controls bypasses the new Input System's action-based ### Mouse +`MonoBehaviour.OnMouse` events, such as [MonoBehaviour.OnMouseDown](https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnMouseDown.html), are supported in Unity 6.4 and later. + |Input Manager (Old)|Input System (New)| |--|--| [`Input.GetMouseButton`](https://docs.unity3d.com/ScriptReference/Input.GetMouseButton.html)
Example: `Input.GetMouseButton(0)`|Use [`isPressed`](xref:UnityEngine.InputSystem.Controls.ButtonControl.isPressed) on the corresponding mouse button.
Example: `InputSystem.Mouse.current.leftButton.isPressed` diff --git a/Packages/com.unity.inputsystem/Documentation~/RespondingToActions.md b/Packages/com.unity.inputsystem/Documentation~/RespondingToActions.md index f564a38393..f9f405b16d 100644 --- a/Packages/com.unity.inputsystem/Documentation~/RespondingToActions.md +++ b/Packages/com.unity.inputsystem/Documentation~/RespondingToActions.md @@ -119,7 +119,7 @@ public class Example : MonoBehaviour // teleport occurs on the first frame that the action is pressed, and not again until the button is released } - if (submit.WasReleasedThisFrame()) + if (submitAction.WasReleasedThisFrame()) { // submit occurs on the frame that the action is released, a common technique for buttons relating to UI controls. } diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index 00731553ff..3f6f0af710 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -14,7 +14,7 @@ Support for the following Devices doesn't require specialized support of particu |[Mouse](xref:input-system-mouse)|Yes|Yes|Yes|Yes|Yes|No|No|Yes|Yes|No|Yes| |[Keyboard](xref:input-system-keyboard)|Yes|Yes|Yes|Yes|Yes|No|No|Yes|Yes|No|Yes| |[Pen](xref:input-system-pen)|Yes|No |No|Yes|Yes|Yes|No|No|No|No|No| -|[Touchscreen](xref:input-system-touch)|Yes|No|No|Yes|Yes|Yes|Yes(4)|No|No|No|Yes| +|[Touchscreen](xref:input-system-touch)|Yes|No|Yes|Yes|Yes|Yes|Yes(4)|No|No|No|Yes| |[Sensors](xref:input-system-sensors)|No|No|No|No|Yes|Yes|No|No|No|No|Yes(5)| |[Joystick](#other-gamepads-joysticks-and-racing-wheels) (2)|Yes|Yes|Yes|Yes|Yes|No|No|No|No|No|Yes| @@ -31,7 +31,7 @@ Support for the following Devices doesn't require specialized support of particu |Xbox 360 (4)|Yes|Yes (3)|Yes|Yes|No|No|No|Yes|No|No|Sometimes (2)| |Xbox One|Yes (1)|Yes (3)|Yes (1)|Yes|Yes (1)|Yes (6)|Yes (6)|Yes|No|No|Sometimes (2)| |PS3/PS4|Yes (5)|Yes (5)|Yes (5)|Yes (5)|Yes (5, 8)|Yes (5, 6)|Yes (5, 6)|No|Yes|No|Sometimes (2)| -|PS5|Yes (11)|Yes (11)|No (11)|Yes (11)|Yes (9, 11)|No (11)|No (11)|No|Yes|No|Sometimes (2)| +|PS5|Yes (11)|Yes (11)|Yes (11)|Yes (11)|Yes (9, 11)|No (11)|No (11)|No|Yes|No|Sometimes (2)| |Switch|Yes (10)|Yes (10)|Yes|Yes|No|No|No|No|No|Yes|Sometimes (2)| |MFi (such as SteelSeries)|No|Sometimes (12)|No|No|No|Yes|Yes|No|No|No|No| @@ -40,15 +40,15 @@ Support for the following Devices doesn't require specialized support of particu > 2. WebGL support varies between browsers, Devices, and operating systems. > 3. XInput controllers on macOS currently require the installation of the [Xbox Controller Driver for macOS](https://github.com/360Controller/360Controller). This driver only supports only USB connections, and doesn't support wireless dongles. However, the latest generation of Xbox One controllers natively support Bluetooth, and are natively supported on Macs as HIDs without any additional drivers when connected via Bluetooth. > 4. This includes any XInput-compatible Device. -> 5. Unity doesn't support motor rumble and lightbar color over Bluetooth. Unity doesn't support the gyro or accelerometer on PS4/PS5 controllers on platforms other than the PlayStation consoles. Unity also doesn't support the DualShock 4 USB Wireless Adapter. On UWP, only USB connection is supported, motor rumble and lightbar are not working correctly. +> 5. Unity doesn't support motor rumble and light bar color over Bluetooth. Unity doesn't support the gyro or accelerometer on PS4/PS5 controllers on platforms other than the PlayStation consoles. Unity also doesn't support the DualShock 4 USB Wireless Adapter. On UWP, only USB connection is supported, motor rumble and light bar are not working correctly. > 6. Unity supports Made for iOS (MFi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher. > 7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support. > 8. Unity supports PS4 controllers on Android devices running [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). > 9. Unity supports PS5 controllers on Android devices running [Android 12 or higher](https://playstation.com/en-gb/support/hardware/pair-dualsense-controller-bluetooth/). > 10. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Deluxe Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". -> 11. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. +> 11. PS5 DualSense is supported on Windows, macOS, and Linux via USB HID. Linux support begins with Unity Editor 6000.4 (refer to [PS5 controller support on Linux](#ps5-controller-support-on-linux)). On all platforms, setting motor rumble and light bar color when connected over Bluetooth is currently not supported. > 12. SteelSeries Nimbus+ supported via HID on macOS. -> - On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. +> - On UWP only USB connection is supported, motor rumble and light bar are not working correctly. > - On Android it's expected to be working from Android 12. > - On iOS/tvOS it's currently recognized as a generic gamepad and most controls do work. > 13. To ensure all controller types are detected on UWP, enable the HumanInterfaceDevice setting in [UWP Player Settings](https://docs.unity3d.com/Manual/class-PlayerSettingsWSA.html#Capabilities). @@ -65,3 +65,40 @@ Support varies between browsers, Devices, and operating systems, and further dif ## Other gamepads, joysticks, and racing wheels The Input System supports any Device which implements the USB HID specification. However, for Devices which don't have specific [layouts](xref:input-system-layouts) implemented in the Input System, the system can only surface the information available from the HID descriptor of the Device, which limits how precisely it can describe a control. These Devices often work best when allowing the user to [manually remap the controls](xref:UnityEngine.InputSystem.InputActionRebindingExtensions). If you need to support a specific Device, you can also [add your own mapping for it](xref:input-system-hid#creating-a-custom-device-layout). See documentation on [HID](xref:input-system-hid) for more information. + +## PS5 controller support on Linux + +Some Linux distributions restrict access to HIDRAW devices by default. If your user account doesn't have permission to access the PS5 controller through HIDRAW, Unity will fall back to treating the controller as a standard gamepad. + +> [!NOTE] +> When Unity falls back to treating the controller as a standard gamepad, advanced PS5 features, such as light bar, will not be available. + +If your PS5 controller isn't detected through the HID subsystem, follow these steps to grant the necessary permissions: + +1. Open the terminal and create the following `udev` rule file: + ``` + sudo nano /etc/udev/rules.d/70-sony-controllers.rules + ``` + +2. Add the following lines to the `.rules` file. Save the file, then exit the nano editor. + ``` + # PS5 DualSense Edge + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0df2", GROUP="gamepad", MODE="0660" + + # PS5 DualSense + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", GROUP="gamepad", MODE="0660" + ``` + +3. Grant the current user access to PS5 gamepads: + ``` + sudo groupadd gamepad + sudo usermod -aG gamepad $USER + ``` + +4. Apply the new `udev` rules: + ``` + sudo udevadm control --reload-rules + sudo udevadm trigger + ``` + +5. Log out from the current session and log back in. This step is required for the session to recognize the updated group membership. diff --git a/Packages/com.unity.inputsystem/Documentation~/projectMetadata.json b/Packages/com.unity.inputsystem/Documentation~/projectMetadata.json index fe955ab06e..4f4159cec3 100644 --- a/Packages/com.unity.inputsystem/Documentation~/projectMetadata.json +++ b/Packages/com.unity.inputsystem/Documentation~/projectMetadata.json @@ -1,3 +1,7 @@ { - "hideGlobalNamespace": true + "hideGlobalNamespace": true, + "xref": [ + "com.unity.xr.openxr", + "com.unity.xr.interaction.toolkit" + ] } \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Composites/AxisCompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Composites/AxisCompositeEditor.cs.meta index c4c7f26dab..17dac52d3f 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Composites/AxisCompositeEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Composites/AxisCompositeEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 504f28d05365c4127b7216fd72484311 \ No newline at end of file +guid: 504f28d05365c4127b7216fd72484311 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector2CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector2CompositeEditor.cs.meta index 41d4b3ca73..fa6793d25e 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector2CompositeEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector2CompositeEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 0eb07b1cf75d04357a7fbd95093f1fa9 \ No newline at end of file +guid: 0eb07b1cf75d04357a7fbd95093f1fa9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector3CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector3CompositeEditor.cs.meta index 241155e999..6a9b94c4b8 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector3CompositeEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Composites/Vector3CompositeEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: d9d2c9fcdc7f646d083ee2360d5139bb \ No newline at end of file +guid: d9d2c9fcdc7f646d083ee2360d5139bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/InputControlSchemeEditorExtensions.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/InputControlSchemeEditorExtensions.cs.meta index 6a0e1e2c98..09ad9ae142 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/InputControlSchemeEditorExtensions.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/InputControlSchemeEditorExtensions.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 87e3bb948c7f2482a8f4f57942832312 \ No newline at end of file +guid: 87e3bb948c7f2482a8f4f57942832312 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta index f294d7958d..68bb8b3631 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: fde8c91ad1cbc48e7a49f856f44724c6 \ No newline at end of file +guid: fde8c91ad1cbc48e7a49f856f44724c6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta index 776e01b008..cab7b2aba9 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 991f8cb0b79a44a8687af2973bc223cc \ No newline at end of file +guid: 991f8cb0b79a44a8687af2973bc223cc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta index 5100947c28..a65a22f7f8 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: bb40b2b9ded5942e98788267f3adbc11 \ No newline at end of file +guid: bb40b2b9ded5942e98788267f3adbc11 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta index 0c0c4b6744..4884afa713 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 31783c2cca6e44f419396b9d094e2b31 \ No newline at end of file +guid: 31783c2cca6e44f419396b9d094e2b31 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta index 392b23a23e..af17b9000f 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 49b16a0da25fb4403a778600bd0278db \ No newline at end of file +guid: 49b16a0da25fb4403a778600bd0278db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporter.cs b/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporter.cs index e695f2b7eb..126fb83de3 100644 --- a/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporter.cs +++ b/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporter.cs @@ -328,8 +328,13 @@ internal static IEnumerable LoadInputActionReferencesFromA [MenuItem("Assets/Create/Input Actions")] public static void CreateInputAsset() { + #if UNITY_6000_4_OR_NEWER + ProjectWindowUtil.CreateAssetWithTextContent("New Actions." + InputActionAsset.Extension, + InputActionAsset.kDefaultAssetLayoutJson, InputActionAssetIconLoader.LoadAssetIcon()); + #else ProjectWindowUtil.CreateAssetWithContent("New Actions." + InputActionAsset.Extension, InputActionAsset.kDefaultAssetLayoutJson, InputActionAssetIconLoader.LoadAssetIcon()); + #endif } // File extension of the associated asset diff --git a/Packages/com.unity.inputsystem/Editor/BuildPipeline/LinkFileGenerator.cs b/Packages/com.unity.inputsystem/Editor/BuildPipeline/LinkFileGenerator.cs index eb5afba946..90b5fc5301 100644 --- a/Packages/com.unity.inputsystem/Editor/BuildPipeline/LinkFileGenerator.cs +++ b/Packages/com.unity.inputsystem/Editor/BuildPipeline/LinkFileGenerator.cs @@ -11,6 +11,9 @@ using UnityEditor.Compilation; using UnityEditor.UnityLinker; using UnityEngine.InputSystem.Layouts; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif namespace UnityEngine.InputSystem.Editor { @@ -40,7 +43,11 @@ public string GenerateAdditionalLinkXmlFile(BuildReport report, UnityLinkerBuild var currentAssemblyName = typeof(UnityEngine.InputSystem.InputSystem).Assembly.GetName().Name; var typesByAssemblies = new Dictionary(); +#if UNITY_6000_5_OR_NEWER + var assemblies = CurrentAssemblies.GetLoadedAssemblies(); +#else var assemblies = AppDomain.CurrentDomain.GetAssemblies(); +#endif foreach (var assembly in assemblies) { try diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta index 810e3ad3d1..3381510d18 100644 --- a/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 9744e96a967da4f29909add206a6b27f \ No newline at end of file +guid: 9744e96a967da4f29909add206a6b27f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta index d3e1b8001b..66db44ddd4 100644 --- a/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 58a253233c6804f58adf86cfee510a72 \ No newline at end of file +guid: 58a253233c6804f58adf86cfee510a72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs.meta index e1e8e11170..170cbb2347 100644 --- a/Packages/com.unity.inputsystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 8f6c78efe2b334209908669a961187f4 \ No newline at end of file +guid: 8f6c78efe2b334209908669a961187f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs b/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs index 2b5d28e7a7..6313b4343c 100644 --- a/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs @@ -5,6 +5,9 @@ using UnityEditor.UIElements; using UnityEngine.InputSystem.Utilities; using UnityEngine.UIElements; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif ////REVIEW: generalize this to something beyond just parameters? @@ -50,7 +53,11 @@ internal static Type LookupEditorForType(Type type) if (s_TypeLookupCache == null) { s_TypeLookupCache = new Dictionary(); +#if UNITY_6000_5_OR_NEWER + foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies()) +#else foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) +#endif { foreach (var typeInfo in assembly.DefinedTypes) { diff --git a/Packages/com.unity.inputsystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs b/Packages/com.unity.inputsystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs index 9ecbc3c07e..63552dd619 100644 --- a/Packages/com.unity.inputsystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs +++ b/Packages/com.unity.inputsystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs @@ -118,7 +118,7 @@ private void BuildSearchableElements(AdvancedDropdownItem item) { if (!item.children.Any()) { - if (!item.IsSeparator()) + if (!item.IsSeparator() && item.searchableName.Length > 0) m_SearchableElements.Add(item); return; } diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs.meta index e07ab8b540..b54fa716b6 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: efc4aca331ba242fab026845289179ff \ No newline at end of file +guid: efc4aca331ba242fab026845289179ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs.meta index 7b5d923e05..1a6ba978b9 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 62acf18b6b5d144bea1cbe618187f44d \ No newline at end of file +guid: 62acf18b6b5d144bea1cbe618187f44d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs.meta index 8ffdbcdb31..4caa2ebbdc 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 839e0066c5f854ddda076a4ff2f80a7b \ No newline at end of file +guid: 839e0066c5f854ddda076a4ff2f80a7b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs.meta index 0a2eaf0f45..cc614ebb22 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 91a3b2b6adad844ed9b680b378d8485a \ No newline at end of file +guid: 91a3b2b6adad844ed9b680b378d8485a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInput/PlayerInputEditor.cs b/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInput/PlayerInputEditor.cs index 259fc07560..4e5cf8e0cf 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInput/PlayerInputEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInput/PlayerInputEditor.cs @@ -97,7 +97,11 @@ public override void OnInspectorGUI() var assetChanged = CheckIfActionAssetChanged(); // initialize the editor component if the asset has changed or if it has not been initialized yet +#if UNITY_6000_4_OR_NEWER + if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetEntityId == EntityId.None) +#else if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetInstanceID == 0) +#endif { InitializeEditorComponent(assetChanged); actionsWereChanged = true; @@ -276,17 +280,22 @@ public override void OnInspectorGUI() // One such case is when the user triggers a "Reset" on the component. bool CheckIfActionAssetChanged() { - if (m_ActionsProperty.objectReferenceValue != null) - { - var assetInstanceID = m_ActionsProperty.objectReferenceValue.GetInstanceID(); - // if the m_ActionAssetInstanceID is 0 the PlayerInputEditor has not been initialized yet, but the asset did not change - bool result = assetInstanceID != m_ActionAssetInstanceID && m_ActionAssetInstanceID != 0; - m_ActionAssetInstanceID = (int)assetInstanceID; - return result; - } - - m_ActionAssetInstanceID = -1; - return false; + var obj = m_ActionsProperty.objectReferenceValue; + if (obj == null) + return false; + +#if UNITY_6000_4_OR_NEWER + EntityId assetEntityId = obj.GetEntityId(); + bool result = assetEntityId != m_ActionAssetEntityId && m_ActionAssetEntityId != EntityId.None; + m_ActionAssetEntityId = assetEntityId; + return result; +#else + int assetInstanceID = obj.GetInstanceID(); + // if the m_ActionAssetInstanceID is 0 the PlayerInputEditor has not been initialized yet, but the asset did not change + bool result = assetInstanceID != m_ActionAssetInstanceID && m_ActionAssetInstanceID != 0; + m_ActionAssetInstanceID = (int)assetInstanceID; + return result; +#endif } private void DoHelpCreateAssetUI() @@ -647,7 +656,11 @@ void AddEntry(InputAction action, PlayerInput.ActionEvent actionEvent) [NonSerialized] private bool m_NotificationBehaviorInitialized; [NonSerialized] private bool m_ActionAssetInitialized; +#if UNITY_6000_4_OR_NEWER + [NonSerialized] private EntityId m_ActionAssetEntityId; +#else [NonSerialized] private int m_ActionAssetInstanceID; +#endif } } #endif // UNITY_EDITOR diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/Steam/SteamIGAConverter.cs b/Packages/com.unity.inputsystem/Editor/Plugins/Steam/SteamIGAConverter.cs index cb6dde9dd5..6a22280e45 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/Steam/SteamIGAConverter.cs +++ b/Packages/com.unity.inputsystem/Editor/Plugins/Steam/SteamIGAConverter.cs @@ -9,23 +9,6 @@ using UnityEngine.InputSystem.Editor; using UnityEngine.InputSystem.Utilities; -////TODO: motion data support - -////TODO: haptics support - -////TODO: ensure that no two actions have the same name even between maps - -////TODO: also need to build a layout based on SteamController that has controls representing the current set of actions -//// (might need this in the runtime) - -////TODO: localization support (allow loading existing VDF file and preserving localization strings) - -////TODO: allow having actions that are ignored by Steam VDF export - -////TODO: support for getting displayNames/glyphs from Steam - -////TODO: polling in background - namespace UnityEngine.InputSystem.Steam.Editor { /// diff --git a/Packages/com.unity.inputsystem/Runtime/Plugins/iOS/InputSettingsiOSProvider.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/iOS/InputSettingsiOSProvider.cs.meta similarity index 83% rename from Packages/com.unity.inputsystem/Runtime/Plugins/iOS/InputSettingsiOSProvider.cs.meta rename to Packages/com.unity.inputsystem/Editor/Plugins/iOS/InputSettingsiOSProvider.cs.meta index a52240748d..4a4eb9ec59 100644 --- a/Packages/com.unity.inputsystem/Runtime/Plugins/iOS/InputSettingsiOSProvider.cs.meta +++ b/Packages/com.unity.inputsystem/Editor/Plugins/iOS/InputSettingsiOSProvider.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0f60c66cb10e104c96c77e03a950843 +guid: 6e6208eb562aa4ce7be0e1760d82a313 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs index 6604a61287..da94a2d94f 100644 --- a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs +++ b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using UnityEditor; using UnityEditor.Search; -using UnityEngine.Search; namespace UnityEngine.InputSystem.Editor { @@ -12,8 +11,6 @@ internal static class InputActionAssetSearchProviders const string k_AssetFolderSearchProviderId = "AssetsInputActionAssetSearchProvider"; const string k_ProjectWideActionsSearchProviderId = "ProjectWideInputActionAssetSearchProvider"; - const string k_ProjectWideAssetIdentificationString = " [Project Wide Input Actions]"; - internal static SearchProvider CreateInputActionAssetSearchProvider() { return CreateInputActionAssetSearchProvider(k_AssetFolderSearchProviderId, @@ -101,7 +98,17 @@ private static IEnumerable FilteredSearch(SearchContext context, Sea if (!label.Contains(context.searchText, System.StringComparison.InvariantCultureIgnoreCase)) continue; // Ignore due to filtering - yield return provider.CreateItem(context, asset.GetInstanceID().ToString(), label, createItemFetchDescription(asset), + + string itemId; + + // 6.4 deprecated instance ids in favour of entity ids + #if UNITY_6000_4_OR_NEWER + itemId = asset.GetEntityId().ToString(); + #else + itemId = asset.GetInstanceID().ToString(); + #endif + + yield return provider.CreateItem(context, itemId, label, createItemFetchDescription(asset), thumbnail, asset); } } @@ -110,7 +117,6 @@ private static IEnumerable FilteredSearch(SearchContext context, Sea // consistent between CreateItem and additional fetchLabel calls. private static string FetchLabel(Object obj) { - // if (obj == InputSystem.actions) return $"{obj.name}{k_ProjectWideAssetIdentificationString}"; return obj.name; } diff --git a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs index b660547db6..540422e27a 100644 --- a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs +++ b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs @@ -48,9 +48,7 @@ public void OnGUI(Rect position, SerializedProperty property, GUIContent label, // Only assign the value was actually changed by the user. if (EditorGUI.EndChangeCheck() && !Equals(candidate, current)) { - var reference = candidate as InputActionReference; - property.objectReferenceValue = reference ? - InputActionReference.Create(reference.action) : null; + property.objectReferenceValue = candidate as InputActionReference; // set to either the reference or null. } EditorGUI.EndProperty(); diff --git a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs index 8b66275e70..64725d6e89 100644 --- a/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs +++ b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs @@ -12,7 +12,7 @@ internal static class SearchConstants // SearchFlags: these flags are used to customize how search is performed and how search // results are displayed in the advanced object picker. // Note: SearchFlags.Packages is not currently used and hides all results from packages. - internal static readonly SearchFlags PickerSearchFlags = SearchFlags.Sorted | SearchFlags.OpenPicker; + internal static readonly SearchFlags PickerSearchFlags = SearchFlags.OpenPicker; // Search.SearchViewFlags : these flags are used to customize the appearance of the PickerWindow. internal static readonly Search.SearchViewFlags PickerViewFlags = SearchViewFlags.DisableBuilderModeToggle @@ -84,7 +84,17 @@ private static IEnumerable FilteredSearch(SearchContext context, Sea var label = fetchObjectLabel(asset); if (!label.Contains(context.searchText, System.StringComparison.InvariantCultureIgnoreCase)) continue; // Ignore due to filtering - yield return provider.CreateItem(context, asset.GetInstanceID().ToString(), label, createItemFetchDescription(asset), + + string itemId; + + // 6.4 deprecated instance ids in favour of entity ids + #if UNITY_6000_4_OR_NEWER + itemId = asset.GetEntityId().ToString(); + #else + itemId = asset.GetInstanceID().ToString(); + #endif + + yield return provider.CreateItem(context, itemId, label, createItemFetchDescription(asset), null, asset); } } diff --git a/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs b/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs index 0706ff005d..1ac676a022 100644 --- a/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs +++ b/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs @@ -8,7 +8,6 @@ ////TODO: detect if new input backends are enabled and put UI in here to enable them if needed -////TODO: keywords (2019.1+) #pragma warning disable CS0414 namespace UnityEngine.InputSystem.Editor { @@ -23,6 +22,11 @@ internal class InputSettingsProvider : SettingsProvider, IDisposable public const string kSettingsPath = InputSettingsPath.kSettingsRootPath + "/Settings"; + private static readonly string[] kInputSettingsKeywords = + { + "Input", "Action", "Controls", "Gamepad", "Keyboard", "Mouse", "Touch" + }; + public static void Open() { SettingsService.OpenProjectSettings(kSettingsPath); @@ -35,7 +39,8 @@ public static SettingsProvider CreateInputSettingsProvider() { // We put this in a child node called "Settings" when Project-wide Actions is enabled. // When not enabled it sits on the main package Settings node. - label = "Settings" + label = "Settings", + keywords = kInputSettingsKeywords }; } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs index c2f1930daf..be8abe7d38 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs @@ -145,10 +145,16 @@ public static Command ResetSelectedControlScheme() { return (in InputActionsEditorState state) => { - var controlSchemeSerializedProperty = state.selectedControlSchemeIndex == -1 ? null : - state.serializedObject - .FindProperty(nameof(InputActionAsset.m_ControlSchemes)) - .GetArrayElementAtIndex(state.selectedControlSchemeIndex); + SerializedProperty controlSchemeSerializedProperty = null; + var serializedProperty = state.serializedObject + .FindProperty(nameof(InputActionAsset.m_ControlSchemes)); + + if (state.selectedControlSchemeIndex < serializedProperty.arraySize) + { + controlSchemeSerializedProperty = state.selectedControlSchemeIndex == -1 ? null : + serializedProperty + .GetArrayElementAtIndex(state.selectedControlSchemeIndex); + } if (controlSchemeSerializedProperty == null) { diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs index d5b5d12094..e27c12cc6f 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs @@ -175,7 +175,15 @@ private void OnFocusOut(FocusOutEvent @event = null) private void ValidateAndSaveAsset(InputActionAsset asset) { - ProjectWideActionsAsset.Verify(asset); // Ignore verification result for save + // This code should be cleaned up once we migrate the InputControl stuff from ImGUI completely. + // Since at that point it stops being a separate window that steals focus. + // (See case ISXB-1713) + if (!InputEditorUserSettings.autoSaveInputActionAssets || m_View.IsControlSchemeViewActive()) + { + return; + } + + ProjectWideActionsAsset.Verify(asset); // Ignore verification result for save EditorHelpers.SaveAsset(AssetDatabase.GetAssetPath(asset), asset.ToJson()); } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs index ae6e80c63a..41e890533a 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs @@ -256,7 +256,6 @@ private void BuildUI() if (!rootVisualElement.styleSheets.Contains(InputActionsEditorWindowUtils.theme)) rootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme); m_View = new InputActionsEditorView(rootVisualElement, m_StateContainer, false, () => Save(isAutoSave: false)); - m_StateContainer.Initialize(rootVisualElement.Q("action-editor")); } @@ -334,8 +333,10 @@ private void OnLostFocus() // This code should be cleaned up once we migrate the InputControl stuff from ImGUI completely. // Since at that point it stops being a separate window that steals focus. // (See case ISXB-1221) - if (!InputControlPathEditor.IsShowingDropdown) + if (!InputControlPathEditor.IsShowingDropdown && !m_View.IsControlSchemeViewActive()) + { Save(isAutoSave: true); + } } analytics.RegisterEditorFocusOut(); @@ -415,8 +416,7 @@ private bool TryUpdateFromAsset() var assetPath = AssetDatabase.GUIDToAssetPath(m_AssetGUID); if (assetPath == null) { - Debug.LogWarning( - $"Failed to open InputActionAsset with GUID {m_AssetGUID}. The asset might have been deleted."); + Debug.LogWarning($"Failed to open InputActionAsset with GUID {m_AssetGUID}. The asset might have been deleted."); return false; } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml index 28e56ee2e7..b20b3113e3 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml @@ -5,6 +5,6 @@ - + diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml index ae1268d759..b91ba6934b 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml @@ -4,15 +4,15 @@ - - + + - - - + + @@ -20,36 +20,36 @@ - - + + - + - + - + - - + + - + - + - + - + - + - + diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss index 51fa7fa70f..9b3ca4afaa 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss @@ -106,9 +106,9 @@ padding-top: 4px; padding-bottom: 4px; border-bottom-width: 1px; - height: 28px; - min-height: 28px; - font-size: 14px; + height: 20px; + min-height: 20px; + font-size: 12px; -unity-font-style: bold; align-items: center; justify-content: flex-start; @@ -122,6 +122,11 @@ .properties-foldout-toggle { background-color: var(--input-editor-colors-properties-foldout); + height: 20px; +} + +.properties-foldout-toggle:hover { + background-color: var(--input-editor-colors-properties-foldout-toggle-hover); } .name-and-parameter-empty-label { @@ -175,12 +180,34 @@ } .add-binging-button-dark-theme { + width: 16px; + height: 16px; background-image: resource('d_Toolbar Plus More.png'); + background-color: transparent; -unity-background-scale-mode: scale-to-fit; } .add-binging-button { + width: 16px; + height: 16px; background-image: resource('Toolbar Plus More.png'); + background-color: transparent; + -unity-background-scale-mode: scale-to-fit; +} + +.add-button-dark-theme { + width: 16px; + height: 16px; + background-image: resource('d_Toolbar Plus.png'); + background-color: transparent; + -unity-background-scale-mode: scale-to-fit; +} + +.add-button { + width: 16px; + height: 16px; + background-image: resource('Toolbar Plus.png'); + background-color: transparent; -unity-background-scale-mode: scale-to-fit; } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss index 2585334660..1d0e5b2a1f 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss @@ -1,4 +1,5 @@ :root { - --input-editor-colors-properties-foldout: rgb(34, 34, 34); - --input-editor-colors-properties-foldout-border: #808080; + --input-editor-colors-properties-foldout: #3E3E3E; + --input-editor-colors-properties-foldout-border: #1A1A1A; + --input-editor-colors-properties-foldout-toggle-hover: #474747; } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss index 0edb85298b..843547ba0c 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss @@ -1,4 +1,5 @@ :root { --input-editor-colors-properties-foldout: #DFDFDF; --input-editor-colors-properties-foldout-border: #808080; + --input-editor-colors-properties-foldout-toggle-hover: #e6e6e6; } diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs index a663a4a81f..5fded27b9a 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs @@ -2,6 +2,7 @@ using CmdEvents = UnityEngine.InputSystem.Editor.InputActionsEditorConstants.CommandEvents; using System.Collections.Generic; using System.Linq; +using UnityEditor; using UnityEngine.UIElements; namespace UnityEngine.InputSystem.Editor @@ -65,6 +66,8 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer) CreateSelector(Selectors.GetActionMapNames, Selectors.GetSelectedActionMap, (actionMapNames, actionMap, state) => new ViewState(actionMap, actionMapNames, state.GetDisabledActionMaps(actionMapNames.ToList()))); m_AddActionMapButton = root.Q