Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HDRP][URP] update manifest of SRP templates #5799

Merged
merged 24 commits into from
Oct 6, 2021
Merged

[HDRP][URP] update manifest of SRP templates #5799

merged 24 commits into from
Oct 6, 2021

Conversation

sebastienlagarde
Copy link
Contributor

@sebastienlagarde sebastienlagarde commented Sep 24, 2021 •
edited
Loading

Purpose of this PR

This slack thread: https://unity.slack.com/archives/CV9P2CNP4/p1632419133062300 mention that we need to update manifest of urp and hdrp template as we will not have package by default anymore. so we do it.

Also fix obsolete material on hdrp template

Testing status

Describe what manual/automated tests were performed for this PR

Comments to reviewers

Notes for the reviewers you have assigned.

nicolasvidil
nicolasvidil suggested changes Sep 24, 2021
View reviewed changes
Copy link

@nicolasvidil nicolasvidil left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's still in draft mode, but I figured I would give you some feedback

com.unity.template-universal/Packages/com.unity.template.universal/package.json Show resolved Hide resolved
com.unity.template-universal/Packages/com.unity.template.universal/package.json Outdated Show resolved Hide resolved
com.unity.template-universal/Packages/com.unity.template.universal/package.json Outdated Show resolved Hide resolved
com.unity.template-universal/Packages/com.unity.template.universal/package.json Outdated Show resolved Hide resolved
com.unity.template-universal/Packages/com.unity.template.universal/package.json Outdated Show resolved Hide resolved
com.unity.template-hd/Packages/com.unity.template.hd/package.json Show resolved Hide resolved
com.unity.template-hd/Packages/com.unity.template.hd/package.json Outdated Show resolved Hide resolved
com.unity.template-universal/Packages/com.unity.template.universal/package.json Outdated Show resolved Hide resolved
com.unity.template-hd/Packages/com.unity.template.hd/package.json Outdated Show resolved Hide resolved
com.unity.template-universal/Packages/manifest.json Show resolved Hide resolved
@sebastienlagarde sebastienlagarde marked this pull request as ready for review September 27, 2021 10:38
@sebastienlagarde
Copy link
Contributor Author

Yamato test pass and the PR is no ready for review and Qa valiation (@joeksy ) thanks

@sebastienlagarde
Copy link
Contributor Author

note: we have also bump version to 13.1.0 for master as a 13.0.0 have been publish and so we must not collide with it

This was referenced Sep 29, 2021
Merged
Merged
Verasl
Verasl approved these changes Sep 30, 2021
View reviewed changes
Copy link
Contributor

@Verasl Verasl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thomas-zeng thomas-zeng self-requested a review September 30, 2021 17:05
@sebastienlagarde sebastienlagarde changed the title [HDRP][URP] update manifest of SRP templates for 21.2 [HDRP][URP] update manifest of SRP templates Oct 1, 2021
@sebastienlagarde sebastienlagarde mentioned this pull request Oct 1, 2021
Merged
@sebastienlagarde sebastienlagarde requested review from nicolasvidil and removed request for pierre-unity and nicolasvidil October 4, 2021 15:57
sebastienlagarde and others added 3 commits October 4, 2021 17:58
@sebastienlagarde
Merge branch 'master' into srp/update-templates
df79ae5
- Moved the Scenes folder from /SampleSceneAssets to root (fix warnin…
3be07fd 
…g on first open)

- Changed Tutorials asset to not use Project Layout feature (fix missing unity version text)
@sebastienlagarde
fix valid exception
1393e27
@sebastienlagarde sebastienlagarde merged commit 1ede825 into master Oct 6, 2021
@sebastienlagarde sebastienlagarde deleted the srp/update-templates branch October 6, 2021 13:12
sebastienlagarde added a commit that referenced this pull request Oct 6, 2021
@sebastienlagarde
[HDRP][URP] update manifest of SRP templates (#5799)
a1340b8
@sebastienlagarde sebastienlagarde mentioned this pull request Oct 6, 2021
Merged
sebastienlagarde added a commit that referenced this pull request Oct 8, 2021
@sebastienlagarde
[SRP backport 21.2] [HDRP][URP] update manifest of SRP templates (#5799…
de8e35e 
…) (#5941)

* [HDRP][URP] update manifest of SRP templates (#5799)

* Update manifest.json

* Update manifest.json

* [CI] [2021.2] Updated editor to 26e81c4739c0016cbb9ed5213a9f4b9dc8f36b40

Co-authored-by: noreply@unity3d.com <noreply@unity3d.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanhy-unity ryanhy-unity ryanhy-unity left review comments

@fabien-unity fabien-unity fabien-unity left review comments

@phi-lira phi-lira phi-lira approved these changes

@Verasl Verasl Verasl approved these changes

@thomas-zeng thomas-zeng thomas-zeng approved these changes

@vicky-voin vicky-voin vicky-voin approved these changes

@joeksy joeksy Awaiting requested review from joeksy

@nicolasvidil nicolasvidil Awaiting requested review from nicolasvidil

Assignees
No one assigned
Labels
backported-2021.2 HDRP universal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@sebastienlagarde @phi-lira @Verasl @ryanhy-unity @fabien-unity @thomas-zeng @nicolasvidil @vicky-voin