Skip to content

Commit 45db9fc

Browse files
chore: fix the standards check for the n4e 7.0.0 dependency
Three things the standards job caught, since it opens the project, runs the formatter with --fix and then fails on any diff at all: - The fully qualified INetworkStreamDriverConstructor is simplified by the formatter (IDE0001), so write it the way the formatter wants. It still resolves to NGO's, since the lookup walks out to Unity.Netcode.Transports before reaching the shared root. - N4E 7.0.0 renamed the serialized GlobalNetCodeConfig field to GlobalNetcodeConfig, which the editor rewrites in the test project's settings asset the first time it loads it. - validation_editors.minimal is back on a released editor. The standards job opens the project with it, and trunk rewrites ProjectVersion.txt out from under the cleanliness check. Nothing there needs N4E present: a released editor bundles 6.7.0 as a built-in package, so the 7.0.0 request is dropped silently and the project builds with no N4E at all - verified on 6000.7.0a6, which resolves and compiles clean with N4E absent from packages-lock, PackageCache and ScriptAssemblies alike.
1 parent c78f679 commit 45db9fc

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎.yamato/project.metafile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,12 @@ test_platforms:
176176
# TODO: When a new editor will be released it should be added to this list
177177

178178
# TEMPORARY: only trunk has dropped Netcode for Entities as a core package, so only there does the
179-
# com.unity.netcode 7.0.0 dependency resolve - a released editor's bundled 6.7.0 wins over the request.
180-
# Restore the released editors here once one ships without it. `all` is left alone as the reminder.
179+
# com.unity.netcode 7.0.0 dependency resolve. A released editor bundles 6.7.0 as a built-in package and
180+
# UPM then drops the 7.0.0 request silently, leaving N4E out of the project entirely - which still
181+
# compiles, since the unified API is opt-in. `default` runs the jobs that should see N4E present.
182+
# `minimal` stays on a released editor: it is what the standards job opens the project with, and trunk
183+
# rewrites ProjectVersion.txt out from under the cleanliness check. Restore `default` once a released
184+
# editor ships without N4E as a core package; `all` is left alone as the reminder.
181185
validation_editors:
182186
default:
183187
- trunk
@@ -187,7 +191,7 @@ validation_editors:
187191
- trunk
188192
- 1d47644d0e359a8139ae6f99217da3c4e47f4779
189193
minimal:
190-
- trunk
194+
- 6000.7.0a6
191195
pinnedTrunk: 1d47644d0e359a8139ae6f99217da3c4e47f4779
192196

193197

‎com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ public void UnityTransport_HostnameValidation((string, bool) testCase)
231231
}
232232
#endif
233233

234-
// Fully qualified: Netcode for Entities declares an INetworkStreamDriverConstructor of its own in the
234+
// Qualified: Netcode for Entities declares an INetworkStreamDriverConstructor of its own in the
235235
// Unity.Netcode root, which the enclosing namespace resolves ahead of the using directive above.
236-
private class IPCDriverConstructor : Unity.Netcode.Transports.UTP.INetworkStreamDriverConstructor
236+
private class IPCDriverConstructor : Transports.UTP.INetworkStreamDriverConstructor
237237
{
238238
public void CreateDriver(
239239
UnityTransport transport,

‎testproject/ProjectSettings/NetCodeClientAndServerSettings.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
FilterSettings:
1616
ExcludedBakingSystemAssemblies: []
1717
AdditionalScriptingDefines: []
18-
GlobalNetCodeConfig: {fileID: 11400000, guid: c547acbddd81d32a0ba5e62ddfc4f4e3, type: 2}
18+
GlobalNetcodeConfig: {fileID: 11400000, guid: c547acbddd81d32a0ba5e62ddfc4f4e3, type: 2}
1919
CurrentImportanceSuggestions:
2020
- MinValue: 1
2121
MaxValue: 4

0 commit comments

Comments
 (0)