Skip to content

Commit

Permalink
WIP Upgrading monogame things to webgl
Browse files Browse the repository at this point in the history
  • Loading branch information
@devedse
devedse committed Nov 26, 2024
1 parent e2343fa commit 2d78a4f
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 35 deletions.
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.MonoGame.Android/DeveMazeGeneratorCore.MonoGame.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<RunAOTCompilation>False</RunAOTCompilation>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.2.1105" />
</ItemGroup>
<ItemGroup>
<Folder Include="Content\" />
Expand Down
28 changes: 12 additions & 16 deletions DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,32 +59,28 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.32" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"
Version="6.0.32" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.32" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"
Version="8.0.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="nkast.Xna.Framework.Blazor" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Blazor" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.14.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.14.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" />
<PackageReference Include="tainicom.Xna.Framework" Version="3.8.9012" /> -->
</ItemGroup>

<Import
Project="..\DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems"
Label="Shared" />
<Import Project="..\DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems" Label="Shared" />

</Project>
22 changes: 11 additions & 11 deletions DeveMazeGeneratorCore.MonoGame.Blazor/wwwroot/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script src="_framework/blazor.webassembly.js" autostart="false"></script>
<script type="module">
import { BrotliDecode } from './js/decode.min.js';
// Set this to enable Brotli (.br) decompression on static webServers
// Set this to enable Brotli (.br) decompression on static webServers
// that don't support content compression and http://.
var enableBrotliDecompression = true;
Blazor.start({
Expand All @@ -51,16 +51,16 @@
}
});
</script>
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Navigator.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Gamepad.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.1.js"></script>
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Navigator.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Gamepad.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.2.js"></script>
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.2.js"></script>
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.2.js"></script>

<script>
function tickJS() {
Expand Down
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DeveMazeGeneratorCore\DeveMazeGeneratorCore.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</MonoGameContentReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />
</ItemGroup>
<ItemGroup>
<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
Expand Down
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.MonoGame.WindowsDX/DeveMazeGeneratorCore.MonoGame.WindowsDX.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj" />
Expand Down

0 comments on commit 2d78a4f

Please sign in to comment.