Updated dependencies

Fixed security issues Fixed Mac issues Improved code
LandOfRails · Nov 29, 2023 · ef5467d · ef5467d
1 parent 2dcfbb0
commit ef5467d
Show file tree

Hide file tree

Showing 87 changed files with 676 additions and 570 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,20 +3,20 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Blazored.LocalStorage" Version="4.3.0" />
+    <PackageVersion Include="Blazored.LocalStorage" Version="4.4.0" />
     <PackageVersion Include="coverlet.collector" Version="1.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.25" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.8.0" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="1.0.4" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.3" />
-    <PackageVersion Include="SkiaSharp.Views.Blazor" Version="2.88.3" />
-    <PackageVersion Include="Svg.SourceGenerator.Skia" Version="0.5.18" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.6" />
+    <PackageVersion Include="SkiaSharp.Views.Blazor" Version="2.88.6" />
+    <PackageVersion Include="Svg.SourceGenerator.Skia" Version="1.0.0.6" />
     <PackageVersion Include="MudBlazor" Version="6.1.7" />
     <PackageVersion Include="MudBlazor.ThemeManager" Version="1.0.7" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/LandOfSignals-Signalbox/Client/BlazorGameStorage.cs b/LandOfSignals-Signalbox/Client/BlazorGameStorage.cs
@@ -10,11 +10,11 @@ public class BlazorGameStorage : ISignalboxStorage
 
     public IServiceProvider? AspNetCoreServices { get; set; }
 
-    private ISyncLocalStorageService? SyncLocalStorageService => (_syncLocalStorageService ??= this.AspNetCoreServices?.GetService<ISyncLocalStorageService>());
+    private ISyncLocalStorageService? SyncLocalStorageService => (_syncLocalStorageService ??= AspNetCoreServices?.GetService<ISyncLocalStorageService>());
 
     public string? Read(string key)
     {
-        var data = this.SyncLocalStorageService?.GetItemAsString(key);
+        var data = SyncLocalStorageService?.GetItemAsString(key);
         return data;
     }
 
@@ -24,7 +24,7 @@ public void Write(string key, string value)
         if (!valueExists || previousValue != value)
         {
             _lastSavedValue[key] = value;
-            this.SyncLocalStorageService?.SetItemAsString(key, value);
+            SyncLocalStorageService?.SetItemAsString(key, value);
         }
     }
 }
diff --git a/LandOfSignals-Signalbox/Client/BlazorTimer.cs b/LandOfSignals-Signalbox/Client/BlazorTimer.cs
@@ -29,11 +29,11 @@ public void Start()
 
     private async Task StartTimer()
     {
-        var timer = new PeriodicTimer(TimeSpan.FromMilliseconds(this.Interval));
+        var timer = new PeriodicTimer(TimeSpan.FromMilliseconds(Interval));
         while (await timer.WaitForNextTickAsync(_cts!.Token))
         {
-            long time = _stopwatch.ElapsedMilliseconds;
-            this.TimeSinceLastTick = time - _lastTick;
+            var time = _stopwatch.ElapsedMilliseconds;
+            TimeSinceLastTick = time - _lastTick;
             _lastTick = time;
             Elapsed?.Invoke(this, EventArgs.Empty);
         }

diff --git a/LandOfSignals-Signalbox/Client/Game.razor.cs b/LandOfSignals-Signalbox/Client/Game.razor.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Web;
+using DI;
+using Microsoft.AspNetCore.Components.Web;
 using Signalbox.Instrumentation;
 using Signalbox.Instrumentation.Stats;
 using Signalbox.Rendering.Signalbox;
@@ -19,8 +20,8 @@ public partial class Game
 
     protected override async Task OnInitializedAsync()
     {
-        _game = DI.ServiceLocator.GetService<ISignalbox>();
-        _interactionManager = DI.ServiceLocator.GetService<IInteractionManager>();
+        _game = ServiceLocator.GetService<ISignalbox>();
+        _interactionManager = ServiceLocator.GetService<IInteractionManager>();
 
         await _game.InitializeAsync(200, 200);
     }

diff --git a/LandOfSignals-Signalbox/Client/LandOfSignals-Signalbox.Client.csproj b/LandOfSignals-Signalbox/Client/LandOfSignals-Signalbox.Client.csproj
@@ -33,4 +33,18 @@
     <ProjectReference Include="..\Shared\LandOfSignals-Signalbox.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.CodeStyle">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/LandOfSignals-Signalbox/Client/Program.cs b/LandOfSignals-Signalbox/Client/Program.cs
@@ -1,4 +1,5 @@
 using Blazored.LocalStorage;
+using DI;
 using LandOfSignals_Signalbox.Client;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -13,7 +14,7 @@
 
 var host = builder.Build();
 
-if (DI.ServiceLocator.GetService<ISignalboxStorage>() is BlazorGameStorage storage)
+if (ServiceLocator.GetService<ISignalboxStorage>() is BlazorGameStorage storage)
 {
     storage.AspNetCoreServices = host.Services;
 }

diff --git a/LandOfSignals-Signalbox/Server/LandOfSignals-Signalbox.Server.csproj b/LandOfSignals-Signalbox/Server/LandOfSignals-Signalbox.Server.csproj
@@ -17,5 +17,19 @@
     <ProjectReference Include="..\Shared\LandOfSignals-Signalbox.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.CodeStyle">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 
 </Project>
diff --git a/LandOfSignals-Signalbox/Server/Pages/Error.cshtml.cs b/LandOfSignals-Signalbox/Server/Pages/Error.cshtml.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Diagnostics;
 
 namespace LandOfSignals_Signalbox.Server.Pages
 {

diff --git a/LandOfSignals-Signalbox/Shared/LandOfSignals-Signalbox.Shared.csproj b/LandOfSignals-Signalbox/Shared/LandOfSignals-Signalbox.Shared.csproj
@@ -9,4 +9,18 @@
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.CodeStyle">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/Signalbox.Engine/Entity/FilteredLayout.cs b/Signalbox.Engine/Entity/FilteredLayout.cs
@@ -37,7 +37,7 @@ public bool TryGet(int column, int row, [NotNullWhen(true)] out T? entity)
 
     public IEnumerator<T> GetEnumerator()
     {
-        foreach (T entity in _layout.OfType<T>())
+        foreach (var entity in _layout.OfType<T>())
         {
             yield return entity;
         }
@@ -60,7 +60,7 @@ public void Set(int column, int row, T entity)
 
     public void Add(int column, int row, IEnumerable<IStaticEntityFactory<T>> entityFactories, int fromColumn, int fromRow)
     {
-        T? entity = CreateNewStaticEntity(column, row, entityFactories, fromColumn, fromRow);
+        var entity = CreateNewStaticEntity(column, row, entityFactories, fromColumn, fromRow);
 
         if (entity is null)
         {
@@ -83,7 +83,7 @@ public void Add(int column, int row, IEnumerable<IStaticEntityFactory<T>> entity
 
     public bool IsAvailable(int column, int row)
     {
-        _layout.TryGet(column, row, out IStaticEntity? entity);
+        _layout.TryGet(column, row, out var entity);
         return entity == null || entity is T;
     }
 

diff --git a/Signalbox.Engine/Entity/Layout.cs b/Signalbox.Engine/Entity/Layout.cs
@@ -122,23 +122,23 @@ private static bool IsInvalid(int column, int row)
     public bool TryGet<T>(int column, int row, [NotNullWhen(true)] out T? entity)
         where T : class, IStaticEntity
     {
-        TryGet(column, row, out IStaticEntity? staticEntity);
+        TryGet(column, row, out var staticEntity);
         entity = staticEntity as T;
         return entity != null;
     }
 
     public bool IsEmptyOrT<T>(int column, int row)
         where T : class, IStaticEntity
     {
-        TryGet(column, row, out IStaticEntity? staticEntity);
+        TryGet(column, row, out var staticEntity);
         return staticEntity == null || staticEntity is T;
     }
 
     private void ResetArrays()
     {
         lock (_gate)
         {
-            for (int i = 0; i < _entities.Length; i++)
+            for (var i = 0; i < _entities.Length; i++)
             {
                 _entities[i] = new IStaticEntity?[_rows];
             }
@@ -148,9 +148,9 @@ private void ResetArrays()
     public IEnumerator<IStaticEntity> GetEnumerator()
     {
         if (_entities == null) yield break;
-        for (int i = 0; i < _entities.Length; i++)
+        for (var i = 0; i < _entities.Length; i++)
         {
-            for (int j = 0; j < _rows; j++)
+            for (var j = 0; j < _rows; j++)
             {
                 var track = _entities[i][j];
                 if (track is not null)
@@ -181,7 +181,7 @@ public bool Load(ISignalboxStorage storage)
 
         ResetArrays();
 
-        foreach (IStaticEntity entity in staticEntites)
+        foreach (var entity in staticEntites)
         {
             StoreEntity(entity.Column, entity.Row, entity);
         }
@@ -206,7 +206,7 @@ void ISignalboxState.Reset()
 
     public void Update(long timeSinceLastTick)
     {
-        foreach (IUpdatableEntity entity in this.OfType<IUpdatableEntity>())
+        foreach (var entity in this.OfType<IUpdatableEntity>())
         {
             entity.Update();
         }

diff --git a/Signalbox.Engine/Entity/MovableLayout.cs b/Signalbox.Engine/Entity/MovableLayout.cs
@@ -1,20 +1,20 @@
-using System.Collections.Immutable;
+using System.Collections;
+using System.Collections.Immutable;
 using Signalbox.Engine.MainManager;
 using Signalbox.Engine.StateManager;
 using Signalbox.Engine.Storage;
 using Signalbox.Engine.Tracks;
 using Signalbox.Engine.Trains;
-using IMovable = Signalbox.Engine.Trains.IMovable;
 
 namespace Signalbox.Engine.Entity;
 
 public class MovableLayout : IMovableLayout, ISignalboxState, ISignalboxStep
 {
     private ImmutableList<IMovable> _movables = ImmutableList<IMovable>.Empty;
-    private Dictionary<Track, (Trains.Train, float)> _lastTrackLeases = new();
+    private Dictionary<Track, (Train, float)> _lastTrackLeases = new();
     private readonly ILayout _layout;
     private readonly IEntityCollectionSerializer _gameSerializer;
-    private readonly Trains.Train _reservedTrain;
+    private readonly Train _reservedTrain;
 
     public int Count => _movables.Count;
 
@@ -30,7 +30,7 @@ public MovableLayout(ILayout layout, IEntityCollectionSerializer gameSerializer)
     public int IndexOf(IMovable movable)
         => _movables.IndexOf(movable);
 
-    public IEnumerable<(Track, Trains.Train, float)> LastTrackLeases => _lastTrackLeases.Select(kvp => (kvp.Key, kvp.Value.Item1, kvp.Value.Item2));
+    public IEnumerable<(Track, Train, float)> LastTrackLeases => _lastTrackLeases.Select(kvp => (kvp.Key, kvp.Value.Item1, kvp.Value.Item2));
 
     public void Add(IMovable movable)
         => _movables = _movables.Add(movable);
@@ -89,6 +89,6 @@ public void Update(long timeSinceLastTick)
     public IEnumerator<IMovable> GetEnumerator()
         => _movables.GetEnumerator();
 
-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+    IEnumerator IEnumerable.GetEnumerator()
         => _movables.GetEnumerator();
 }
diff --git a/Signalbox.Engine/Map/DefaultGenerator.cs b/Signalbox.Engine/Map/DefaultGenerator.cs
@@ -1,15 +1,13 @@
-using System.Numerics;
-
-namespace Signalbox.Engine.Map;
+namespace Signalbox.Engine.Map;
 
 internal static class DefaultGenerator
 {
     public static Dictionary<(int x, int y), string> GenerateDefaultMap(int width, int height)
     {
         var points = new Dictionary<(int x, int y), string>();
-        for (int i = 0; i < width; i++)
+        for (var i = 0; i < width; i++)
         {
-            for (int j = 0; j < height; j++)
+            for (var j = 0; j < height; j++)
             {
                 points.Add((i, j), string.Empty);
             }

diff --git a/Signalbox.Engine/Map/Map.cs b/Signalbox.Engine/Map/Map.cs
@@ -2,7 +2,6 @@
 using System.Collections.Immutable;
 using Signalbox.Engine.StateManager;
 using Signalbox.Engine.Storage;
-using Signalbox.Engine.Trains;
 using Signalbox.Engine.Utilities;
 
 namespace Signalbox.Engine.Map;
@@ -24,7 +23,7 @@ public void Reset()
         Dictionary<(int x, int y), string>? defaultMap = DefaultGenerator.GenerateDefaultMap(_columns, _rows);
 
         ImmutableDictionary<(int, int), Tile>.Builder builder = ImmutableDictionary.CreateBuilder<(int, int), Tile>();
-        foreach ((int x, int y) coord in defaultMap.Keys)
+        foreach (var coord in defaultMap.Keys)
         {
             builder.Add(coord, new()
             {

diff --git a/Signalbox.Engine/Signalbox.Engine.csproj b/Signalbox.Engine/Signalbox.Engine.csproj
@@ -10,4 +10,18 @@
     <ProjectReference Include="..\Signalbox.Instrumentation\Signalbox.Instrumentation.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.CodeStyle">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Signalbox.Engine/StateManager/SignalboxStateManager.cs b/Signalbox.Engine/StateManager/SignalboxStateManager.cs
@@ -36,7 +36,7 @@ public bool AutosaveEnabled
                 // if they're turning off autosave, we want to at least save that
                 // otherwise if they leave before the next save, it could be back on
                 // on load
-                _storage.Write("Autosave", this.AutosaveEnabled.ToString());
+                _storage.Write("Autosave", AutosaveEnabled.ToString());
             }
         }
     }
@@ -65,7 +65,7 @@ public void Load()
                 break;
             }
         }
-        this.AutosaveEnabled = _storage.Read("Autosave")?.Equals("True") ?? true;
+        AutosaveEnabled = _storage.Read("Autosave")?.Equals("True") ?? true;
     }
 
     public void Reset()
@@ -84,15 +84,15 @@ public void Save()
             {
                 gameState.Save(_storage);
             }
-            _storage.Write("Autosave", this.AutosaveEnabled.ToString());
+            _storage.Write("Autosave", AutosaveEnabled.ToString());
         }
     }
 
     public void Update(long timeSinceLastTick)
     {
-        _autosaveStat.Information = this.AutosaveEnabled ? "On" : "Off";
+        _autosaveStat.Information = AutosaveEnabled ? "On" : "Off";
 
-        if (this.AutosaveEnabled &&
+        if (AutosaveEnabled &&
             ++_autosaveCounter > AutosaveInterval)
         {
             Save();