Skip to content

Commit 02fdac7

Browse files
jfreire-unityjfreire-unity
committed
Merge remote-tracking branch 'origin/develop' into joao/editor-runtime-split-for-module
# Conflicts: # Packages/com.unity.inputsystem/Editor/InputSystemObject.cs # Packages/com.unity.inputsystem/Editor/InputSystemObject.cs.meta # Packages/com.unity.inputsystem/InputSystem/InputSystemObject.cs.meta # Packages/com.unity.inputsystem/Runtime/Actions/DeferBindingResolutionContext.cs # Packages/com.unity.inputsystem/Runtime/Actions/DeferBindingResolutionContext.cs.meta # Packages/com.unity.inputsystem/Runtime/Actions/InputActionAsset.cs # Packages/com.unity.inputsystem/Runtime/InputManager.cs # Packages/com.unity.inputsystem/Runtime/InputSystem.cs # Packages/com.unity.inputsystem/Runtime/InputSystemStateManager.cs # Packages/com.unity.inputsystem/Runtime/InputSystemStateManager.cs.meta # Packages/com.unity.inputsystem/Runtime/InputSystemTestHooks.cs # Packages/com.unity.inputsystem/Runtime/InputSystemTestHooks.cs.meta # Packages/com.unity.inputsystem/Runtime/Utilities/DirtyAssetTracker.cs # Packages/com.unity.inputsystem/Runtime/Utilities/DirtyAssetTracker.cs.meta # Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs # Packages/com.unity.inputsystem/ValidationExceptions.json
2 parents a517e6f + dc22083 commit 02fdac7

File tree

95 files changed

+2415
-1684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2415
-1684
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Packages/com.unity.package-manager-doctools/
4545

4646
Tools/CI/[Bb]in
4747
Tools/CI/[Oo]bj
48+
Tools/CI/.claude/**
4849

4950
.Editor
5051
.bin

‎.yamato/generated-scripts/infrastructure-instability-detection-linux.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

‎.yamato/generated-scripts/infrastructure-instability-detection-mac.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

‎.yamato/generated-scripts/infrastructure-instability-detection-win.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
rem This is an auto-generated script. Do not edit manually!
33

44
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
5-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
5+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
66
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
77
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
88
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5

‎.yamato/input-system-editor-functional-tests.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
inputsystem-editorfunctionaltests_-_2022_3_-_macos:
55
name: InputSystem-EditorFunctionalTests - 2022.3 - MacOS
66
agent:
7-
image: package-ci/macos-13:default
7+
image: package-ci/macos-13:v4
88
type: Unity::VM::osx
99
flavor: b1.xlarge
1010
commands:
@@ -22,7 +22,7 @@ inputsystem-editorfunctionaltests_-_2022_3_-_macos:
2222
inputsystem-editorfunctionaltests_-_2022_3_-_ubuntu:
2323
name: InputSystem-EditorFunctionalTests - 2022.3 - Ubuntu
2424
agent:
25-
image: package-ci/ubuntu-22.04:default
25+
image: package-ci/ubuntu-22.04:v4
2626
type: Unity::VM
2727
flavor: b1.large
2828
commands:
@@ -40,7 +40,7 @@ inputsystem-editorfunctionaltests_-_2022_3_-_ubuntu:
4040
inputsystem-editorfunctionaltests_-_2022_3_-_windows:
4141
name: InputSystem-EditorFunctionalTests - 2022.3 - Windows
4242
agent:
43-
image: package-ci/win10:default
43+
image: package-ci/win10:v4
4444
type: Unity::VM
4545
flavor: b1.large
4646
commands:
@@ -59,7 +59,7 @@ inputsystem-editorfunctionaltests_-_2022_3_-_windows:
5959
inputsystem-editorfunctionaltests_-_6000_0_-_macos:
6060
name: InputSystem-EditorFunctionalTests - 6000.0 - MacOS
6161
agent:
62-
image: package-ci/macos-13:default
62+
image: package-ci/macos-13:v4
6363
type: Unity::VM::osx
6464
flavor: b1.xlarge
6565
commands:
@@ -77,7 +77,7 @@ inputsystem-editorfunctionaltests_-_6000_0_-_macos:
7777
inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu:
7878
name: InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu
7979
agent:
80-
image: package-ci/ubuntu-22.04:default
80+
image: package-ci/ubuntu-22.04:v4
8181
type: Unity::VM
8282
flavor: b1.large
8383
commands:
@@ -95,7 +95,7 @@ inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu:
9595
inputsystem-editorfunctionaltests_-_6000_0_-_windows:
9696
name: InputSystem-EditorFunctionalTests - 6000.0 - Windows
9797
agent:
98-
image: package-ci/win10:default
98+
image: package-ci/win10:v4
9999
type: Unity::VM
100100
flavor: b1.large
101101
commands:
@@ -114,7 +114,7 @@ inputsystem-editorfunctionaltests_-_6000_0_-_windows:
114114
inputsystem-editorfunctionaltests_-_6000_3_-_macos:
115115
name: InputSystem-EditorFunctionalTests - 6000.3 - MacOS
116116
agent:
117-
image: package-ci/macos-13:default
117+
image: package-ci/macos-13:v4
118118
type: Unity::VM::osx
119119
flavor: b1.xlarge
120120
commands:
@@ -132,7 +132,7 @@ inputsystem-editorfunctionaltests_-_6000_3_-_macos:
132132
inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu:
133133
name: InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu
134134
agent:
135-
image: package-ci/ubuntu-22.04:default
135+
image: package-ci/ubuntu-22.04:v4
136136
type: Unity::VM
137137
flavor: b1.large
138138
commands:
@@ -150,7 +150,7 @@ inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu:
150150
inputsystem-editorfunctionaltests_-_6000_3_-_windows:
151151
name: InputSystem-EditorFunctionalTests - 6000.3 - Windows
152152
agent:
153-
image: package-ci/win10:default
153+
image: package-ci/win10:v4
154154
type: Unity::VM
155155
flavor: b1.large
156156
commands:
@@ -169,7 +169,7 @@ inputsystem-editorfunctionaltests_-_6000_3_-_windows:
169169
inputsystem-editorfunctionaltests_-_6000_4_-_macos:
170170
name: InputSystem-EditorFunctionalTests - 6000.4 - MacOS
171171
agent:
172-
image: package-ci/macos-13:default
172+
image: package-ci/macos-13:v4
173173
type: Unity::VM::osx
174174
flavor: b1.xlarge
175175
commands:
@@ -187,7 +187,7 @@ inputsystem-editorfunctionaltests_-_6000_4_-_macos:
187187
inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu:
188188
name: InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu
189189
agent:
190-
image: package-ci/ubuntu-22.04:default
190+
image: package-ci/ubuntu-22.04:v4
191191
type: Unity::VM
192192
flavor: b1.large
193193
commands:
@@ -205,7 +205,7 @@ inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu:
205205
inputsystem-editorfunctionaltests_-_6000_4_-_windows:
206206
name: InputSystem-EditorFunctionalTests - 6000.4 - Windows
207207
agent:
208-
image: package-ci/win10:default
208+
image: package-ci/win10:v4
209209
type: Unity::VM
210210
flavor: b1.large
211211
commands:
@@ -224,7 +224,7 @@ inputsystem-editorfunctionaltests_-_6000_4_-_windows:
224224
inputsystem-editorfunctionaltests_-_6000_5_-_macos:
225225
name: InputSystem-EditorFunctionalTests - 6000.5 - MacOS
226226
agent:
227-
image: package-ci/macos-13:default
227+
image: package-ci/macos-13:v4
228228
type: Unity::VM::osx
229229
flavor: b1.xlarge
230230
commands:
@@ -242,7 +242,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_macos:
242242
inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu:
243243
name: InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu
244244
agent:
245-
image: package-ci/ubuntu-22.04:default
245+
image: package-ci/ubuntu-22.04:v4
246246
type: Unity::VM
247247
flavor: b1.large
248248
commands:
@@ -260,7 +260,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu:
260260
inputsystem-editorfunctionaltests_-_6000_5_-_windows:
261261
name: InputSystem-EditorFunctionalTests - 6000.5 - Windows
262262
agent:
263-
image: package-ci/win10:default
263+
image: package-ci/win10:v4
264264
type: Unity::VM
265265
flavor: b1.large
266266
commands:
@@ -279,7 +279,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows:
279279
inputsystem-editorfunctionaltests_-_6000_6_-_macos:
280280
name: InputSystem-EditorFunctionalTests - 6000.6 - MacOS
281281
agent:
282-
image: package-ci/macos-13:default
282+
image: package-ci/macos-13:v4
283283
type: Unity::VM::osx
284284
flavor: b1.xlarge
285285
commands:
@@ -297,7 +297,7 @@ inputsystem-editorfunctionaltests_-_6000_6_-_macos:
297297
inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu:
298298
name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu
299299
agent:
300-
image: package-ci/ubuntu-22.04:default
300+
image: package-ci/ubuntu-22.04:v4
301301
type: Unity::VM
302302
flavor: b1.large
303303
commands:
@@ -315,7 +315,7 @@ inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu:
315315
inputsystem-editorfunctionaltests_-_6000_6_-_windows:
316316
name: InputSystem-EditorFunctionalTests - 6000.6 - Windows
317317
agent:
318-
image: package-ci/win10:default
318+
image: package-ci/win10:v4
319319
type: Unity::VM
320320
flavor: b1.large
321321
commands:

‎.yamato/input-system-editor-performance-tests.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
inputsystem-editorperformancetests_-_2022_3_-_macos:
55
name: InputSystem-EditorPerformanceTests - 2022.3 - MacOS
66
agent:
7-
image: package-ci/macos-13:default
7+
image: package-ci/macos-13:v4
88
type: Unity::VM::osx
99
flavor: b1.xlarge
1010
commands:
@@ -22,7 +22,7 @@ inputsystem-editorperformancetests_-_2022_3_-_macos:
2222
inputsystem-editorperformancetests_-_2022_3_-_ubuntu:
2323
name: InputSystem-EditorPerformanceTests - 2022.3 - Ubuntu
2424
agent:
25-
image: package-ci/ubuntu-22.04:default
25+
image: package-ci/ubuntu-22.04:v4
2626
type: Unity::VM
2727
flavor: b1.large
2828
commands:
@@ -40,7 +40,7 @@ inputsystem-editorperformancetests_-_2022_3_-_ubuntu:
4040
inputsystem-editorperformancetests_-_2022_3_-_windows:
4141
name: InputSystem-EditorPerformanceTests - 2022.3 - Windows
4242
agent:
43-
image: package-ci/win10:default
43+
image: package-ci/win10:v4
4444
type: Unity::VM
4545
flavor: b1.large
4646
commands:
@@ -59,7 +59,7 @@ inputsystem-editorperformancetests_-_2022_3_-_windows:
5959
inputsystem-editorperformancetests_-_6000_0_-_macos:
6060
name: InputSystem-EditorPerformanceTests - 6000.0 - MacOS
6161
agent:
62-
image: package-ci/macos-13:default
62+
image: package-ci/macos-13:v4
6363
type: Unity::VM::osx
6464
flavor: b1.xlarge
6565
commands:
@@ -77,7 +77,7 @@ inputsystem-editorperformancetests_-_6000_0_-_macos:
7777
inputsystem-editorperformancetests_-_6000_0_-_ubuntu:
7878
name: InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu
7979
agent:
80-
image: package-ci/ubuntu-22.04:default
80+
image: package-ci/ubuntu-22.04:v4
8181
type: Unity::VM
8282
flavor: b1.large
8383
commands:
@@ -95,7 +95,7 @@ inputsystem-editorperformancetests_-_6000_0_-_ubuntu:
9595
inputsystem-editorperformancetests_-_6000_0_-_windows:
9696
name: InputSystem-EditorPerformanceTests - 6000.0 - Windows
9797
agent:
98-
image: package-ci/win10:default
98+
image: package-ci/win10:v4
9999
type: Unity::VM
100100
flavor: b1.large
101101
commands:
@@ -114,7 +114,7 @@ inputsystem-editorperformancetests_-_6000_0_-_windows:
114114
inputsystem-editorperformancetests_-_6000_3_-_macos:
115115
name: InputSystem-EditorPerformanceTests - 6000.3 - MacOS
116116
agent:
117-
image: package-ci/macos-13:default
117+
image: package-ci/macos-13:v4
118118
type: Unity::VM::osx
119119
flavor: b1.xlarge
120120
commands:
@@ -132,7 +132,7 @@ inputsystem-editorperformancetests_-_6000_3_-_macos:
132132
inputsystem-editorperformancetests_-_6000_3_-_ubuntu:
133133
name: InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu
134134
agent:
135-
image: package-ci/ubuntu-22.04:default
135+
image: package-ci/ubuntu-22.04:v4
136136
type: Unity::VM
137137
flavor: b1.large
138138
commands:
@@ -150,7 +150,7 @@ inputsystem-editorperformancetests_-_6000_3_-_ubuntu:
150150
inputsystem-editorperformancetests_-_6000_3_-_windows:
151151
name: InputSystem-EditorPerformanceTests - 6000.3 - Windows
152152
agent:
153-
image: package-ci/win10:default
153+
image: package-ci/win10:v4
154154
type: Unity::VM
155155
flavor: b1.large
156156
commands:
@@ -169,7 +169,7 @@ inputsystem-editorperformancetests_-_6000_3_-_windows:
169169
inputsystem-editorperformancetests_-_6000_4_-_macos:
170170
name: InputSystem-EditorPerformanceTests - 6000.4 - MacOS
171171
agent:
172-
image: package-ci/macos-13:default
172+
image: package-ci/macos-13:v4
173173
type: Unity::VM::osx
174174
flavor: b1.xlarge
175175
commands:
@@ -187,7 +187,7 @@ inputsystem-editorperformancetests_-_6000_4_-_macos:
187187
inputsystem-editorperformancetests_-_6000_4_-_ubuntu:
188188
name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu
189189
agent:
190-
image: package-ci/ubuntu-22.04:default
190+
image: package-ci/ubuntu-22.04:v4
191191
type: Unity::VM
192192
flavor: b1.large
193193
commands:
@@ -205,7 +205,7 @@ inputsystem-editorperformancetests_-_6000_4_-_ubuntu:
205205
inputsystem-editorperformancetests_-_6000_4_-_windows:
206206
name: InputSystem-EditorPerformanceTests - 6000.4 - Windows
207207
agent:
208-
image: package-ci/win10:default
208+
image: package-ci/win10:v4
209209
type: Unity::VM
210210
flavor: b1.large
211211
commands:
@@ -224,7 +224,7 @@ inputsystem-editorperformancetests_-_6000_4_-_windows:
224224
inputsystem-editorperformancetests_-_6000_5_-_macos:
225225
name: InputSystem-EditorPerformanceTests - 6000.5 - MacOS
226226
agent:
227-
image: package-ci/macos-13:default
227+
image: package-ci/macos-13:v4
228228
type: Unity::VM::osx
229229
flavor: b1.xlarge
230230
commands:
@@ -242,7 +242,7 @@ inputsystem-editorperformancetests_-_6000_5_-_macos:
242242
inputsystem-editorperformancetests_-_6000_5_-_ubuntu:
243243
name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu
244244
agent:
245-
image: package-ci/ubuntu-22.04:default
245+
image: package-ci/ubuntu-22.04:v4
246246
type: Unity::VM
247247
flavor: b1.large
248248
commands:
@@ -260,7 +260,7 @@ inputsystem-editorperformancetests_-_6000_5_-_ubuntu:
260260
inputsystem-editorperformancetests_-_6000_5_-_windows:
261261
name: InputSystem-EditorPerformanceTests - 6000.5 - Windows
262262
agent:
263-
image: package-ci/win10:default
263+
image: package-ci/win10:v4
264264
type: Unity::VM
265265
flavor: b1.large
266266
commands:
@@ -279,7 +279,7 @@ inputsystem-editorperformancetests_-_6000_5_-_windows:
279279
inputsystem-editorperformancetests_-_6000_6_-_macos:
280280
name: InputSystem-EditorPerformanceTests - 6000.6 - MacOS
281281
agent:
282-
image: package-ci/macos-13:default
282+
image: package-ci/macos-13:v4
283283
type: Unity::VM::osx
284284
flavor: b1.xlarge
285285
commands:
@@ -297,7 +297,7 @@ inputsystem-editorperformancetests_-_6000_6_-_macos:
297297
inputsystem-editorperformancetests_-_6000_6_-_ubuntu:
298298
name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu
299299
agent:
300-
image: package-ci/ubuntu-22.04:default
300+
image: package-ci/ubuntu-22.04:v4
301301
type: Unity::VM
302302
flavor: b1.large
303303
commands:
@@ -315,7 +315,7 @@ inputsystem-editorperformancetests_-_6000_6_-_ubuntu:
315315
inputsystem-editorperformancetests_-_6000_6_-_windows:
316316
name: InputSystem-EditorPerformanceTests - 6000.6 - Windows
317317
agent:
318-
image: package-ci/win10:default
318+
image: package-ci/win10:v4
319319
type: Unity::VM
320320
flavor: b1.large
321321
commands:

0 commit comments

Comments
 (0)