Skip to content

Conversation

@NoelStephensUnity
Copy link
Collaborator

Merging v2.4.2 branch back into the develop-2.0.0 branch.

Changelog

NA

Testing and Documentation

  • No tests have been added.
  • No documentation changes or additions were necessary.

Backport

No backport is required as this is specific to v2.x.

NoelStephensUnity and others added 5 commits June 13, 2025 07:35
updating change log and package version
…kManager [Up-port] (#3504)

<!-- Replace this block with what this PR does and why. Describe what
you'd like reviewers to know, how you applied the engineering
principles, and any interesting tradeoffs made. Delete bullet points
below that don't apply, and update the changelog section as appropriate.
-->

<!-- Add short version of the JIRA ticket to the PR title (e.g. "feat:
new shiny feature [MTT-123]") -->
Up-port of #3502  
Fixes #2539 


## Changelog

- Added: `LocalClientCannotWrite` function to co-locate the shared
functionality
- Fixed: Ensure that the `NetworkManager` exists before attempting to
access the `LocalClientId`

## Testing and Documentation

- No tests have been added.

<!-- Uncomment and mark items off with a * if this PR deprecates any
API:
### Deprecated API
- [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter
yyyy-mm-dd)` entry.
- [ ] An [api updater] was added.
- [ ] Deprecation of the API is explained in the CHANGELOG.
- [ ] The users can understand why this API was removed and what they
should use instead.
-->

## Backport

<!-- If this is a backport:
 - Add the following to the PR title: "\[Backport\] ..." .
 - Link to the original PR.
If this needs a backport - state this here
If a backport is not needed please provide the reason why.
If the "Backports" section is not present it will lead to a CI test
failure.
-->

Backported in #3502

---------

Co-authored-by: unity-renovate[bot] <120015202+unity-renovate[bot]@users.noreply.github.com>
Co-authored-by: Emma <[email protected]>
Adding unreleased changelog set.
Fixing merge issue with change log.
@NoelStephensUnity NoelStephensUnity marked this pull request as ready for review June 16, 2025 18:59
@NoelStephensUnity NoelStephensUnity requested review from a team and EmandM as code owners June 16, 2025 18:59
@NoelStephensUnity NoelStephensUnity enabled auto-merge (squash) June 17, 2025 00:29
@NoelStephensUnity NoelStephensUnity merged commit 22f9d6f into develop-2.0.0 Jun 17, 2025
35 checks passed
@NoelStephensUnity NoelStephensUnity deleted the chore/2.x/migrate-2-4-2-back-to-develop-2-0-0 branch June 17, 2025 08:02
@sentinel-u3d sentinel-u3d bot requested a review from michalChrobot June 17, 2025 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants