Skip to content

Merge 'develop' branch into 'joao/editor-runtime-split-for-module' branch #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josepmariapujol-unity merged 34 commits into from
Jan 30, 2026
Merged

Merge 'develop' branch into 'joao/editor-runtime-split-for-module' branch #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
aaaf3cc
CHANGE: Set Android jobs to use UTR 1.42 to fix currently failed jobs…
jfreire-unity Dec 1, 2025
6f1ad16
FIX: Address compilation warnings from Unity 6.4 and 6.5 (#2295)
K-Tone Dec 1, 2025
05e8e90
FIX: Extra empty lines added in the control bindings drop-down for so…
K-Tone Dec 11, 2025
20d06ce
DOCS: DOCATT-8754: Updated TrackedDevice class documentation (#2298)
unitALG Dec 11, 2025
ad95eca
DOCS: Update documentation to reflect support for PS5 controller on L…
SteveDiniro Dec 15, 2025
3b7340f
FIX: out of range exception when pressing undo after creating and edi…
Darren-Kelly-Unity Dec 15, 2025
55bc806
FIX: Autosave closes add control scheme ui element on save. (ISXB-171…
Darren-Kelly-Unity Dec 16, 2025
e8095ae
DOCS: Update documentation for MonoBehaviour OnMouse events (ISX-2383…
ritamerkl Dec 16, 2025
0c39606
FIX: InputActionReference not set on Prefab and ScriptableObject (ISB…
MorganHoarau Dec 17, 2025
71886a6
DOCS: Update to clarify that Linux supports touchscreen (#2304)
ritamerkl Dec 18, 2025
a9d60ae
FIX: UI inconsistencies - Add buttons use add icon in input actions w…
josepmariapujol-unity Dec 18, 2025
5080817
FIX: Migrate Mono APIs to CoreCLR-compatible APIs (#2289)
MiroBrodlovaUnityGit Dec 19, 2025
6a58700
FIX: Tooltip bug for Action > Control type to avoid “Button” terminol…
josepmariapujol-unity Jan 7, 2026
ffb1879
FIX: Icon fix for action maps buttons in background and resolution (#…
josepmariapujol-unity Jan 8, 2026
ae27c98
FIX: Summary update fixing a bug for TapInteraction (#2308)
josepmariapujol-unity Jan 12, 2026
d4ef8cf
CHANGE: Update API validation exception to version 1.17.1
Pauliusd01 Jan 12, 2026
c9695df
FIX: Regenerate YAML job definitions by running the generation comman…
josepmariapujol-unity Jan 12, 2026
be2449e
CHANGE: Bump version to 1.18.0 (#2320)
Pauliusd01 Jan 12, 2026
2d1677c
FIX: Removing warnings from recipe files displaying on regenerating C…
josepmariapujol-unity Jan 12, 2026
7eefb98
CHANGE: Removing TODOs and moving them to Jira tasks (#2316)
josepmariapujol-unity Jan 13, 2026
6d3d431
DOCS: Fix variable name for submit action in documentation (#2305)
amanda-butler-unity Jan 13, 2026
0cb3d8f
FIX: Update ignored packages in Preview APV and regenerate YAML job d…
Pauliusd01 Jan 14, 2026
f3ea709
RELEASE: 1.18.0
Pauliusd01 Jan 14, 2026
9c349d5
CHANGE: Bump version to 1.18.1 (#2323)
Pauliusd01 Jan 14, 2026
6ba64b2
CHANGE: Remove 6000.2 from CI (#2324)
Pauliusd01 Jan 15, 2026
a83a39f
FIX: Handle consecutive wildcards in StringMatches (1/x) (#2311)
josepmariapujol-unity Jan 16, 2026
0c988bb
CHANGE: Update from InstanceID to EntityId in PlayerInputEditor.cs (#…
josepmariapujol-unity Jan 19, 2026
0f225ca
FIX: Auto-Save toggle button alignment by a few pixels (#2327)
josepmariapujol-unity Jan 19, 2026
d919ab2
NEW: keywords for InputSystem project settings window (#2329)
josepmariapujol-unity Jan 20, 2026
48149e1
FIX: Align title font size with toolbar style in Input Action window …
josepmariapujol-unity Jan 21, 2026
bdd4741
FIX: headers under Action Properties similar to gameObject component …
josepmariapujol-unity Jan 22, 2026
1532d3f
FIX: Misaligned Virtual Cursor when changing resolution (ISXB-1119) (…
Darren-Kelly-Unity Jan 26, 2026
5f227dd
Merge branch 'develop' into input/merge-develop-branch
josepmariapujol-unity Jan 29, 2026
1a15cb4
Updating metafiles (.meta) (#2337)
josepmariapujol-unity Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .yamato/config.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
editors:
- version: 2022.3
- version: 6000.0
- version: 6000.2
- version: 6000.3
- version: 6000.4
- version: trunk
Expand Down
55 changes: 0 additions & 55 deletions .yamato/input-system-editor-functional-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
55 changes: 0 additions & 55 deletions .yamato/input-system-editor-performance-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
89 changes: 0 additions & 89 deletions .yamato/input-system-mobile-functional-build-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading