Skip to content

fix: unet removed from unity trunk v1.0.0 #1684

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
Merged
merged 11 commits into from
Feb 15, 2022
Merged

fix: unet removed from unity trunk v1.0.0 #1684

merged 11 commits into from
Feb 15, 2022

Conversation

NoelStephensUnity
Copy link
Collaborator

Fixing the most recent update to unity trunk where UNet no longer exists.
MTT-2483
This is a backport of #1678.

Changelog

com.unity.netcode.gameobjects

Testing and Documentation

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

NoelStephensUnity and others added 8 commits February 11, 2022 13:35
@NoelStephensUnity
fix
af4b97f 
Updating the NGO assembly.
@NoelStephensUnity
fix
5ce4635 
excluding unet if it is not present.
@NoelStephensUnity
fix
1468714 
Missed a few spots
@NoelStephensUnity
fix
44f970b 
CommandLineHandler had references to UNetTransport
@NoelStephensUnity
fix
393263d 
Excluding Unity.Netcode.Transports.UNET from NetworkManagerHelper.
@NoelStephensUnity
style
6acce5a 
removing commented out UNet references and adding additional comments.
@NoelStephensUnity
update
c409c12 
removing the relay stuff as it was not needed.
@NoelStephensUnity
update
cd35c15 
Adding UnityTransport support to the CommandLineHandler.
@NoelStephensUnity
fix
2c8167e 
Disabling tools testing until we can figure out why they are breaking.
@NoelStephensUnity
Revert "fix"
78c948f 
This reverts commit 2c8167e.
@NoelStephensUnity
fix
bcbb9f4 
Seeing if this fixes the issues with the tools tests failing.
NoelStephensUnity
NoelStephensUnity commented Feb 12, 2022
View reviewed changes
com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkManagerHelper.cs
@@ -68,6 +70,7 @@ public static bool StartNetworkManager(out NetworkManager networkManager, Networ

Debug.Log($"{nameof(NetworkManager)} Instantiated.");

#if UNITY_UNET_PRESENT
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This part of the back port has to be different because of the fixes applied to develop for the console testing (#1664 & #1653). I will be migrating these updates into develop next week. Until then, this prevents certain tests from failing when UNet is not included and uses only SIPTransport.

@NoelStephensUnity NoelStephensUnity merged commit 5194a8a into release/1.0.0 Feb 15, 2022
@NoelStephensUnity NoelStephensUnity deleted the fix/unet-removed-from-unity-trunk-v1.0.0 branch February 15, 2022 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xFA11 0xFA11 0xFA11 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NoelStephensUnity @0xFA11