Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrading nuget packages wip #82

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Upgrading nuget packages wip #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb5fcd
Upgrading nuget packages wip
devedse Jul 30, 2024
e9bd4b2
It works again
devedse Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeveMazeGeneratorCore.ConsoleApp/DeveMazeGeneratorCore.ConsoleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="DeveCoolLib" Version="1.0.582" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 23 additions & 9 deletions DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,34 @@
<EmbeddedResource Include="Content\wallcustom.xnb" />
</ItemGroup>

<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" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"
Version="8.0.7" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" />
<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="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="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>
</Project>
38 changes: 28 additions & 10 deletions DeveMazeGeneratorCore.MonoGame.Blazor/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,22 @@
<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
// that don't support content compression and http://.
var enableBrotliDecompression = true;
Blazor.start({
loadBootResource: function (type, name, defaultUri, integrity) {
if (type !== 'dotnetjs' && location.hostname !== 'localhost') {
if (enableBrotliDecompression === true && type !== 'dotnetjs' && location.hostname !== 'localhost') {
return (async function () {
const response = await fetch(defaultUri + '.br', { cache: 'no-cache' });
if (!response.ok)
throw new Error(response.statusText);
const originalResponseBuffer = await response.arrayBuffer();
const originalResponseArray = new Int8Array(originalResponseBuffer);
const decompressedResponseArray = BrotliDecode(originalResponseArray);
const contentType = type === 'dotnetwasm'
const contentType = (type === 'dotnetwasm')
? 'application/wasm'
: 'application/octet-stream';
const decompressedResponseArray = BrotliDecode(originalResponseArray);
return new Response(decompressedResponseArray,
{
headers: { 'content-type': contentType }
Expand All @@ -48,13 +51,16 @@
}
});
</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 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>
function tickJS() {
Expand All @@ -77,6 +83,18 @@
// begin game loop
window.requestAnimationFrame(tickJS);
};

window.onkeydown = function (event) {
// Prevent Arrows Keys and Spacebar scrolling the outer page
// when running inside an iframe. e.g: itch.io embedding.
if ([32, 37, 38, 39, 40].indexOf(event.keyCode) > -1)
event.preventDefault();
};
window.onmousewheel = function (event) {
// Prevent Mousewheel scrolling the outer page
// when running inside an iframe. e.g: itch.io embedding.
event.preventDefault();
};
</script>
</body>

Expand Down
2 changes: 1 addition & 1 deletion DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="8.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DeveMazeGeneratorCore\DeveMazeGeneratorCore.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions DeveMazeGeneratorCore.Tests/DeveMazeGeneratorCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions DeveMazeGeneratorCore.Web/DeveMazeGeneratorCore.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="SixLabors.Fonts" Version="2.0.2" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="SixLabors.Fonts" Version="2.0.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DeveMazeGeneratorCore/DeveMazeGeneratorCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
</ItemGroup>

</Project>
Loading