Merge 9.x.x/release into sg/master-stack + cleanup all the Material previously submitter to be those of 9.x.x/release

.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

.yamato/template-config.metafile

@@ -11,7 +11,7 @@ editors:
   # Add any versions or branches required for testing here
   # This needs to be an exhaustive list of all potential versions used by all template jobs
   # Make sure to include the very minimum explicit version that a package or project requires (eg. 2019.1.0f1)
-  - version: trunk
+  - version: 2020.1
 
 publishing:
   auto_publish: true
@@ -32,7 +32,7 @@ publishing:
 repo:
   branches:
     # What the integration branch for the repo is (the branch where things need to land)
-    integration: master
+    integration: 9.x.x/release
 
 platforms:
   # Exhaustive list of operating systems and editor components used by all jobs so the preparation jobs

.yamato/upm-ci-abv.yml

@@ -1,8 +1,6 @@
 editors:
   - version: 2020.1
   - version: fast-2020.1
-  - version: trunk
-  - version: fast-trunk
   - version: CUSTOM-REVISION
 projects:
   - name: Universal
@@ -56,14 +54,14 @@ all_project_ci_{{ editor.version }}:
   {% if editor.version == "fast-2020.1" %}
   # run abv for non-draft PRs that are not docs
   triggers:
-    expression: pull_request.target eq "master" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*"]
+    expression: pull_request.target eq "9.x.x/release" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*"]
   {% endif %}
 {% endfor %}
 
 
-# a separate job so that only trunk is run nightly, not fast-trunk
+# a separate job so that only 2020.1 is run nightly, not fast-2020.1
 {% for editor in editors %}
- {% if editor.version == '2020.1' or editor.version == 'trunk'%}
+ {% if editor.version == '2020.1' %}
 all_project_ci_nightly_{{ editor.version }}:
   name: _Nightly ABV against {{ editor.version }}
   dependencies:
@@ -87,7 +85,7 @@ all_project_ci_nightly_{{ editor.version }}:
       rerun: always
   triggers:
     recurring:
-      - branch: master
+      - branch: 9.x.x/release
         frequency: 0 * * ?     
   {% endif %}
 {% endfor %}
@@ -149,7 +147,8 @@ all_smoke_tests_{{ editor.version }}:
     rerun: on-new-revision
   {% endfor %}
   {% endfor %}
-
+
+# "trunk" here just refers to unity source        
 {% for editor in editors %}
 trunk_verification_{{ editor.version }}:
   name: Trunk verification - {{ editor.version }}

.yamato/upm-ci-hdrp.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-hdrp_dxr.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-hdrp_hybrid.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-hdrp_standalone.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-packages.yml

@@ -1,7 +1,5 @@
 editors:
-  - version: trunk
   - version: 2020.1
-  - version: fast-trunk
   - version: fast-2020.1
   - version: CUSTOM-REVISION
 packages:
@@ -78,7 +76,7 @@ platforms:
       - il2cpp
       agent:
         type: Unity::VM::osx
-        image: buildfarm/mac:stable
+        image: package-ci/mac:stable
         flavor: m1.mac
       copycmd: cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
       editorpath: "$(pwd)/.Editor/Unity.app/Contents/MacOS/Unity"
@@ -198,8 +196,8 @@ publish_{{ package.id }}:
   dependencies:
     - .yamato/upm-ci-packages.yml#pack_{{ package.id }}
 {% for platform in platforms %}
-# just using trunk for if a publish is happening
-    - .yamato/upm-ci-packages.yml#test_{{ package.id}}_{{ platform.name }}_trunk
+# just using non-fast for if a publish is happening
+    - .yamato/upm-ci-packages.yml#test_{{ package.id}}_{{ platform.name }}_2020.1
 {% endfor %}
 {% endfor %}
 

.yamato/upm-ci-shadergraph.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-shadergraph_stereo.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-templates.yml

@@ -1,7 +1,5 @@
 editors:
-  - version: trunk
   - version: 2020.1
-  - version: fast-trunk
   - version: fast-2020.1
 templates:
   - name: HDRP Template
@@ -41,7 +39,7 @@ platforms:
       - il2cpp
       agent:
         type: Unity::VM::osx
-        image: buildfarm/mac:stable
+        image: package-ci/mac:stable
         flavor: m1.mac
       copycmd: cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
       editorpath: "$(pwd)/.Editor/Unity.app/Contents/MacOS/Unity"

.yamato/upm-ci-universal.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:
@@ -428,7 +424,7 @@ Build_{{ project.name }}_Android_{{ android_api.name }}_{{ editor.version }}:
     - NetSh Advfirewall set allprofiles state off
     - |
       set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
-      .\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP%
+      .\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200
     - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server
   dependencies:
     - path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}

.yamato/upm-ci-universal_hybrid.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-universal_stereo.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-vfx_lwrp.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/upm-ci-vfxmain.yml

@@ -3,10 +3,6 @@ editors:
     rerun_strategy: on-new-revision
   - version: fast-2020.1
     rerun_strategy: on-new-revision
-  - version: trunk
-    rerun_strategy: on-new-revision
-  - version: fast-trunk
-    rerun_strategy: on-new-revision
   - version: CUSTOM-REVISION
     rerun_strategy: always
 platforms:

.yamato/z_editor.yml

@@ -1,8 +1,4 @@
 editors:
-  - version: trunk
-    cmd: -u trunk
-  - version: fast-trunk
-    cmd: -u trunk --fast
   - version: 2020.1
     cmd: -u 2020.1/staging
   - version: fast-2020.1

.yamato/z_preview-publish.yml

@@ -28,31 +28,31 @@ auto-version:
   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"
-{% for v in template_environment_variables -%}
+{% for v in template_environment_variables %}
     {{ v[0] }}: {{ v[1]}}
-{% endfor -%}
+{% endfor %}
   commands:
   - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
   - >
     upm-ci utils auto-version bump
-{% for test in testables -%}
+{% for test in testables %}
     --{{ test.type }}-path {{ test.path }}
-{% endfor -%}
+{% endfor %}
   - upm-ci utils auto-version commit --push
   artifacts:
     packages:
       paths:
         - "upm-ci~/**/*"
-{% if publishing.auto_version == "true" -%}
+{% if publishing.auto_version == "true" %}
   triggers:
     branches:
       only:
         - "{{ repo.branches.integration }}"
-{% endif -%}
+{% endif %}
 
 
-{% for test in testables -%}
-{% if test.publish_source == "true" -%}
+{% for test in testables %}
+{% if test.publish_source == "true" %}
 publish_{{ test.name }}:
   name: "[{{ test.name }}] Candidates Publish"
   agent:
@@ -74,17 +74,17 @@ publish_{{ test.name }}:
             - "upm-ci~/packages/*.tgz"
   dependencies:
     - .yamato/z_preview-publish.yml#wait_for_nightly
-{% for testing in extra_jobs.testing -%}
+{% for testing in extra_jobs.testing %}
     - {{ testing }}
-{% endfor -%}
+{% endfor %}
     - .yamato/upm-ci-packages.yml#pack_{{ test.name }}
-{% for editor in editors -%}
-{% for platform in platforms -%}
+{% for editor in editors %}
+{% for platform in platforms %}
     - .yamato/upm-ci-packages.yml#test_{{ test.name }}_{{ platform.os }}_{{ editor.version }}
-{% endfor -%}
-{% endfor -%}
-{% endif -%} # publish_source
-{% endfor -%}
+{% endfor %}
+{% endfor %}
+{% endif %} # publish_source
+{% endfor %}
 
 publish_all_preview:
   name: "Publish all preview packages - nightly"
@@ -102,7 +102,7 @@ publish_all_preview:
 wait_for_nightly:
   name: "z_Wait for nightly"
   dependencies:
-    - .yamato/upm-ci-abv.yml#all_project_ci_nightly_trunk
+    - .yamato/upm-ci-abv.yml#all_project_ci_nightly_2020.1
   {% for test in testables %}
     - .yamato/upm-ci-packages.yml#pack_{{ test.name }}
   {% for editor in editors %}
@@ -113,8 +113,8 @@ wait_for_nightly:
   {% endfor %}
 
 
-{% for test in testables -%}
-{% if test.publish_source == "true" -%}
+{% for test in testables %}
+{% if test.publish_source == "true" %}
 promote_{{ test.name }}:
   name: "[{{ test.name }}] Production Promote"
   agent:
@@ -134,9 +134,11 @@ promote_{{ test.name }}:
             - "upm-ci~/packages/*.tgz"
   dependencies:
     - .yamato/upm-ci-packages.yml#pack_{{ test.name }}
-    # TODO: Add back in when fixed on upm side.
-    # Removed because promotion tests are checking if the packages exist in production
-    # -- which they dont because we are trying to promote them.
-    # - .yamato/package-test.yml#promotion:test:trigger:{{ test.name }}
-{% endif -%} # publish_source
+    - .yamato/z_preview-publish.yml#publish_{{ test.name }}
+  {% for editor in editors %}
+  {% for platform in platforms %}
+    - .yamato/upm-ci-packages.yml#test_{{ test.name }}_{{ platform.os }}_{{ editor.version }}
+  {% endfor %}
+  {% endfor %}
+{% endif %} # publish_source
 {% endfor %}

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 3
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -135,7 +135,6 @@ Material:
     - _AlphaCutoffShadow: 0.5
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
-    - _AlphaToMask: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0