Skip to content

Commit 1979304

Browse files
Darren-Kelly-UnityDarren-Kelly-Unity
authored
Merge branch 'develop' into bugfix/ISXB-1607-null-ref-with-undo-when-editing-new-controlscheme
2 parents cf3f6a5 + 6e964ce commit 1979304

File tree

82 files changed

+5232
-2199
lines changed

Some content is hidden

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

82 files changed

+5232
-2199
lines changed

‎.yamato/PVPexemptions.json‎

Lines changed: 0 additions & 1588 deletions
This file was deleted.

‎.yamato/config.metadata‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
editors:
2-
- version: 2021.3
32
- version: 2022.3
43
run_tvos: false
54
- version: 6000.0
@@ -10,84 +9,4 @@ editors:
109
run_ios_15: true
1110
run_tvos: false
1211

13-
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
14-
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
15-
16-
unity_downloader_install: pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
17-
1812
upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
19-
20-
platforms_win:
21-
- name: win
22-
type: Unity::VM
23-
image: package-ci/win10:v4
24-
flavor: b1.large
25-
- name: win_standalone
26-
type: Unity::VM
27-
image: package-ci/win10:v4
28-
flavor: b1.large
29-
runtime: StandaloneWindows64
30-
- name: win_standalone_il2cpp
31-
type: Unity::VM
32-
image: package-ci/win10:v4
33-
flavor: b1.large
34-
runtime: StandaloneWindows64
35-
scripting-backend: Il2Cpp
36-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
37-
platforms_nix:
38-
- name: mac
39-
type: Unity::VM::osx
40-
image: package-ci/macos-13:v4
41-
flavor: m1.mac
42-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
43-
- name: mac_standalone
44-
type: Unity::VM::osx
45-
image: package-ci/macos-13:v4
46-
flavor: m1.mac
47-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
48-
runtime: StandaloneOSX
49-
- name: mac_standalone_il2cpp
50-
type: Unity::VM::osx
51-
image: package-ci/macos-13:v4
52-
flavor: m1.mac
53-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
54-
runtime: StandaloneOSX
55-
scripting-backend: Il2Cpp
56-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
57-
- name: linux
58-
type: Unity::VM
59-
image: package-ci/ubuntu-22.04:v4
60-
flavor: b1.large
61-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
62-
- name: linux_standalone
63-
type: Unity::VM
64-
image: package-ci/ubuntu-22.04:v4
65-
flavor: b1.large
66-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
67-
runtime: StandaloneLinux64
68-
- name: linux_standalone_il2cpp
69-
type: Unity::VM
70-
image: package-ci/ubuntu-22.04:v4
71-
flavor: b1.large
72-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
73-
runtime: StandaloneLinux64
74-
scripting-backend: Il2Cpp
75-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
76-
scripting_backends:
77-
- name: mono
78-
- name: il2cpp
79-
80-
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4
81-
82-
test_category:
83-
- name: performance
84-
- name: functional
85-
86-
instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0
87-
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
88-
89-
instabilities_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
90-
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
91-
92-
yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
93-
yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

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

Lines changed: 277 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
3+
# InputSystem-EditorPerformanceTests - 2022.3 - MacOS
4+
inputsystem-editorperformancetests_-_2022_3_-_macos:
5+
name: InputSystem-EditorPerformanceTests - 2022.3 - MacOS
6+
agent:
7+
image: package-ci/macos-13:default
8+
type: Unity::VM::osx
9+
flavor: b1.xlarge
10+
commands:
11+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
12+
- command: unity-downloader-cli -u 2022.3/staging -c Editor --fast --wait
13+
- 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 --artifacts-path=artifacts
14+
after:
15+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
16+
artifacts:
17+
artifacts:
18+
paths:
19+
- artifacts/**/*
20+
21+
# InputSystem-EditorPerformanceTests - 2022.3 - Ubuntu
22+
inputsystem-editorperformancetests_-_2022_3_-_ubuntu:
23+
name: InputSystem-EditorPerformanceTests - 2022.3 - Ubuntu
24+
agent:
25+
image: package-ci/ubuntu-22.04:default
26+
type: Unity::VM
27+
flavor: b1.large
28+
commands:
29+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
30+
- command: unity-downloader-cli -u 2022.3/staging -c Editor --fast --wait
31+
- 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 --artifacts-path=artifacts
32+
after:
33+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
34+
artifacts:
35+
artifacts:
36+
paths:
37+
- artifacts/**/*
38+
39+
# InputSystem-EditorPerformanceTests - 2022.3 - Windows
40+
inputsystem-editorperformancetests_-_2022_3_-_windows:
41+
name: InputSystem-EditorPerformanceTests - 2022.3 - Windows
42+
agent:
43+
image: package-ci/win10:default
44+
type: Unity::VM
45+
flavor: b1.large
46+
commands:
47+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
48+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
49+
- command: unity-downloader-cli -u 2022.3/staging -c Editor --fast --wait
50+
- 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 --artifacts-path=artifacts
51+
after:
52+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
53+
artifacts:
54+
artifacts:
55+
paths:
56+
- artifacts/**/*
57+
58+
# InputSystem-EditorPerformanceTests - 6000.0 - MacOS
59+
inputsystem-editorperformancetests_-_6000_0_-_macos:
60+
name: InputSystem-EditorPerformanceTests - 6000.0 - MacOS
61+
agent:
62+
image: package-ci/macos-13:default
63+
type: Unity::VM::osx
64+
flavor: b1.xlarge
65+
commands:
66+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
67+
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast --wait
68+
- 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 --artifacts-path=artifacts
69+
after:
70+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
71+
artifacts:
72+
artifacts:
73+
paths:
74+
- artifacts/**/*
75+
76+
# InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu
77+
inputsystem-editorperformancetests_-_6000_0_-_ubuntu:
78+
name: InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu
79+
agent:
80+
image: package-ci/ubuntu-22.04:default
81+
type: Unity::VM
82+
flavor: b1.large
83+
commands:
84+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
85+
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast --wait
86+
- 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 --artifacts-path=artifacts
87+
after:
88+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
89+
artifacts:
90+
artifacts:
91+
paths:
92+
- artifacts/**/*
93+
94+
# InputSystem-EditorPerformanceTests - 6000.0 - Windows
95+
inputsystem-editorperformancetests_-_6000_0_-_windows:
96+
name: InputSystem-EditorPerformanceTests - 6000.0 - Windows
97+
agent:
98+
image: package-ci/win10:default
99+
type: Unity::VM
100+
flavor: b1.large
101+
commands:
102+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
103+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
104+
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast --wait
105+
- 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 --artifacts-path=artifacts
106+
after:
107+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
108+
artifacts:
109+
artifacts:
110+
paths:
111+
- artifacts/**/*
112+
113+
# InputSystem-EditorPerformanceTests - 6000.2 - MacOS
114+
inputsystem-editorperformancetests_-_6000_2_-_macos:
115+
name: InputSystem-EditorPerformanceTests - 6000.2 - MacOS
116+
agent:
117+
image: package-ci/macos-13:default
118+
type: Unity::VM::osx
119+
flavor: b1.xlarge
120+
commands:
121+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
122+
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
123+
- 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 --artifacts-path=artifacts
124+
after:
125+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
126+
artifacts:
127+
artifacts:
128+
paths:
129+
- artifacts/**/*
130+
131+
# InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu
132+
inputsystem-editorperformancetests_-_6000_2_-_ubuntu:
133+
name: InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu
134+
agent:
135+
image: package-ci/ubuntu-22.04:default
136+
type: Unity::VM
137+
flavor: b1.large
138+
commands:
139+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
140+
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
141+
- 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 --artifacts-path=artifacts
142+
after:
143+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
144+
artifacts:
145+
artifacts:
146+
paths:
147+
- artifacts/**/*
148+
149+
# InputSystem-EditorPerformanceTests - 6000.2 - Windows
150+
inputsystem-editorperformancetests_-_6000_2_-_windows:
151+
name: InputSystem-EditorPerformanceTests - 6000.2 - Windows
152+
agent:
153+
image: package-ci/win10:default
154+
type: Unity::VM
155+
flavor: b1.large
156+
commands:
157+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
158+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
159+
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
160+
- 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 --artifacts-path=artifacts
161+
after:
162+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
163+
artifacts:
164+
artifacts:
165+
paths:
166+
- artifacts/**/*
167+
168+
# InputSystem-EditorPerformanceTests - 6000.3 - MacOS
169+
inputsystem-editorperformancetests_-_6000_3_-_macos:
170+
name: InputSystem-EditorPerformanceTests - 6000.3 - MacOS
171+
agent:
172+
image: package-ci/macos-13:default
173+
type: Unity::VM::osx
174+
flavor: b1.xlarge
175+
commands:
176+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
177+
- command: unity-downloader-cli -u 6000.3/staging -c Editor --fast --wait
178+
- 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 --artifacts-path=artifacts
179+
after:
180+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
181+
artifacts:
182+
artifacts:
183+
paths:
184+
- artifacts/**/*
185+
186+
# InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu
187+
inputsystem-editorperformancetests_-_6000_3_-_ubuntu:
188+
name: InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu
189+
agent:
190+
image: package-ci/ubuntu-22.04:default
191+
type: Unity::VM
192+
flavor: b1.large
193+
commands:
194+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
195+
- command: unity-downloader-cli -u 6000.3/staging -c Editor --fast --wait
196+
- 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 --artifacts-path=artifacts
197+
after:
198+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
199+
artifacts:
200+
artifacts:
201+
paths:
202+
- artifacts/**/*
203+
204+
# InputSystem-EditorPerformanceTests - 6000.3 - Windows
205+
inputsystem-editorperformancetests_-_6000_3_-_windows:
206+
name: InputSystem-EditorPerformanceTests - 6000.3 - Windows
207+
agent:
208+
image: package-ci/win10:default
209+
type: Unity::VM
210+
flavor: b1.large
211+
commands:
212+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
213+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
214+
- command: unity-downloader-cli -u 6000.3/staging -c Editor --fast --wait
215+
- 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 --artifacts-path=artifacts
216+
after:
217+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
218+
artifacts:
219+
artifacts:
220+
paths:
221+
- artifacts/**/*
222+
223+
# InputSystem-EditorPerformanceTests - 6000.4 - MacOS
224+
inputsystem-editorperformancetests_-_6000_4_-_macos:
225+
name: InputSystem-EditorPerformanceTests - 6000.4 - MacOS
226+
agent:
227+
image: package-ci/macos-13:default
228+
type: Unity::VM::osx
229+
flavor: b1.xlarge
230+
commands:
231+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
232+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
233+
- 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 --artifacts-path=artifacts
234+
after:
235+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
236+
artifacts:
237+
artifacts:
238+
paths:
239+
- artifacts/**/*
240+
241+
# InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu
242+
inputsystem-editorperformancetests_-_6000_4_-_ubuntu:
243+
name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu
244+
agent:
245+
image: package-ci/ubuntu-22.04:default
246+
type: Unity::VM
247+
flavor: b1.large
248+
commands:
249+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
250+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
251+
- 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 --artifacts-path=artifacts
252+
after:
253+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
254+
artifacts:
255+
artifacts:
256+
paths:
257+
- artifacts/**/*
258+
259+
# InputSystem-EditorPerformanceTests - 6000.4 - Windows
260+
inputsystem-editorperformancetests_-_6000_4_-_windows:
261+
name: InputSystem-EditorPerformanceTests - 6000.4 - Windows
262+
agent:
263+
image: package-ci/win10:default
264+
type: Unity::VM
265+
flavor: b1.large
266+
commands:
267+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
268+
- command: git clone --branch "2.3.0-preview" [email protected]:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
269+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
270+
- 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 --artifacts-path=artifacts
271+
after:
272+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
273+
artifacts:
274+
artifacts:
275+
paths:
276+
- artifacts/**/*
277+

0 commit comments

Comments
 (0)