Skip to content

Commit 1cc3ef5

Browse files
committed
Remove unneeded changes
1 parent 9e3b301 commit 1cc3ef5

File tree

6 files changed

+2
-24
lines changed

6 files changed

+2
-24
lines changed

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ private void CreateNetworkVariableTypeInitializers(AssemblyDefinition assembly,
567567
typeof(Color),
568568
typeof(Color32),
569569
typeof(Ray),
570-
typeof(Ray2D),
570+
typeof(Ray2D)
571571
};
572572
internal static readonly Type[] SpecialCaseTypes = new[]
573573
{

com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
"name": "com.unity.nuget.mono-cecil",
2525
"expression": "(0,1.11.4)",
2626
"define": "CECIL_CONSTRAINTS_ARE_TYPE_REFERENCES"
27-
},
28-
{
29-
"name": "Unity",
30-
"expression": "6000.3.0a2",
31-
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_AVAILABLE"
3227
}
3328
],
3429
"noEngineReferences": false

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System.Runtime.CompilerServices;
66
using System.Text;
77
using UnityEngine;
8-
#if SCENE_MANAGEMENT_SCENE_HANDLE_AVAILABLE
9-
#endif
108

119
namespace Unity.Netcode
1210
{

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTestHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ internal static string GetCMBServiceEnvironentVariable()
197197
#if USE_CMB_SERVICE
198198
return "true";
199199
#else
200-
return Environment.GetEnvironmentVariable("USE_CMB_SERVICE") ?? "true";
200+
return Environment.GetEnvironmentVariable("USE_CMB_SERVICE") ?? "false";
201201
#endif
202202
}
203203

com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@
5252
"name": "Unity",
5353
"expression": "6000.1.0a1",
5454
"define": "HOSTNAME_RESOLUTION_AVAILABLE"
55-
},
56-
{
57-
"name": "Unity",
58-
"expression": "6000.3.0a2",
59-
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_AVAILABLE"
60-
},
61-
{
62-
"name": "Unity",
63-
"expression": "6000.4.0a3",
64-
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION"
6555
}
6656
],
6757
"noEngineReferences": false

testproject/Assets/Tests/Runtime/TestProject.Runtime.Tests.asmdef

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
"name": "com.unity.addressables",
3939
"expression": "",
4040
"define": "TESTPROJECT_USE_ADDRESSABLES"
41-
},
42-
{
43-
"name": "Unity",
44-
"expression": "6000.4.0a3",
45-
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION"
4641
}
4742
],
4843
"noEngineReferences": false

0 commit comments

Comments
 (0)