Skip to content

Commit e748b8c

Browse files
committed
correction of previous fix
1 parent fd80f71 commit e748b8c

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ public void BasicBuildTest()
2525

2626
if (buildTargetSupported)
2727
{
28-
#if UNIFIED_NETCODE
2928
// Netcode for Entities' build preprocessor writes an asset under this folder and errors if the parent does not already exist.
3029
if (!AssetDatabase.IsValidFolder("Assets/netcode-build-assets-temp"))
3130
{
3231
AssetDatabase.CreateFolder("Assets", "netcode-build-assets-temp");
3332
AssetDatabase.Refresh();
3433
}
35-
#endif
34+
3635
var buildReport = BuildPipeline.BuildPlayer(
3736
new[] { Path.Combine(packagePath, DefaultBuildScenePath) },
3837
Path.Combine(Path.GetDirectoryName(Application.dataPath), "Builds", nameof(BuildTests)),

‎com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ public void OneTimeSetup()
708708
InternalOnOneTimeSetup();
709709
}
710710

711-
#if UNIFIED_NETCODE && UNITY_EDITOR
711+
#if UNIFIED_NETCODE_7_0_0 && UNITY_EDITOR
712712
private bool m_PreviousWarnBatchedTicks;
713713
#endif
714714

@@ -727,7 +727,7 @@ private void InternalOnOneTimeSetup()
727727
// Enable NetcodeIntegrationTest auto-label feature
728728
NetcodeIntegrationTestHelpers.RegisterNetcodeIntegrationTest(true);
729729

730-
#if UNIFIED_NETCODE && UNITY_EDITOR
730+
#if UNIFIED_NETCODE_7_0_0 && UNITY_EDITOR
731731
// Netcode for Entities emits a performance-dependent "Server Tick Batching" warning on loaded CI agents that would fail strict log assertions.
732732
m_PreviousWarnBatchedTicks = MultiplayerPlayModePreferences.WarnBatchedTicks;
733733
MultiplayerPlayModePreferences.WarnBatchedTicks = false;
@@ -1915,7 +1915,7 @@ public void OneTimeTearDown()
19151915
// Disable NetcodeIntegrationTest auto-label feature
19161916
NetcodeIntegrationTestHelpers.RegisterNetcodeIntegrationTest(false);
19171917

1918-
#if UNIFIED_NETCODE && UNITY_EDITOR
1918+
#if UNIFIED_NETCODE_7_0_0 && UNITY_EDITOR
19191919
MultiplayerPlayModePreferences.WarnBatchedTicks = m_PreviousWarnBatchedTicks;
19201920
#endif
19211921

0 commit comments

Comments
 (0)