Change back litenetlib from cutting edge master to nuget package 0.9.4

Cutting edge might make sense in a different branch
JohannesDeml · Apr 9, 2021 · 668cf74 · 668cf74
1 parent 61ccada
commit 668cf74
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "LiteNetLib"]
-	path = LiteNetLib
-	url = https://github.com/JohannesDeml/LiteNetLib.git

diff --git a/LiteNetLib b/LiteNetLib
diff --git a/NetworkBenchmarkDotNet.sln b/NetworkBenchmarkDotNet.sln
@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkBenchmarkDotNet", "N
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kcp2k", "Kcp2k\Kcp2k.csproj", "{03C5C23F-A642-41F5-8CB7-4D985629B2DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiteNetLib", "LiteNetLib\LiteNetLib\LiteNetLib.csproj", "{C6551124-4DAB-4E08-8FA7-14BF1E95998A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/NetworkBenchmarkDotNet/Libraries/LiteNetLib/EchoClient.cs b/NetworkBenchmarkDotNet/Libraries/LiteNetLib/EchoClient.cs
@@ -46,7 +46,11 @@ public EchoClient(int id, Configuration config, BenchmarkStatistics benchmarkSta
 			netManager = new NetManager(listener);
 			if (!config.Address.Contains(':'))
 			{
-				netManager.IPv6Mode = IPv6Mode.Disabled;
+				// For LiteNetLib 1.0 and above
+				//netManager.IPv6Mode = IPv6Mode.Disabled;
+
+				// LiteNetLib up to 0.9.4
+				netManager.IPv6Enabled = IPv6Mode.Disabled;
 			}
 
 			netManager.UpdateTime = Utilities.CalculateTimeout(config.ClientTickRate);

diff --git a/NetworkBenchmarkDotNet/Libraries/LiteNetLib/EchoServer.cs b/NetworkBenchmarkDotNet/Libraries/LiteNetLib/EchoServer.cs
@@ -38,7 +38,11 @@ public EchoServer(Configuration config, BenchmarkStatistics benchmarkStatistics)
 			netManager.UpdateTime = Utilities.CalculateTimeout(config.ServerTickRate);
 			if (!config.Address.Contains(':'))
 			{
-				netManager.IPv6Mode = IPv6Mode.Disabled;
+				// For LiteNetLib 1.0 and above
+				//netManager.IPv6Mode = IPv6Mode.Disabled;
+
+				// LiteNetLib up to 0.9.4
+				netManager.IPv6Enabled = IPv6Mode.Disabled;
 			}
 
 			netManager.UnsyncedEvents = true;

diff --git a/NetworkBenchmarkDotNet/NetworkBenchmarkDotNet.csproj b/NetworkBenchmarkDotNet/NetworkBenchmarkDotNet.csproj
@@ -32,6 +32,7 @@
     <ItemGroup>
       <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
       <PackageReference Include="ENet-CSharp" Version="2.4.6" />
+      <PackageReference Include="LiteNetLib" Version="0.9.4" />
       <PackageReference Include="NetCoreServer" Version="5.0.15" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
     </ItemGroup>
@@ -44,7 +45,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Kcp2k\Kcp2k.csproj" />
-      <ProjectReference Include="..\LiteNetLib\LiteNetLib\LiteNetLib.csproj" />
     </ItemGroup>