Merge branch 'master' of https://github.com/devedse/DeveMazeGenerator…

…Core
devedse · Dec 22, 2023 · a81fa20 · a81fa20
2 parents ba9a1bd + a874c48
commit a81fa20
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
-FROM mcr.microsoft.com/dotnet/sdk:6.0-focal
+FROM mcr.microsoft.com/dotnet/sdk:8.0
 RUN apt-get update && apt-get install -y gnupg2 vim
 RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | apt-key add -
 RUN curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/msprod.list

diff --git a/DeveMazeGeneratorCore.MonoGame.Android/AndroidManifest.xml b/DeveMazeGeneratorCore.MonoGame.Android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	android:installLocation="auto"
 	android:versionName="0.1"
 	android:versionCode="1">
-	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
 	<application
 		android:allowBackup="true"
 		android:label="DeveMazeGeneratorCore.MonoGame.Android"

diff --git a/DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj b/DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj
@@ -58,13 +58,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.3" />
-		<PackageReference Include="nkast.Wasm.Audio" Version="6.0.3" />
-		<PackageReference Include="nkast.Wasm.Canvas" Version="6.0.3" />
-		<PackageReference Include="nkast.Wasm.Dom" Version="6.0.3" />
-		<PackageReference Include="nkast.Wasm.XHR" Version="6.0.3" />
-		<PackageReference Include="nkast.Xna.Framework.Blazor" Version="3.8.9102" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
+		<PackageReference Include="nkast.Wasm.Audio" Version="6.0.5" />
+		<PackageReference Include="nkast.Wasm.Canvas" Version="6.0.5" />
+		<PackageReference Include="nkast.Wasm.Dom" Version="6.0.5" />
+		<PackageReference Include="nkast.Wasm.XHR" Version="6.0.5" />
+		<PackageReference Include="nkast.Xna.Framework.Blazor" Version="3.10.9001" />
 		<!-- <PackageReference Include="tainicom.Wasm.Canvas" Version="3.2.10" />
 	  <PackageReference Include="tainicom.Wasm.XHR" Version="3.2.10" />
 	  <PackageReference Include="tainicom.Wasm.Dom" Version="3.2.10" />

diff --git a/DeveMazeGeneratorCore.MonoGame.Blazor/wwwroot/index.html b/DeveMazeGeneratorCore.MonoGame.Blazor/wwwroot/index.html
@@ -48,13 +48,13 @@
             }
         });
     </script>
-    <script src="_content/nkast.Wasm.Dom/js/JSObject.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.Dom/js/Window.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.Dom/js/Document.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.XHR/js/XHR.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.Canvas/js/Canvas.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.6.0.2.js"></script>
-    <script src="_content/nkast.Wasm.Audio/js/Audio.6.0.2.js"></script>
+    <script src="_content/nkast.Wasm.Dom/js/JSObject.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.Dom/js/Window.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.Dom/js/Document.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.XHR/js/XHR.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.Canvas/js/Canvas.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.6.0.5.js"></script>
+    <script src="_content/nkast.Wasm.Audio/js/Audio.6.0.5.js"></script>
 
     <script>
         function tickJS() {

diff --git a/DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj b/DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj
@@ -7,7 +7,7 @@
 		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="System.Text.Json" Version="7.0.2" />
+		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\DeveMazeGeneratorCore\DeveMazeGeneratorCore.csproj" />

diff --git a/DeveMazeGeneratorCore.MonoGame.Shared/DeveMazeGeneratorCore.MonoGame.Shared.projitems b/DeveMazeGeneratorCore.MonoGame.Shared/DeveMazeGeneratorCore.MonoGame.Shared.projitems
@@ -21,6 +21,7 @@
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack2.cs" Link="Generators\AlgorithmBacktrack2.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack2Deluxe_AsByte.cs" Link="Generators\AlgorithmBacktrack2Deluxe_AsByte.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack2Deluxe2_AsByte.cs" Link="Generators\AlgorithmBacktrack2Deluxe2_AsByte.cs" />
+    <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack2Deluxe2WithBorder_AsByte.cs" Link="Generators\AlgorithmBacktrack2Deluxe2WithBorder_AsByte.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack3.cs" Link="Generators\AlgorithmBacktrack3.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmBacktrack4.cs" Link="Generators\AlgorithmBacktrack4.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Generators\AlgorithmDivisionDynamic.cs" Link="Generators\AlgorithmDivisionDynamic.cs" />
@@ -42,6 +43,7 @@
     <Compile Include="..\DeveMazeGeneratorCore\Helpers\UnevenHelper.cs" Link="Helpers\UnevenHelper.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Imageification\WithoutPath.cs" Link="Imageification\WithoutPath.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\Imageification\WithPath.cs" Link="Imageification\WithPath.cs" />
+    <Compile Include="..\DeveMazeGeneratorCore\InnerMaps\BitArreintjeFastChunkedInnerMap.cs" Link="InnerMaps\BitArreintjeFastChunkedInnerMap.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\InnerMaps\BitArreintjeFastHilbertInnerMap.cs" Link="InnerMaps\BitArreintjeFastHilbertInnerMap.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\InnerMaps\BitArreintjeFastInnerMap.cs" Link="InnerMaps\BitArreintjeFastInnerMap.cs" />
     <Compile Include="..\DeveMazeGeneratorCore\InnerMaps\BoolInnerMap.cs" Link="InnerMaps\BoolInnerMap.cs" />

diff --git a/DeveMazeGeneratorCore.Tests/DeveMazeGeneratorCore.Tests.csproj b/DeveMazeGeneratorCore.Tests/DeveMazeGeneratorCore.Tests.csproj
@@ -12,8 +12,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>