Merge pull request #70 from NosCoreIO/FixBuild

Fix build

Author: 0Lucifer0

src/NosCore.PathFinder.Gui/Database/DataAccessHelper.cs

@@ -12,7 +12,7 @@
 
 namespace NosCore.PathFinder.Gui.Database
 {
-    public class DataAccessHelper : IDbContextBuilder
+    public class DataAccessHelper
     {
         private static readonly ILogger Logger = Shared.I18N.Logger.GetLoggerConfiguration().CreateLogger();
 

src/NosCore.PathFinder.Gui/GuiWindow.cs

@@ -50,8 +50,8 @@ public GuiWindow(MapDto map, int width, int height, string title, DataAccessHelp
                 GraphicsMode.Default, title)
         {
             var dbContextBuilder1 = dbContextBuilder;
-            var mapMonsterDao = new Dao<MapMonster, MapMonsterDto, int>(Logger, dbContextBuilder1);
-            var mapNpcDao = new Dao<MapNpc, MapNpcDto, int>(Logger, dbContextBuilder1);
+            var mapMonsterDao = new Dao<MapMonster, MapMonsterDto, int>(Logger, dbContextBuilder1.CreateContext);
+            var mapNpcDao = new Dao<MapNpc, MapNpcDto, int>(Logger, dbContextBuilder1.CreateContext);
             _originalWidth = Width;
             _originalCellSize = Width / map.Width;
             _cellSize = Width / map.Width;
@@ -82,8 +82,8 @@ public GuiWindow(MapDto map, int width, int height, string title, DataAccessHelp
                 mapNpc.Map = _map;
             }
 
-            Parallel.ForEach(_monsters, monster => monster.StartLife(CancellationToken.None));
-            Parallel.ForEach(_npcs, npc => npc.StartLife(CancellationToken.None));
+            Parallel.ForEach(_monsters, monster => _ = monster.StartLife(CancellationToken.None));
+            Parallel.ForEach(_npcs, npc => _ = npc.StartLife(CancellationToken.None));
 
             var wallpixels = new List<Vector2[]>();
             for (short y = 0; y < _map.Length; y++)

src/NosCore.PathFinder.Gui/NosCore.PathFinder.Gui.csproj

@@ -14,11 +14,12 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.0.1" />
     <PackageReference Include="NosCore.Dao" Version="1.5.0" />
     <PackageReference Include="NosCore.Shared" Version="1.10.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-rc2" />
     <PackageReference Include="OpenTK.NetStandard" Version="1.0.5.32" />
   </ItemGroup>
 

src/NosCore.PathFinder.Gui/PathfinderGui.cs

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using NosCore.PathFinder.Gui.Configuration;
 using NosCore.PathFinder.Gui.Database;
 using NosCore.PathFinder.Gui.I18N;
@@ -28,14 +29,14 @@ public static class PathFinderGui
         public static async Task Main(string[] args)
         {
             try { Console.Title = Title; } catch (PlatformNotSupportedException) { }
-            ConfiguratorBuilder.InitializeConfiguration(args, new[] { "pathfinder.yml", "logger.yml" }, PathfinderGuiConfiguration);
+            ConfiguratorBuilder.InitializeConfiguration(args, new[] { "pathfinder.yml", "logger.yml" }).Bind(PathfinderGuiConfiguration);
             Shared.I18N.Logger.PrintHeader(ConsoleText);
             var logger = Shared.I18N.Logger.GetLoggerConfiguration().CreateLogger();
             LogLanguage.Language = PathfinderGuiConfiguration.Language;
             var optionsBuilder = new DbContextOptionsBuilder<NosCoreContext>();
             optionsBuilder.UseNpgsql(PathfinderGuiConfiguration.Database!.ConnectionString);
             DbContextBuilder.Initialize(optionsBuilder.Options);
-            var  mapDao = new Dao<Map, MapDto, short>(logger, DbContextBuilder);
+            var  mapDao = new Dao<Map, MapDto, short>(logger, DbContextBuilder.CreateContext);
 
             while (true)
             {

src/NosCore.PathFinder/Brushfire/JumpNode.cs

@@ -22,9 +22,9 @@ public JumpNode((short X, short Y) position, double? value)
 
         public bool Opened { get; set; }
 
-        public int CompareTo(JumpNode other)
+        public int CompareTo(JumpNode? other)
         {
-            return F > other.F ? 1 : F < other.F ? -1 : 0;
+            return F > other?.F ? 1 : F < other?.F ? -1 : 0;
         }
     }
 }

src/NosCore.PathFinder/Brushfire/Node.cs

@@ -20,9 +20,9 @@ public Node()
         {
         }
 
-        public int CompareTo(Node other)
+        public int CompareTo(Node? other)
         {
-            return F > other.F ? 1 : F < other.F ? -1 : 0;
+            return F > other?.F ? 1 : F < other?.F ? -1 : 0;
         }
         public bool Closed { get; set; }
 

src/NosCore.PathFinder/NosCore.PathFinder.csproj

@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/NosCoreIO/NosCore.PathFinder.git</RepositoryUrl>
 		<PackageIconUrl></PackageIconUrl>
 		<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
-		<Version>0.0.8</Version>
+		<Version>0.0.9</Version>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<Description>NosCore's PathFinder</Description>
 		<PackageLicenseExpression></PackageLicenseExpression>