Merge branch 'master' into vfx/staging

# Conflicts:
#	TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset
#	com.unity.visualeffectgraph/CHANGELOG.md
#	com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs

Author: julienamsellem

.github/pr-commenter.yml

@@ -17,6 +17,8 @@ comment:
       body: |
         **HDRP**
         `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_trunk`
+        With changes to HDRP packages, you should also run 
+        `/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
     - id: URP
       files:
         - com.unity.render-pipelines.universal/**/*
@@ -25,6 +27,8 @@ comment:
       body: |
         **URP**
         `/.yamato%252Fall-urp.yml%2523PR_URP_trunk`
+        With changes to URP packages, you should also run 
+        `/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
     - id: ShaderGraph
       files:
         - com.unity.shadergraph/**/*

.github/workflows/draft.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false && github.event.pull_request.ready_for_review == false
     steps:
-    - uses: thollander/actions-comment-pull-request@master
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        message: |
-              It appears that you made a non-draft PR!
-              Please convert your PR to draft (button on the right side of the page).
-              See the PR template for more information.
-              Thank you!
+      - uses: thollander/actions-comment-pull-request@v1.0.4
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          message: |
+            It appears that you made a non-draft PR!
+            Please convert your PR to draft (button on the right side of the page).
+            See the PR template for more information.
+            Thank you!

.gitignore

@@ -47,3 +47,4 @@ node_modules
 manifest-updater.py
 TestProjects/UniversalGraphicsTest_Lighting/UserSettings/EditorUserSettings.asset
 TestProjects/UniversalGraphicsTest_Lighting/Packages/packages-lock.json
+com.unity.template-hd/InitCodeMarker

.yamato/_abv.yml

@@ -46,6 +46,8 @@ all_project_ci_nightly_trunk:
          rerun: on_new_revision
       -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk
          rerun: on_new_revision
+      -  path: .yamato/all-lightmapper.yml#LightMapper_trunk
+         rerun: on_new_revision
       -  path: .yamato/_abv.yml#General_Checks_trunk
          rerun: on_new_revision
 General_Checks_trunk:
@@ -138,6 +140,8 @@ all_project_ci_nightly_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
          rerun: on_new_revision
+      -  path: .yamato/all-lightmapper.yml#LightMapper_CUSTOM-REVISION
+         rerun: on_new_revision
       -  path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
          rerun: on_new_revision
 General_Checks_CUSTOM-REVISION:

.yamato/_latest_editor_versions_trunk.metafile

@@ -1,5 +1,5 @@
 trunk:
-  updated_at_UTC: '2021-09-04 23:31:29.876736'
+  updated_at_UTC: '2021-09-21 23:26:50.889283'
   changeset:
-    id: a6d7f27874c08c403d43e993bde1b93ce0ea2161
-    date: '2021-09-04T21:12:24'
+    id: a5998c7a3f29a89bba88ddb2d547e5c65db9eb07
+    date: '2021-09-21T11:11:20'

.yamato/_templates.yml

@@ -38,8 +38,6 @@ pack_hdrp_template_Win_trunk:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-hd
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_hdrp_template_Win_trunk
     artifacts:
         packages:
             paths:
@@ -92,8 +90,6 @@ pack_hdrp_template_OSX_trunk:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-hd
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_hdrp_template_OSX_trunk
     artifacts:
         packages:
             paths:
@@ -184,8 +180,6 @@ pack_hdrp_template_Win_CUSTOM-REVISION:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-hd
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_hdrp_template_Win_CUSTOM-REVISION
     artifacts:
         packages:
             paths:
@@ -238,8 +232,6 @@ pack_hdrp_template_OSX_CUSTOM-REVISION:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-hd
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_hdrp_template_OSX_CUSTOM-REVISION
     artifacts:
         packages:
             paths:
@@ -330,8 +322,6 @@ pack_universal_template_Win_trunk:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-universal
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_universal_template_Win_trunk
     artifacts:
         packages:
             paths:
@@ -384,8 +374,6 @@ pack_universal_template_OSX_trunk:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-universal
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_universal_template_OSX_trunk
     artifacts:
         packages:
             paths:
@@ -476,8 +464,6 @@ pack_universal_template_Win_CUSTOM-REVISION:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-universal
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_universal_template_Win_CUSTOM-REVISION
     artifacts:
         packages:
             paths:
@@ -530,8 +516,6 @@ pack_universal_template_OSX_CUSTOM-REVISION:
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template pack --project-path com.unity.template-universal
-    dependencies:
-      -  .yamato/_templates.yml#pre_pack_universal_template_OSX_CUSTOM-REVISION
     artifacts:
         packages:
             paths:

.yamato/all-lightmapper.yml

@@ -0,0 +1,86 @@
+
+# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually.
+# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
+# Read more under .yamato/docs/readme.md
+
+{% metadata_file .yamato/_cache_config.metafile -%}
+{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}
+
+---
+
+PR_LightMapper_trunk:
+    name: PR LightMapper on trunk
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies:
+      -  path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_editmode_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_Standalone_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_editmode_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-openglcore.yml#LightMapper_Linux_OpenGlCore_editmode_mono_Linear_trunk
+         rerun: on_new_revision
+Extra_LightMapper_trunk:
+    name: Extra LightMapper on trunk
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies: []
+LightMapper_trunk:
+    name: LightMapper on trunk
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies:
+      -  path: .yamato/all-lightmapper.yml#PR_LightMapper_trunk
+         rerun: on_new_revision
+      -  path: .yamato/all-lightmapper.yml#Extra_LightMapper_trunk
+         rerun: on_new_revision
+PR_LightMapper_CUSTOM-REVISION:
+    name: PR LightMapper on CUSTOM-REVISION
+    variables:
+        CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies:
+      -  path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/lightmapper-linux-openglcore.yml#LightMapper_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+Extra_LightMapper_CUSTOM-REVISION:
+    name: Extra LightMapper on CUSTOM-REVISION
+    variables:
+        CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies: []
+LightMapper_CUSTOM-REVISION:
+    name: LightMapper on CUSTOM-REVISION
+    variables:
+        CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies:
+      -  path: .yamato/all-lightmapper.yml#PR_LightMapper_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/all-lightmapper.yml#Extra_LightMapper_CUSTOM-REVISION
+         rerun: on_new_revision

.yamato/all-urp_2d.yml

@@ -38,12 +38,6 @@ PR_URP_2D_trunk:
          rerun: on_new_revision
       -  path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_trunk
          rerun: on_new_revision
-      -  path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
 Extra_URP_2D_trunk:
     name: Extra URP_2D on trunk
     variables:
@@ -102,12 +96,6 @@ PR_URP_2D_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
 Extra_URP_2D_CUSTOM-REVISION:
     name: Extra URP_2D on CUSTOM-REVISION
     variables:

.yamato/all-urp_foundation.yml

@@ -42,12 +42,6 @@ PR_URP_Foundation_trunk:
          rerun: on_new_revision
       -  path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_trunk
          rerun: on_new_revision
-      -  path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
 Extra_URP_Foundation_trunk:
     name: Extra URP_Foundation on trunk
     variables:
@@ -110,12 +104,6 @@ PR_URP_Foundation_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
 Extra_URP_Foundation_CUSTOM-REVISION:
     name: Extra URP_Foundation on CUSTOM-REVISION
     variables:

.yamato/all-urp_lighting.yml

@@ -36,18 +36,10 @@ PR_URP_Lighting_trunk:
          rerun: on_new_revision
       -  path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_trunk
          rerun: on_new_revision
-      -  path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
       -  path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_trunk
          rerun: on_new_revision
       -  path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_trunk
          rerun: on_new_revision
-      -  path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_trunk
-         rerun: on_new_revision
 Extra_URP_Lighting_trunk:
     name: Extra URP_Lighting on trunk
     variables:
@@ -104,18 +96,10 @@ PR_URP_Lighting_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
       -  path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
       -  path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
-      -  path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION
-         rerun: on_new_revision
 Extra_URP_Lighting_CUSTOM-REVISION:
     name: Extra URP_Lighting on CUSTOM-REVISION
     variables: