Merge branch 'develop' into isxb-1306-findaction-bug

Author: ekcoh

.github/pull_request_template.md

@@ -1,18 +1,22 @@
 ### Description
 
-_Please fill this section with a description what the pull request is trying to address._
+_Please fill this section with a description what the pull request is trying to address and what changes were made._
 
-### Changes made
 
-_Please write down a short description of what changes were made._
-
-### Testing
+### Testing status & QA
 
 _Please describe the testing already done by you and what testing you request/recommend QA to execute. If you used or created any testing project please link them here too for QA._
 
-### Risk
+### Overall Product Risks
+
+_Please rate the potential complexity and halo effect from low to high for the reviewers. Note down potential risks to specific Editor branches if any._
+
+- Complexity: 
+- Halo Effect: 
+
+### Comments to reviewers
 
-_Please describe the potential risks of your changes for the reviewers._
+_Please describe any additional information such as what to focus on, or historical info for the reviewers._
 
 ### Checklist
 
@@ -21,7 +25,7 @@ Before review:
 - [ ] Changelog entry added.
     - Explains the change in `Changed`, `Fixed`, `Added` sections.
     - For API change contains an example snippet and/or migration example.
-    - JIRA ticket linked, example ([case %<ID>%](https://issuetracker.unity3d.com/product/unity/issues/guid/<ID>)). If it is a private issue, just add the case ID without a link.	
+    - JIRA ticket linked, example ([case %<ID>%](https://issuetracker.unity3d.com/product/unity/issues/guid/<ID>)). If it is a private issue, just add the case ID without a link.
     - Jira port for the next release set as "Resolved".
 - [ ] Tests added/changed, if applicable.
     - Functional tests `Area_CanDoX`, `Area_CanDoX_EvenIfYIsTheCase`, `Area_WhenIDoX_AndYHappens_ThisIsTheResult`.
@@ -44,4 +48,4 @@ During merge:
 
 After merge:
 
-- [ ] Create forward/backward port if needed. If you are blocked from creating a forward port now please add a task to ISX-1444. 
+- [ ] Create forward/backward port if needed. If you are blocked from creating a forward port now please add a task to ISX-1444.

.gitignore

@@ -43,6 +43,12 @@ Packages/com.unity.inputsystem/**/*.api.meta
 Packages/com.unity.package-manager-ui/
 Packages/com.unity.package-manager-doctools/
 
+Tools/CI/[Bb]in
+Tools/CI/[Oo]bj
+
 .Editor
 .bin
 .download
+
+!Tools/CI/InputSystem.Cookbook.csproj
+!Tools/CI/InputSystem-recipes.sln

.yamato/PVPexemptions.json

@@ -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/analyze.yml

@@ -1,9 +1,13 @@
 editors:
   - version: 2021.3
   - version: 2022.3
+    run_tvos: false
   - version: 6000.0
+    run_tvos: false
+  - version: 6000.1
+    run_tvos: false
   - version: trunk
-    disable_tvos_run: true
+    run_tvos: false    
 
 utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
@@ -15,55 +19,74 @@ upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactor
 platforms_win:
   - name: win
     type: Unity::VM
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     flavor: b1.large
   - name: win_standalone
     type: Unity::VM
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     flavor: b1.large
     runtime: StandaloneWindows64
   - name: win_standalone_il2cpp
     type: Unity::VM
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     flavor: b1.large
     runtime: StandaloneWindows64
     scripting-backend: Il2Cpp
     installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u 
 platforms_nix:
   - name: mac
     type: Unity::VM::osx
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
   - name: mac_standalone
     type: Unity::VM::osx
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
     runtime: StandaloneOSX
   - name: mac_standalone_il2cpp
     type: Unity::VM::osx
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
     runtime: StandaloneOSX
     scripting-backend: Il2Cpp
     installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
   - name: linux
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
   - name: linux_standalone
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
     runtime: StandaloneLinux64
   - name: linux_standalone_il2cpp
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
     runtime: StandaloneLinux64
     scripting-backend: Il2Cpp
     installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
 scripting_backends:
   - name: mono
   - name: il2cpp
 
-ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 
+ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
+
+test_category: 
+  - name: performance
+  - name: functional
+  
+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
+instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
+
+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
+instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
+
+yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
+yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

.yamato/config.metadata

@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting [email protected]"
+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
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true

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

@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting [email protected]"
+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
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true

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

@@ -0,0 +1,11 @@
+@echo on
+rem This is an auto-generated script. Do not edit manually!
+
+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
+IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
+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"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5
+IF EXIST "patterns" rmdir /s /q patterns
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('patterns.zip', '.'); }" && DEL "patterns.zip"
+infrastructure_instability_detection
+exit /b 0

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

@@ -8,7 +8,7 @@ promote:
     image: package-ci/win10:default
     flavor: b1.large
   dependencies:
-    - .yamato/publish-samples.yml 
+    - .yamato/publish-samples.yml#test_sample_projects
   variables:
     UPMCI_PROMOTION: 1
   commands:

.yamato/promotion.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: