Merge branch 'develop' into release/1.X

Author: stefanunity

.yamato/analyze.yml

@@ -14,7 +14,7 @@ code_analyser:
     - unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
     - {{ upm_ci_install }}
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
-    - upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
+    - upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
   triggers:
     cancel_old_ci: true
     pull_requests:

.yamato/config.metadata

@@ -1,9 +1,11 @@
 editors:
-  - version: 2021.3.45f
+  - version: 2021.3
   - version: 2022.3
     disable_tvos_run: true
   - version: 6000.0
     disable_tvos_run: true
+  - version: 6000.1
+    disable_tvos_run: true
   - version: trunk
     disable_tvos_run: true
 

.yamato/publish-samples.yml

@@ -10,7 +10,7 @@ test_sample_projects:
   commands:
     - {{ upm_ci_install }}
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
-    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
+    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2021.3
     - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh 
   artifacts:
     UTR_Output.zip:

.yamato/upm-ci.yml

@@ -335,7 +335,7 @@ publish{% cycle "", "_dryrun" %}:
     - move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
     - move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
-    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
+    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2021.3
     - upm-ci package publish --package-path ./Packages/com.unity.inputsystem/ {% cycle "", "--dry-run" %}
     - upm-pvp xray --packages "upm-ci~/packages/*.tgz" --results upm-ci~/xray
     - upm-pvp require "supported rme" --no-report --allow-missing --results upm-ci~/xray --exemptions upm-ci~/xray/new-exemptions.json

.yamato/wrench/api-validation-jobs.yml

@@ -1,22 +1,22 @@
 # Auto-generated by Recipe Engine, do not modify manually.
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
-# upm-ci validation tests for API Validation - inputsystem - 2019.4 - windows (2019.4 - Windows).
-api_validation_-_inputsystem_-_2019_4_-_windows:
-  name: API Validation - inputsystem - 2019.4 - windows
+# upm-ci validation tests for API Validation - inputsystem - 2021.3 - windows (2021.3 - Windows).
+api_validation_-_inputsystem_-_2021_3_-_windows:
+  name: API Validation - inputsystem - 2021.3 - windows
   agent:
     image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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 2019.4 -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3 -c Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/PackageJsonCondersor.py
@@ -30,7 +30,7 @@ api_validation_-_inputsystem_-_2019_4_-_windows:
     retries: 0
   after:
   - command: cmd.exe /c "curl -s https://artifactory-slo.bf.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"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.0 || exit 0"
+  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
     timeout: 10
     retries: 1
   artifacts:
@@ -50,11 +50,11 @@ api_validation_-_inputsystem_-_2019_4_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.33.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
   triggers:
     expression: push.branch match "^release/.*"
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.33.0
+    Wrench: 0.10.36.0
 

.yamato/wrench/package-pack-jobs.yml

@@ -1,7 +1,7 @@
 # Auto-generated by Recipe Engine, do not modify manually.
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
-# Pack and Sign Input System
+# Pack Input System
 package_pack_-_inputsystem:
   name: Package Pack - inputsystem
   agent:
@@ -12,7 +12,7 @@ package_pack_-_inputsystem:
   - 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: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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
@@ -22,7 +22,7 @@ package_pack_-_inputsystem:
   - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.inputsystem_packages.json
   after:
   - command: curl -s https://artifactory-slo.bf.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
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.0 || exit 0
+  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
     timeout: 10
     retries: 1
   artifacts:
@@ -31,8 +31,8 @@ package_pack_-_inputsystem:
       - upm-ci~/packages/**/*
   variables:
     UPMCI_ACK_LARGE_PACKAGE: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.33.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.33.0
+    Wrench: 0.10.36.0