Skip to content

Conversation

@unity-renovate
Copy link
Contributor

This PR contains the following updates:

Package Type Update Editor Change
com.unity.collab-proxy dependencies minor ✅ Compatible 2.6.0 -> 2.7.1

✅ Editor bump: Not required for testproject/Packages/manifest.json

This is probably safe to merge for this project


Release Notes

com.unity.collab-proxy (com.unity.collab-proxy)

v2.7.1

Compare Source

Added

  • You can now Shelve your selected Pending Changes, inspect the shelves content, and apply them to your workspace.
  • You can now Shelve your Pending Changes when switching to another branch (or changeset) and decide if you want to apply them automatically after the switch.
  • You can now create a code review from the list of branches (or changesets) opening either the Desktop App or the Unity Cloud website.

Changed

  • Serialize the Checkin comment and tick selection so they are kept on any domain reload and play mode.
  • Optimized incoming changes & merge to only reload the Package Manager when needed.
  • Added dedicated toolbar buttons to open the list of branches and the Branch Explorer of the Desktop App.
  • Reworded the changeset context menu "Undo this change" to "Revert this file to the previous revision" so it’s more explicit.
  • Moved the 'Unity Version Control' menu item under 'Window'/'Version Control' submenu starting from Unity 6.1.
  • Improve the Create workspace window to suggest the matching Unity Cloud project if it exists.

Fixed

  • Ensured ignore.conf is not being reformatted when adding or removing an ignore rule, so it keeps empty lines and comments.
  • Fixed missing checked-out for renamed assets.
  • Fixed rename asset leaves 'Added' + 'Remove locally' status instead of 'Moved'.
  • Fixed console error GUI Error: Invalid GUILayout state in PlasticWindow view which is caused under some circumstances.
  • Fixed null exception on entering in Play Mode before creating the workspace.
  • Fixed lock statuses to correctly refresh in Project View and Inspector after merging.
  • Fixed a performance issue by preventing the ConfigureLogging call on every domain reload when Unity Version Control is not used, reducing the load time by ~200ms. .
  • Fixed the create branch operation to work in Gluon mode which uses partial workspaces.

v2.6.0

Compare Source

Added

  • Added the ability to merge a branch or a changeset, using a new context menu actions
  • Added file conflict & dir conflict context menu actions to the merge view
  • Added diff and merge settings in Project Settings -> Version Control -> Unity Version Control Settings
  • Added merge options dialog to the merge view
  • Added copy path & history context menu actions in all menus where they apply
  • Added an menu entry to 'Open in Unity Cloud' showing the repository in the Unity Dashboard

Changed

  • Updated the minimum supported version to Unity 2021.3.0f1
  • Removed support for migrating old Collaborate workspaces to Unity Version Control
  • Hide from the public documentation all internal APIs that were previously visible by mistake
  • Optimized switching operations to only triggers the Package Manager to reinstall packages when needed
  • Optimized incoming changes to only reload the Package Manager when needed (Gluon/partial workspace only for now)
  • Automatically add UnityDirMonSyncFile rule for existing ignore.conf to avoid triggering unnecessary finding changes operation
  • Improved the “search” edit box so it can resize when there is not enough space in the toolbar
  • Replaced the "D" DevOps icon by the branching icon used in the Hub
  • Replaced the logo of Unity in the Sign in to Unity VCS window

Fixed

  • Fixed files getting checked out even though they are in hidden_changes.conf
  • Fixed manual login to Cloud that didn't work with an Enterprise installation
  • Fixed resolve conflicts not informing about lack of UVCS installation
  • Fixed the Invite users to cloud organization when using an Enterprise installation
  • Fixed new child branch not created from HEAD after update
  • Fixed the learn more (here) link that showed the hex color value in Unity 6
  • Fixed link to invite members in Unity Cloud.
  • Fixed a crash in the create workspace window when unable to resolve a @​unity organization
  • Fixed incoming changes view that was not kept as selected after resolving some conflicts
  • Fixed workspace name that was not refreshed after repository manual creation or selection
  • Added a warning message to inform users about mismatching cloud project.
  • Removed from the Create Workspace window the Local server that was present with no installation of UVCS
  • Replaced hardcoded urls pointing to plasticscm.com

Configuration

📅 Schedule: Branch creation - "every weekend" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Unity Renovate Bot.

@unity-renovate
Copy link
Contributor Author

⚠️ Artifact update problem

Renovate failed to update an artifact related to this branch. You probably do not want to merge this PR as-is.

♻ Renovate will retry this branch, including artifacts, only when one of the following happens:

  • any of the package files in this branch needs updating, or
  • the branch becomes conflicted, or
  • you click the rebase/retry checkbox if found above, or
  • you rename this PR's title to start with "rebase!" to trigger it manually

The artifact failure details are included below:

File name: undefined

Welcome to .NET 7.0!
---------------------
SDK Version: 7.0.410

----------------
Installed an ASP.NET Core HTTPS development certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
Learn about HTTPS: https://aka.ms/dotnet-https
----------------
Write your first app: https://aka.ms/dotnet-hello-world
Find out what's new: https://aka.ms/dotnet-whats-new
Explore documentation: https://aka.ms/dotnet-docs
Report issues and find source on GitHub: https://github.com/dotnet/core
Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli
--------------------------------------------------------------------------------------
MSBuild version 17.7.6+77d58ec69 for .NET
  Determining projects to restore...
/opt/containerbase/tools/dotnet/sdk/7.0.410/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.TargetFrameworkInference.targets(160,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 8.0.  Either target .NET 7.0 or lower, or use a version of the .NET SDK that supports .NET 8.0. Download the .NET SDK from https://aka.ms/dotnet/download [/tmp/renovate/repos/github/Unity-Technologies/com.unity.netcode.gameobjects/Tools/CI/NGO.Cookbook.csproj]

@unity-renovate unity-renovate bot requested a review from a team as a code owner February 15, 2025 00:20
@unity-renovate
Copy link
Contributor Author

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

⚠️ Warning: custom changes will be lost.

@unity-renovate unity-renovate bot changed the title chore(deps): update upm project dependency com.unity.collab-proxy to v2.7.1 (develop) chore(deps): update upm project dependency com.unity.collab-proxy to v2.7.1 (develop) - abandoned Feb 19, 2025
@unity-renovate
Copy link
Contributor Author

Autoclosing Skipped

This PR has been flagged for autoclosing. However, it is being skipped due to the branch being already modified. Please close/delete it manually or report a bug if you think this is in error.

@michalChrobot michalChrobot deleted the renovate/develop-upm-prj-com.unity.collab-proxy-2.x branch February 19, 2025 08:31
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.

2 participants