- update dependencies

- initialize random seed properly
compujuckel · Nov 16, 2023 · a3b0c3f · a3b0c3f
1 parent 75de6fd
commit a3b0c3f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 23 deletions.
diff --git a/AssettoServer.Shared/AssettoServer.Shared.csproj b/AssettoServer.Shared/AssettoServer.Shared.csproj
@@ -11,7 +11,7 @@
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <FrameworkReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
-      <PackageReference Include="Serilog" Version="3.0.1" />
+      <PackageReference Include="Serilog" Version="3.1.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/AssettoServer.Tests/AssettoServer.Tests.csproj b/AssettoServer.Tests/AssettoServer.Tests.csproj
@@ -10,10 +10,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
-        <PackageReference Include="NUnit" Version="3.13.3"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="NUnit" Version="3.14.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="3.9.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="coverlet.collector" Version="6.0.0"/>
     </ItemGroup>
 

diff --git a/AssettoServer/AssettoServer.csproj b/AssettoServer/AssettoServer.csproj
@@ -30,8 +30,8 @@
         <PackageReference Include="Autofac" Version="7.1.0" />
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
-        <PackageReference Include="CommunityToolkit.Common" Version="8.2.1" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+        <PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
         <PackageReference Include="CXuesong.Luaon" Version="0.2.7" />
         <PackageReference Include="CXuesong.Luaon.Json" Version="0.2.1" />
         <PackageReference Include="DotNext.IO" Version="4.15.0" />
@@ -50,33 +50,33 @@
             <NoWarn>NU1701</NoWarn>
         </PackageReference>
         <FrameworkReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
-        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NodaTime" Version="3.1.9" />
         <PackageReference Include="Open.NAT" Version="2.1.0">
             <NoWarn>NU1701</NoWarn>
         </PackageReference>
-        <PackageReference Include="Polly" Version="8.0.0" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.58.0" />
-        <PackageReference Include="prometheus-net" Version="8.0.1" />
-        <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
+        <PackageReference Include="Polly" Version="8.2.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
+        <PackageReference Include="prometheus-net" Version="8.1.0" />
+        <PackageReference Include="prometheus-net.AspNetCore" Version="8.1.0" />
         <PackageReference Include="protobuf-net.Grpc" Version="1.1.1" />
         <PackageReference Include="protobuf-net.Grpc.ClientFactory" Version="1.1.1" />
         <PackageReference Include="Qmmands" Version="5.0.2" />
-        <PackageReference Include="Serilog" Version="3.0.1" />
-        <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
-        <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
+        <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
+        <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.2.0" />
         <PackageReference Include="SerilogTimings" Version="3.0.1" />
         <PackageReference Include="compujuckel.Supercluster.KDTree" Version="1.0.8" />
         <PackageReference Include="Sigil" Version="5.0.0" />
         <PackageReference Include="SunCalcNet" Version="1.2.2" />
-        <PackageReference Include="System.IO.Hashing" Version="8.0.0-rc.2.23479.6" />
+        <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
         <PackageReference Include="YamlDotNet" Version="13.7.1" />
         <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="all" Condition="!Exists('packages.config')" />
     </ItemGroup>

diff --git a/AssettoServer/Network/Tcp/ACTcpClient.cs b/AssettoServer/Network/Tcp/ACTcpClient.cs
@@ -411,7 +411,7 @@ private async Task ReceiveLoopAsync()
                             ChecksumPaths = _checksumManager.TrackChecksums.Keys,
                             CurrentTime = 0, // Ignored by AC
                             LegalTyres = cfg.LegalTyres,
-                            RandomSeed = 123,
+                            RandomSeed = _configuration.RandomSeed,
                             SessionCount = (byte)_configuration.Sessions.Count,
                             Sessions = _configuration.Sessions,
                             SpawnPosition = SessionId,

diff --git a/AssettoServer/Server/Configuration/ACServerConfiguration.cs b/AssettoServer/Server/Configuration/ACServerConfiguration.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -26,6 +27,7 @@ public class ACServerConfiguration
     [YamlIgnore] public string? CSPExtraOptions { get; }
     [YamlIgnore] public string BaseFolder { get; }
     [YamlIgnore] public bool LoadPluginsFromWorkdir { get; }
+    [YamlIgnore] public int RandomSeed { get; } = Random.Shared.Next();
 
     /*
      * Search paths are like this:

diff --git a/FastLaneUtils/FastLaneUtils.csproj b/FastLaneUtils/FastLaneUtils.csproj
@@ -17,9 +17,9 @@
 
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-      <PackageReference Include="Serilog" Version="3.0.1" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+      <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+      <PackageReference Include="Serilog" Version="3.1.1" />
+      <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
     </ItemGroup>
 
 </Project>