diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml index d974ad64b94..2917a880222 100644 --- a/.github/workflows/draft.yml +++ b/.github/workflows/draft.yml @@ -1,20 +1,20 @@ name: Draft reminder on: - pull_request: - types: [opened] + pull_request: + types: [opened] jobs: - draft_reminder: - 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) - and cancel any jobs that started on Yamato. - See the PR template for more information. - Thank you! + draft_reminder: + 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@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) + and cancel any jobs that started on Yamato. + See the PR template for more information. + Thank you! diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index 71f744e9408..0d288d75839 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -40,6 +40,8 @@ all_project_ci_weekly_2019.4: rerun: on_new_revision - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2019.4 rerun: on_new_revision + - path: .yamato/_templates.yml#all_template_ci_2019.4 + rerun: on_new_revision - path: .yamato/_abv.yml#General_Checks_2019.4 rerun: on_new_revision General_Checks_2019.4: @@ -106,6 +108,8 @@ all_project_ci_weekly_fast-2019.4: rerun: on_new_revision - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_fast-2019.4 rerun: on_new_revision + - path: .yamato/_templates.yml#all_template_ci_fast-2019.4 + rerun: on_new_revision - path: .yamato/_abv.yml#General_Checks_fast-2019.4 rerun: on_new_revision General_Checks_fast-2019.4: @@ -176,6 +180,8 @@ all_project_ci_weekly_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION rerun: on_new_revision + - path: .yamato/_templates.yml#all_template_ci_CUSTOM-REVISION + rerun: on_new_revision - path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION rerun: on_new_revision General_Checks_CUSTOM-REVISION: diff --git a/.yamato/config/abv.metafile b/.yamato/config/abv.metafile index a187be72fae..8f05be21a63 100644 --- a/.yamato/config/abv.metafile +++ b/.yamato/config/abv.metafile @@ -22,6 +22,7 @@ jobs: - .yamato/all-vfx.yml#Nightly_VFX_ - .yamato/all-urp.yml#Nightly_URP_ - .yamato/all-shadergraph.yml#Nightly_ShaderGraph_ + - .yamato/_templates.yml#all_template_ci_ - #General_Checks_ triggers: recurring: diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt index ba34966e111..ac17f286d91 100644 --- a/.yamato/script/gfx_sdet_tools_revision.txt +++ b/.yamato/script/gfx_sdet_tools_revision.txt @@ -1 +1 @@ -7400a05da0e28a1212a70b4e15a6f752f4f7bb09 +83513b1518a8c43db2e2a009ca37e8a7f55c5196 diff --git a/LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json b/LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json index 72f418997c8..428c22c04d1 100644 --- a/LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json +++ b/LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.0.13", + "com.unity.test-framework": "1.1.29", "com.unity.testframework.graphics": "file:../../../com.unity.testframework.graphics", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.textmeshpro": "2.0.1", @@ -58,6 +58,6 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.high-definition", "com.unity.testframework.graphics", - "com.unity.testing.hdrp" + "com.unity.testing.hdrp" ] } diff --git a/README.md b/README.md index 1e6a1877316..9fb563f5707 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The Scriptable Render Pipeline (SRP) is a Unity feature designed to give artists * The Universal Render Pipeline (URP) for use on all platforms. * The High Definition Render Pipeline (HDRP) for use on compute shader compatible platforms. -Unity is committed to an open and transparent development process for SRP and the pre-built Render Pipelines. This means that so you can browse this repository to see what features are currently in development. +Unity is committed to an open and transparent development process for SRP and the pre-built Render Pipelines. This means that you can browse this repository to see what features are currently in development. For more information about the packages in this repository, see the following: @@ -20,50 +20,40 @@ For more information about the packages in this repository, see the following: Package Name | Latest CI Status ------------ | --------- -com.unity.render-pipelines.core | [![](https://badge-proxy.cds.internal.unity3d.com/658ed6e2-cb73-4c17-909e-1c558e402f15)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/d97b521a-469f-4c39-9176-efba794011d2)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/74b65e22-f1c3-4b3a-a6e9-6c1528314bc4)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/dependants-info)[![](https://badge-proxy.cds.internal.unity3d.com/ce5c4776-4467-468a-9251-ce9f232b3fdd)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/90be70c3-cd3c-4275-940c-8ca0262fb711) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/73c999ed-fd64-4df1-a6b8-77df8cbfe50f) -com.unity.render-pipelines.universal | [![](https://badge-proxy.cds.internal.unity3d.com/83da995f-a4e5-46d7-8965-4dd38cc6d0a2)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/4758e59a-2dcb-40ee-8e41-6b779340a25b)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/2eaeea22-a937-4476-ac4b-6071378be1ba)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/b15d41d5-df2b-4411-9413-7f8c8ea369be)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/5a632a87-cc88-4414-be12-394dfeb934df) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/28dfd57b-54d1-45ca-80d3-94d96dbbcfd0) -com.unity.render-pipelines.high-definition | [![](https://badge-proxy.cds.internal.unity3d.com/a8b1403f-68dd-4d9e-8198-39931007b1d2)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/1038f4d6-9ace-4e6e-aa5f-1793f222716d)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/d3ed9e4b-d9c4-4401-b952-ed5808aafe44)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/7e6d655c-ce18-4546-8f2e-6ee85583f244)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/b7d3bcae-9ad8-4375-a683-1b907828137f) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/1ef3d7d0-cea1-4955-9276-e34c0952afbb) -com.unity.render-pipelines.high-definition-config | [![](https://badge-proxy.cds.internal.unity3d.com/25b27fae-b4c9-4ef9-84c2-8ca7f38c2262)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation)[![](https://badge-proxy.cds.internal.unity3d.com/2abd0987-57c9-41a4-bc89-04037fe17057)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/ab12a6a1-17e5-478f-9916-7cfe77f2dbbb)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/b5ba525c-426a-4fa8-a783-e6b0001d430c)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/59fd14b1-3fc2-49e4-bf24-950f1482323f) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/d0fb96fc-6ff8-45a8-a317-ec19f30894cc) -com.unity.shadergraph | [![](https://badge-proxy.cds.internal.unity3d.com/5f2ebc29-a76f-40e3-8f2c-9b3f19e382ce)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/f20fc57c-45d3-4990-8f1f-d311c79c0824)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/7e1ee3c6-0477-4076-a2af-3376ead10421)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/dc92bffa-83bc-49af-b432-eaf1376b8935)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/e2171d56-50c8-4803-964c-a63dcc728355) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/30fe71f1-5838-4bf9-84eb-26a42320e4a2) -com.unity.visualeffectgraph | [![](https://badge-proxy.cds.internal.unity3d.com/bbc6e3c6-5113-451d-bab1-71c2f14ae9ef)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/77e84168-aec9-44d6-94ce-c9404d3aebcc)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/c10f50c2-2a79-4d0a-a763-54dcb40d027f)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/82a3dcaa-f077-43ed-9573-6b19327024ec)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/59b6ec9b-c477-4767-82ba-d2390e70cede) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/ae2fb4f5-43dc-4ad2-8c94-7190dbcdc132) -com.unity.render-pipelines.lightweight | [![](https://badge-proxy.cds.internal.unity3d.com/9e82bdfb-323e-4053-857d-53ae40105738)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.lightweight/build-info?branch=7.x.x%2Frelease&testWorkflow=package-isolation) [![](https://badge-proxy.cds.internal.unity3d.com/c9df9d2b-7132-405a-8437-f89a74192067)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.lightweight/dependencies-info?branch=7.x.x%2Frelease&testWorkflow=updated-dependencies) [![](https://badge-proxy.cds.internal.unity3d.com/7e4aae95-2a9a-471c-a5f8-e8faf3675454)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.lightweight/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/af483d19-8862-4ccf-ae50-48f1605cce3e)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.lightweight/warnings-info?branch=7.x.x%2Frelease) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/679931b4-d19f-4788-90af-be45f40f3a11) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/a11f872a-60e4-4a16-a3f7-4ac888bcd879) +com.unity.render-pipelines.core | [![](https://badge-proxy.cds.internal.unity3d.com/7068273a-d16d-45d9-bb84-7cdc68ba0580)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/de196ba3-6ab9-440b-905e-1dadc025583a)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/74b65e22-f1c3-4b3a-a6e9-6c1528314bc4)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/820e3703-f2a9-42bc-9548-73492135a540)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.core/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/90be70c3-cd3c-4275-940c-8ca0262fb711) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/73c999ed-fd64-4df1-a6b8-77df8cbfe50f) +com.unity.render-pipelines.universal | [![](https://badge-proxy.cds.internal.unity3d.com/76a51820-0a3b-46cc-859a-fe88f7d0ac8b)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/60561f65-d5aa-4b6a-96de-35f4960ac0d5)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/2eaeea22-a937-4476-ac4b-6071378be1ba)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/4efa2cae-2666-4bc3-877b-47c7bd4142d6)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.universal/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/5a632a87-cc88-4414-be12-394dfeb934df) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/28dfd57b-54d1-45ca-80d3-94d96dbbcfd0) +com.unity.render-pipelines.high-definition | [![](https://badge-proxy.cds.internal.unity3d.com/a68dae85-ce0f-46e6-95bf-aa04f2a845d9)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/42c38313-bf0b-42a4-96d7-3dccf39d92b8)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/d3ed9e4b-d9c4-4401-b952-ed5808aafe44)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/31437d42-85cb-428d-b718-921dc971b8a9)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/b7d3bcae-9ad8-4375-a683-1b907828137f) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/1ef3d7d0-cea1-4955-9276-e34c0952afbb) +com.unity.render-pipelines.high-definition-config | [![](https://badge-proxy.cds.internal.unity3d.com/89664583-2f3c-4a61-a1fa-a9daea037b2e)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/3ed117a7-740c-4ef1-a280-c97221742a1e)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/ab12a6a1-17e5-478f-9916-7cfe77f2dbbb)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/2421fdd2-bda0-492f-bcdf-ce764b64d58e)](https://badges.cds.internal.unity3d.com/packages/com.unity.render-pipelines.high-definition-config/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/59fd14b1-3fc2-49e4-bf24-950f1482323f) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/d0fb96fc-6ff8-45a8-a317-ec19f30894cc) +com.unity.shadergraph | [![](https://badge-proxy.cds.internal.unity3d.com/ad6f7b2b-97ec-46c5-8539-9b70e8c30bb5)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/067b8f44-3f3a-4925-8462-996ffbe41662)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/7e1ee3c6-0477-4076-a2af-3376ead10421)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/9ce9cc97-b89d-4a2a-98c2-d1a1d2d0277e)](https://badges.cds.internal.unity3d.com/packages/com.unity.shadergraph/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/e2171d56-50c8-4803-964c-a63dcc728355) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/30fe71f1-5838-4bf9-84eb-26a42320e4a2) +com.unity.visualeffectgraph | [![](https://badge-proxy.cds.internal.unity3d.com/0fbfa6fc-2faf-4689-a3e7-fca736ab23cb)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/build-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/6606630d-31a9-4af5-b63c-25272411c381)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/dependencies-info?branch=master) [![](https://badge-proxy.cds.internal.unity3d.com/c10f50c2-2a79-4d0a-a763-54dcb40d027f)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/dependants-info) [![](https://badge-proxy.cds.internal.unity3d.com/823df233-071e-4ceb-a39f-b810d7fe6fe1)](https://badges.cds.internal.unity3d.com/packages/com.unity.visualeffectgraph/warnings-info?branch=master) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/59b6ec9b-c477-4767-82ba-d2390e70cede) ![ReleaseBadge](https://badge-proxy.cds.internal.unity3d.com/ae2fb4f5-43dc-4ad2-8c94-7190dbcdc132) +## Branches and package releases -## Using the latest version +Release branches are defined as follows: +- **master** branch is used for main developement and it always maps to the latest **Unity Alpha** release. +- **{unity-version}/staging** maps to beta and released Unity versions. f.ex, **2021.1/staging** maps to Unity 2021.1. +- **{package-major-version}.x.x/release** is used for Unity 2020.x and below. f.ex, **10.x.x/release** maps to Unity 2020.3 LTS. -This repository uses the **master** branch for main development. Development on this branch is based on the latest internal version of Unity so it may not work on the latest publicly available version of Unity. The following list contains Unity version/major SRP version pairs which you can use as a guideline as to which major SRP version you can use in your Unity Project: +If you need to find if a specific changeset is included in a specific Unity version, you can search tags for the Unity version. -- **Unity 2019.1 is compatible with SRP version 5.x** -- **Unity 2019.2 is compatible with SRP version 6.x** -- **Unity 2019.3 is compatible with SRP version 7.x** -- **Unity 2020.1 is compatible with SRP version 8.x** +## Modifying package source -The above list is a guideline for major versions of SRP, but there are often multiple minor versions that you can use for a certain version of Unity. To determine which minor versions of SRP you can use: - -1. In your Unity Project, open the Package Manager window (menu: **Window > Package Manager**). -2. In the list of packages, find **Core RP Library**. To find this package in older versions of Unity, you may need to expose preview packages. To do this, click the **Advanced** button at the top of the window then, in the context menu, click **Show preview packages**. -3. Click the drop-down arrow to the left of the package entry then click **See all versions**. This shows a list that contains every package version compatible with your version of Unity. - -After you decide which version of SRP to use: +You can download and install the packages of this repositories on your Unity project and modify the package source code. +You can do that by one of the following methods: -1. Go to the [Scriptable Render Pipeline repository](https://github.com/Unity-Technologies/ScriptableRenderPipeline). -2. Click the **Branch** drop-down then click the **Tags** tab. -3. Find the tag that corresponds to the version of SRP you want to use. When you clone the repository, you use this tag to check out the correct branch. - -To clone the repository, you can use a visual client, like [GitHub Desktop](#GitHubDesktop), or use [console commands](#ConsoleCommands). When you clone the repository, make sure to clone it outside of your Unity Project's Asset folder. - -After you clone the repository, you can install the package into your Unity Project. To do this, see [Installing a local package](https://docs.unity3d.com/Manual/upm-ui-local.html). - - +1. Clone this repository in any folder on your computer. [Install them as local packages](https://docs.unity3d.com/Manual/upm-ui-local.html) into your project. +2. Clone this repository inside a `Packages` folder in your Unity project. ### Cloning the repository using the GitHub Desktop App: 1. Open the GitHub Desktop App and click **File > Clone repository**. -2. Click the **URL** tab and enter the following URL: https://github.com/Unity-Technologies/ScriptableRenderPipeline. +2. Click the **URL** tab and enter the following URL: https://github.com/Unity-Technologies/Graphics. 3. Click the **Choose…** button and navigate to your Unity Project’s base folder. 4. Click the **Clone** button. -After you clone the repository, open your console application of choice in the ScriptableRenderPipeline folder and run the following console command: +Make sure you have Git LFS extension installed as that's required. + +After you clone the repository, open your console application of choice in the Graphics folder and run the following console command: `\> git checkout v7.1.8 (or the latest tag)` @@ -76,13 +66,37 @@ Open your console application of choice and run the following console commands: ``` \> cd -\> git clone https://github.com/Unity-Technologies/ScriptableRenderPipeline +\> git clone https://github.com/Unity-Technologies/Graphics -\> cd ScriptableRenderPipeline +\> cd Graphics \> git checkout v7.1.8 (or the latest tag) ``` -## Sample Scenes in ScriptableRenderPipelineData +## Sample Scenes in Graphics + +Unity provides sample Scenes to use with SRP. You can find these Scenes in the [Graphics GitHub repository](https://github.com/Unity-Technologies/Graphics). To add the Scenes to your Project, clone the repository into your Project's Assets folder. -Unity provides sample Scenes to use with SRP. You can find these Scenes in the [ScriptableRenderPipelineData GitHub repository](https://github.com/Unity-Technologies/ScriptableRenderPipelineData). To add the Scenes to your Project, clone the repository into your Project's Assets folder. \ No newline at end of file +## Package versions on Unity 2020.3 LTS and below + +On Unity 2020.3 LTS and below, the packages in this repository were not Core packages. Instead they were regular packages and different versions could be installed to different versions of Unity. +The compatibility of Unity versions and package versions were as follows: + +- **Unity 2020.3 is compatible with SRP versions 10.x.x** +- **Unity 2020.2 is compatible with SRP versions 10.x.x** +- **Unity 2020.1 is compatible with SRP versions 8.x.x** +- **Unity 2019.3 is compatible with SRP versions 7.x.x** +- **Unity 2019.2 is compatible with SRP versions 6.x.x** +- **Unity 2019.1 is compatible with SRP versions 5.x.x** + +The above list is a guideline for major versions of SRP, but there are often multiple minor versions that you can use for a certain version of Unity. To determine which minor versions of SRP you can use: + +1. In your Unity Project, open the Package Manager window (menu: **Window > Package Manager**). +2. In the list of packages, find **Core RP Library**. To find this package in older versions of Unity, you may need to expose preview packages. To do this, click the **Advanced** button at the top of the window then, in the context menu, click **Show preview packages**. +3. Click the drop-down arrow to the left of the package entry then click **See all versions**. This shows a list that contains every package version compatible with your version of Unity. + +After you decide which version of SRP to use: + +1. Go to the [Unity Graphics repository](https://github.com/Unity-Technologies/Graphics). +2. Click the **Branch** drop-down then click the **Tags** tab. +3. Find the tag that corresponds to the version of SRP you want to use. When you clone the repository, you use this tag to check out the correct branch. diff --git a/TestProjects/HDRP_DXR_Tests/Packages/manifest.json b/TestProjects/HDRP_DXR_Tests/Packages/manifest.json index 1b271ebdc39..913a9591acf 100644 --- a/TestProjects/HDRP_DXR_Tests/Packages/manifest.json +++ b/TestProjects/HDRP_DXR_Tests/Packages/manifest.json @@ -13,7 +13,7 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.13", + "com.unity.test-framework": "1.1.29", "com.unity.testframework.graphics": "7.8.7-preview", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.textmeshpro": "3.0.0-preview.1", diff --git a/TestProjects/HDRP_RuntimeTests/Packages/manifest.json b/TestProjects/HDRP_RuntimeTests/Packages/manifest.json index 673b79ed9e2..af93776aee2 100644 --- a/TestProjects/HDRP_RuntimeTests/Packages/manifest.json +++ b/TestProjects/HDRP_RuntimeTests/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.3", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/HDRP_Tests/Packages/manifest.json b/TestProjects/HDRP_Tests/Packages/manifest.json index f7db67f1b7b..e40f8c4b569 100644 --- a/TestProjects/HDRP_Tests/Packages/manifest.json +++ b/TestProjects/HDRP_Tests/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.testframework.graphics": "7.8.7-preview", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.ugui": "1.0.0", diff --git a/TestProjects/HDRP_Tests/Packages/manifest.json.orig b/TestProjects/HDRP_Tests/Packages/manifest.json.orig deleted file mode 100644 index e6350338eb9..00000000000 --- a/TestProjects/HDRP_Tests/Packages/manifest.json.orig +++ /dev/null @@ -1,53 +0,0 @@ -{ - "dependencies": { - "com.unity.ide.visualstudio": "1.0.11", - "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", - "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", - "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", - "com.unity.shadergraph": "file:../../../com.unity.shadergraph", -<<<<<<< HEAD - "com.unity.test-framework": "1.0.17", -======= - "com.unity.test-framework": "1.1.3", ->>>>>>> 12e4754313... Add several HDRP graphic test (#4763) - "com.unity.testframework.graphics": "file:../../../com.unity.testframework.graphics", - "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", - "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, - "testables": [ - "com.unity.render-pipelines.core", - "com.unity.render-pipelines.high-definition", - "com.unity.testframework.graphics", - "com.unity.testing.hdrp" - ] -} diff --git a/TestProjects/SRP_SmokeTest/Packages/manifest.json b/TestProjects/SRP_SmokeTest/Packages/manifest.json index 6f58e9664a5..89a8ec74731 100644 --- a/TestProjects/SRP_SmokeTest/Packages/manifest.json +++ b/TestProjects/SRP_SmokeTest/Packages/manifest.json @@ -13,9 +13,9 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", - "com.unity.render-pipelines.lightweight": "file:../../../com.unity.render-pipelines.lightweight", + "com.unity.render-pipelines.lightweight": "file:../../../com.unity.render-pipelines.lightweight", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.3", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/ShaderGraph/Packages/manifest.json b/TestProjects/ShaderGraph/Packages/manifest.json index 3c20b9ed462..6eaa6d4e32d 100644 --- a/TestProjects/ShaderGraph/Packages/manifest.json +++ b/TestProjects/ShaderGraph/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.3", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json index 8f3e9be12b9..2549d0b38be 100644 --- a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json +++ b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/UniversalGraphicsTest/Packages/manifest.json b/TestProjects/UniversalGraphicsTest/Packages/manifest.json index 0f52cc71cdd..05367a3f964 100644 --- a/TestProjects/UniversalGraphicsTest/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/UniversalGraphicsTest/Packages/packages-lock.json b/TestProjects/UniversalGraphicsTest/Packages/packages-lock.json index 9e91a156120..981f0caf977 100644 --- a/TestProjects/UniversalGraphicsTest/Packages/packages-lock.json +++ b/TestProjects/UniversalGraphicsTest/Packages/packages-lock.json @@ -45,7 +45,7 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.test-framework": "1.1.29" }, "url": "https://packages.unity.com" }, @@ -126,7 +126,7 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.0.17" + "com.unity.test-framework": "1.1.29" }, "url": "https://packages.unity.com" }, @@ -135,7 +135,7 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1", + "com.unity.test-framework": "1.1.29", "com.unity.external.test-protocol": "1.0.1-preview" }, "url": "https://packages.unity.com" diff --git a/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json b/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json index 25d6f03214a..7291101a014 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.3", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/TestProjects/VisualEffectGraph_URP/Packages/manifest.json b/TestProjects/VisualEffectGraph_URP/Packages/manifest.json index 8a01540877b..42c431b3233 100644 --- a/TestProjects/VisualEffectGraph_URP/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph_URP/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.29", "com.unity.test-framework.build": "0.0.1-preview.3", "com.unity.test-framework.utp-reporter": "1.0.2-preview", "com.unity.testframework.graphics": "7.8.7-preview", diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json index 55b31f81f58..b01d92c0fb5 100644 --- a/com.unity.template-hd/Packages/manifest.json +++ b/com.unity.template-hd/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.multiplayer-hlapi": "1.0.4", "com.unity.purchasing": "2.0.6", "com.unity.render-pipelines.high-definition": "7.8.0", - "com.unity.test-framework": "1.1.13", + "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.6", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 0d45b7333d4..9987b45cb9f 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.ide.vscode": "1.1.4", "com.unity.purchasing": "2.0.6", "com.unity.render-pipelines.universal": "7.8.0", - "com.unity.test-framework": "1.1.11", + "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.10", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/packages-lock.json b/com.unity.template-universal/Packages/packages-lock.json index f5c3ccfd983..2bd74f8b60d 100644 --- a/com.unity.template-universal/Packages/packages-lock.json +++ b/com.unity.template-universal/Packages/packages-lock.json @@ -49,7 +49,7 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.test-framework": "1.1.29" }, "url": "https://packages.unity.com" }, diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 71cc58d7aea..00000000000 --- a/issue_template.md +++ /dev/null @@ -1,9 +0,0 @@ -##### What happened? - -##### Which package (Shader graph, LW, HDRP, Core...)? - -##### Unity template or github source code? - -##### Which package version or branch (1.1.8-preview, 2.0.0-preview, 2018.1, 2018.1-experiment, 2108.2...)? - -##### Unity version, operating system, target platform (standalone windows, mac, iOS, PS4...)? \ No newline at end of file