Merge branch 'develop' into stable

Author: jamesmcgill

.buginfo

@@ -0,0 +1,5 @@
+system: jira
+server: jira.unity3d.com
+project: ISXB
+issuetype: Bug
+

.yamato/config.metadata

@@ -2,7 +2,7 @@ editors:
   - version: 2019.4
   - version: 2020.3
   - version: 2021.2
-  - version: 2022.2.0a10
+  - version: trunk
 platforms:
   - name: win
     type: Unity::VM
@@ -25,16 +25,16 @@ platforms:
     netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
   - name: mac
     type: Unity::VM::osx
-    image: package-ci/mac:stable
+    image: package-ci/macos-12:latest
     flavor: m1.mac
   - name: mac_standalone
     type: Unity::VM::osx
-    image: package-ci/mac:stable
+    image: package-ci/macos-12:latest
     flavor: m1.mac
     runtime: StandaloneOSX
   - name: mac_standalone_il2cpp
     type: Unity::VM::osx
-    image: package-ci/mac:stable
+    image: package-ci/macos-12:latest
     flavor: m1.mac
     runtime: StandaloneOSX
     scripting-backend: Il2Cpp

.yamato/upm-ci.yml

@@ -46,7 +46,7 @@ build_ios_{{ editor.version }}:
   name: Build Tests on {{ editor.version }} on ios
   agent:
     type: Unity::VM::osx
-    image: mobile/macos-10.15-testing:stable
+    image: package-ci/macos-12-mobile:stable
     flavor: b1.large
   commands:
     - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
@@ -66,7 +66,8 @@ run_ios_{{ editor.version }}:
   name: Run Tests on {{ editor.version }} on ios
   agent:
       type: Unity::mobile::iPhone
-      image: mobile/macos-10.15-testing:stable
+      image: package-ci/macos-12-mobile:stable
+      model: SE
       flavor: b1.medium
   skip_checkout: true
   dependencies:
@@ -87,7 +88,7 @@ build_tvos_{{ editor.version }}:
   name: Build Tests on {{ editor.version }} on tvos
   agent:
     type: Unity::VM::osx
-    image: mobile/macos-10.15-testing:stable
+    image: package-ci/macos-12-mobile:stable
     flavor: b1.large
   commands:
     - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.1
+//     version 1.4.2
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.1
+//     version 1.4.2
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if