Skip to content

Commit fe528c6

Browse files
michalChrobotmichalChrobot
authored
Merge branch 'develop' into fix/1.x/mttb-1080/network-object-length-serialization
2 parents 7d024af + bfbe107 commit fe528c6

File tree

10 files changed

+138
-104
lines changed

10 files changed

+138
-104
lines changed

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:
16-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
1818
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- command: python PythonScripts/print_machine_info.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.45.0
57+
Wrench: 0.10.46.0
5858

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.10.45.0
27+
Wrench: 0.10.46.0
2828

‎.yamato/wrench/preview-a-p-v.yml‎

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

‎.yamato/wrench/promotion-jobs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
1313
- command: 7z x -aoa wrench-localapv.zip
1414
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1515
- command: python PythonScripts/print_machine_info.py
@@ -178,10 +178,10 @@ publish_dry_run_netcode_gameobjects:
178178
ignore_artifact: true
179179
variables:
180180
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
181-
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
181+
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
182182
metadata:
183183
Job Maintainers: '#rm-packageworks'
184-
Wrench: 0.10.45.0
184+
Wrench: 0.10.46.0
185185

186186
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
187187
publish_netcode_gameobjects:
@@ -191,7 +191,7 @@ publish_netcode_gameobjects:
191191
type: Unity::VM
192192
flavor: b1.large
193193
commands:
194-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
194+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
195195
- command: 7z x -aoa wrench-localapv.zip
196196
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
197197
- command: python PythonScripts/print_machine_info.py
@@ -360,8 +360,8 @@ publish_netcode_gameobjects:
360360
ignore_artifact: true
361361
variables:
362362
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
363-
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
363+
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
364364
metadata:
365365
Job Maintainers: '#rm-packageworks'
366-
Wrench: 0.10.45.0
366+
Wrench: 0.10.46.0
367367

‎.yamato/wrench/recipe-regeneration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.45.0
29+
Wrench: 0.10.46.0
3030

‎.yamato/wrench/validation-jobs.yml‎

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

‎.yamato/wrench/wrench_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.10.45.0",
34+
"wrench_version": "0.10.46.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
3636
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
3737
}

‎Tools/CI/NGO.Cookbook.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.45" />
11+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.46" />
1212
</ItemGroup>
1313

1414
</Project>

‎com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,5 +279,38 @@ public unsafe void ErrorMessageIsPrintedWhenAttemptingToSendNamedMessageWithTooB
279279
Assert.IsTrue(message.Contains($"Given message size ({msgSize} bytes) is greater than the maximum"), $"Unexpected exception: {message}");
280280
}
281281
}
282+
283+
[Test]
284+
public void NamedMessageHandlerIsUnregisteredWithoutException()
285+
{
286+
var messageName = Guid.NewGuid().ToString();
287+
const int numMessagesToSend = 3;
288+
const int expectedMessageHandlerCallCount = 1;
289+
290+
var messageHandlerCalled = 0;
291+
m_ServerNetworkManager.CustomMessagingManager.RegisterNamedMessageHandler(
292+
messageName,
293+
(_, _) =>
294+
{
295+
messageHandlerCalled++;
296+
m_ServerNetworkManager.CustomMessagingManager.UnregisterNamedMessageHandler(messageName);
297+
});
298+
299+
var messageContent = new ForceNetworkSerializeByMemcpy<Guid>(Guid.NewGuid());
300+
var writer = new FastBufferWriter(1300, Allocator.Temp);
301+
using (writer)
302+
{
303+
writer.WriteValueSafe(messageContent);
304+
for (var i = 0; i < numMessagesToSend; i++)
305+
{
306+
m_ServerNetworkManager.CustomMessagingManager.SendNamedMessage(
307+
messageName,
308+
m_ServerNetworkManager.LocalClientId,
309+
writer);
310+
}
311+
}
312+
313+
Assert.AreEqual(expectedMessageHandlerCallCount, messageHandlerCalled);
314+
}
282315
}
283316
}

‎pvpExceptions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,7 @@
860860
"Unity.Netcode.RuntimeTests.NamedMessageTests: IEnumerator WhenSendingNamedMessageToAll_AllClientsReceiveIt(): undocumented",
861861
"Unity.Netcode.RuntimeTests.NamedMessageTests: void WhenSendingNamedMessageToNullClientList_ArgumentNullExceptionIsThrown(): undocumented",
862862
"Unity.Netcode.RuntimeTests.NamedMessageTests: void ErrorMessageIsPrintedWhenAttemptingToSendNamedMessageWithTooBigBuffer(): undocumented",
863+
"Unity.Netcode.RuntimeTests.NamedMessageTests: void NamedMessageHandlerIsUnregisteredWithoutException(): undocumented",
863864
"Unity.Netcode.RuntimeTests.UnnamedMessageTests: undocumented",
864865
"Unity.Netcode.RuntimeTests.UnnamedMessageTests: NumberOfClients: undocumented",
865866
"Unity.Netcode.RuntimeTests.UnnamedMessageTests: IEnumerator UnnamedMessageIsReceivedOnClientWithContent(): undocumented",

0 commit comments

Comments
 (0)