Merge branch 'master' into vfx/staging

Author: julienf-unity

.github/CODEOWNERS

@@ -10,7 +10,7 @@
 /com.unity.render-pipelines.universal/Editor/ShaderGraph/MasterNodes @Unity-Technologies/2d-graphics
 
 # Shader Graph
-/com.unity.shadergraph/ @Unity-Technologies/shader-graph @Unity-Technologies/gfx-qa-bellevue
+/com.unity.shadergraph/ @Unity-Technologies/shader-graph
 
 # Test systems
 /.yamato/ @Unity-Technologies/gfx-sdets

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,42 @@
-**Guide** : https://github.com/Unity-Technologies/Graphics/blob/master/.github/pr-read.png.md
+### **Please read**
+**PR workflow guidelines**
+* SRP ABV will start automatically on Yamato when you open your PR
+* Changes to docs and md files will **not** trigger ABV jobs 
+* Consider making use of **draft PRs** if you are not 100% sure that your PR is ready for review
+* ABV will restart if you add a new commit to a branch with an open PR (hence why you should consider using draft PRs)
+* Adding [skip ci] (case insensitive) to the title of PRs will stop any jobs being trigger automatically - you will need to open Yamato and find your branch to run ABV
+* You can also add [skip ci] to commit messages to prevent CI from running on that push
+* Add [cancel old ci] to your commit message if you've made changes you want to test and no longer need the previous jobs
 
-**Display Addon** : https://userstyles.org/styles/182991/unity-graphics-pr-readme
+### Checklist for PR maker
+- [ ] Have you added a backport label (if needed)? For example, the `need-backport-*` label. After you backport the PR, the label changes to `backported-*`.
+- [ ] Have you updated the changelog? Each package has a `CHANGELOG.md` file.
+- [ ] Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR.
+- [ ] Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.
 
-# Purpose of this PR
+---
+### Purpose of this PR
+Why is this PR needed, what hard problem is it solving/fixing?
 
-> Why is this PR needed, what hard problem is it solving/fixing?
+---
+### Testing status
 
-# Testing status
-## Manual Tests
-> What have you tested?
+**Manual Tests**: What did you do?
+- [ ] Opened test project + Run graphic tests locally
+- [ ] Built a player
+- [ ] Checked new UI names with UX convention
+- [ ] Tested UI multi-edition + Undo/Redo + Prefab overrides + Alignment in Preset
+- [ ] C# and shader warnings (supress shader cache to see them)
+- [ ] Checked new resources path for the reloader (in developer mode, you have a button at end of resources that check the paths)
+- Other: 
 
-## Automated Tests
-> What did you setup? (Add a screenshot or the reference image of the test please)
+**Automated Tests**: What did you setup? (Add a screenshot or the reference image of the test please)
 
-## Links
-**Yamato**: (Select your branch) https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
-> Any test projects or documents to go with this to help reviewers?
+**Yamato**: (Select your branch):
+https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
 
-# Comments to reviewers
-> Notes for the reviewers you have assigned.
+Any test projects to go with this to help reviewers?
+
+---
+### Comments to reviewers
+Notes for the reviewers you have assigned.

.yamato/_abv.yml

@@ -0,0 +1,275 @@
+editor:priming:trunk:macos:
+    name: '[trunk,macos] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:fast-trunk:macos:
+    name: '[fast-trunk,macos] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk --fast -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:CUSTOM-REVISION:macos:
+    name: '[CUSTOM-REVISION,macos] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:trunk:android:
+    name: '[trunk,android] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:fast-trunk:android:
+    name: '[fast-trunk,android] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk --fast -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:CUSTOM-REVISION:android:
+    name: '[CUSTOM-REVISION,android] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:trunk:windows:
+    name: '[trunk,windows] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:fast-trunk:windows:
+    name: '[fast-trunk,windows] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk --fast -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:CUSTOM-REVISION:windows:
+    name: '[CUSTOM-REVISION,windows] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:trunk:linux:
+    name: '[trunk,linux] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:fast-trunk:linux:
+    name: '[fast-trunk,linux] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk --fast -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:CUSTOM-REVISION:linux:
+    name: '[CUSTOM-REVISION,linux] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:trunk:ios:
+    name: '[trunk,ios] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c iOS  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:fast-trunk:ios:
+    name: '[fast-trunk,ios] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u trunk --fast -o macos --wait --skip-download -c editor -c iOS  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
+editor:priming:CUSTOM-REVISION:ios:
+    name: '[CUSTOM-REVISION,ios] Editor priming'
+    agent:
+        type: Unity::VM
+        image: cds-ops/ubuntu-16.04-base:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    commands:
+      -  pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c iOS  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"