Skip to content

test: Update asmdef for the tests to match the product #2016

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

Merged
0xFA11 merged 7 commits into from
Jun 15, 2022
Merged

test: Update asmdef for the tests to match the product #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9e26a9
Update asmdef for the tests to match the product
zain-mecklai Jun 14, 2022
556f4d2
set default port to 7777
zain-mecklai Jun 14, 2022
79c1ac6
Merge branch 'develop' into test/unet-utp-support-multiprocess-tests
0xFA11 Jun 14, 2022
f6a5ccb
Fix lint issue
zain-mecklai Jun 14, 2022
ec5f997
Merge branch 'test/unet-utp-support-multiprocess-tests' of github.com…
zain-mecklai Jun 14, 2022
5809c35
Merge with develop
zain-mecklai Jun 14, 2022
b632d9f
Need a better way to handle server/editor run
zain-mecklai Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions testproject/Assets/Scenes/MultiprocessTestScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641234, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -320,7 +320,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -439,7 +438,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -610,7 +608,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -706,7 +703,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -794,7 +790,7 @@ MonoBehaviour:
LogLevel: 1
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 1674777073}
NetworkTransport: {fileID: 2027640073}
PlayerPrefab: {fileID: 4700706668509470175, guid: 7eeaaf9e50c0afc4dab93584a54fb0d6,
type: 3}
NetworkPrefabs:
Expand Down
4 changes: 2 additions & 2 deletions testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private set
}
}
private string m_ConnectAddress = "127.0.0.1";
public static string Port = "3076";
public static string Port = "7777";
private bool m_IsClient;

private void SetConfigurationTypeAndConnect(ConfigurationType type)
Expand Down Expand Up @@ -127,7 +127,7 @@ public void Awake()
// if we've tried all the configuration types and none of them are correct then we should throw an exception
if (ConfigurationType == ConfigurationType.Unknown)
{
throw new Exception("Unable to determine configuration for NetworkManager via commandline, webapi or config file");
// throw new Exception("Unable to determine configuration for NetworkManager via commandline, webapi or config file");
Copy link
Copy Markdown
Contributor

@SamuelBellomo SamuelBellomo Jun 15, 2022

Choose a reason for hiding this comment

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

should this stay commented?

Copy link
Copy Markdown
Contributor

@SamuelBellomo SamuelBellomo Jun 15, 2022

Choose a reason for hiding this comment

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

nit ^^^

}

if (Instance != null)
Expand Down
3 changes: 0 additions & 3 deletions testproject/Assets/Tests/Runtime/MultiprocessRuntime/ThreeDText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using UnityEngine;
#if UNITY_UNET_PRESENT
using Unity.Netcode.Transports.UNET;
#endif

namespace Unity.Netcode.MultiprocessRuntimeTests
{
Expand Down
10 changes: 8 additions & 2 deletions testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": [],
"noEngineReferences": false
"noEngineReferences": false,
"versionDefines": [
{
"name": "Unity",
"expression": "(0,2022.2.0a5)",
"define": "UNITY_UNET_PRESENT"
}
]
}