update to net10

Author: r58Playz

Makefile

@@ -1,4 +1,4 @@
-STATICS_RELEASE=265e23ca-337c-4e8d-b383-0e1e87300468
+STATICS_RELEASE=87d20f43-0820-47e0-8cf1-b4e0cd1a50aa
 DOTNETFLAGS=--nodereuse:false -v n
 
 statics:
@@ -16,7 +16,7 @@ SteamKit2.WASM:
 	git clone https://github.com/MercuryWorkshop/SteamKit2.WASM --recursive
 
 FNA:
-	git clone https://github.com/FNA-XNA/FNA --recursive -b 25.02
+	git clone https://github.com/FNA-XNA/FNA --recursive -b 25.11
 	cd FNA && git apply ../FNA.patch
 
 NLua:
@@ -44,13 +44,10 @@ deps: statics FNA MonoMod NLua SteamKit2.WASM emsdk
 
 build: deps
 	pnpm i
-	rm -r frontend/public/_framework loader/bin/Release/net9.0/publish/wwwroot/_framework || true
-#
-	NUGET_PACKAGES="$(shell realpath .)/nuget" dotnet restore loader $(DOTNETFLAGS)
-	bash replaceruntime.sh
-	NUGET_PACKAGES="$(shell realpath .)/nuget" dotnet publish loader -c Release $(DOTNETFLAGS)
-#
-	cp -r loader/bin/Release/net9.0/publish/wwwroot/_framework frontend/public/
+	rm -r frontend/public/_framework loader/bin/Release/net10.0/publish/wwwroot/_framework statics/dotnet || true
+	unzip -q -o statics/dotnet.zip -d statics/dotnet
+	dotnet publish loader -c Release $(DOTNETFLAGS)
+	cp -r loader/bin/Release/net10.0/publish/wwwroot/_framework frontend/public/
 	# emscripten sucks
 	sed -i 's/var offscreenCanvases \?= \?{};/var offscreenCanvases={};if(globalThis.window\&\&!window.TRANSFERRED_CANVAS){transferredCanvasNames=[".canvas"];window.TRANSFERRED_CANVAS=true;}/' frontend/public/_framework/dotnet.native.*.js
 	# dotnet messed up

Steamworks/Steamworks.NET.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<AssemblyName>Steamworks.NET</AssemblyName>
 		<RootNamespace>Steamworks</RootNamespace>
-		<LangVersion>12</LangVersion>
+		<LangVersion>14</LangVersion>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 

corefier/NETCoreifier.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<AssemblyName>NETCoreifier</AssemblyName>
 		<RootNamespace>NETCoreifier</RootNamespace>
-		<LangVersion>11</LangVersion>
+		<LangVersion>14</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

frontend/src/game/dotnet.ts

@@ -1,4 +1,4 @@
-import { DotnetHostBuilder } from "./dotnetdefs";
+import { DotnetHostBuilder, MonoConfig } from "./dotnetdefs";
 import { recursiveGetDirectory, rootFolder } from "../fs";
 import { SteamJS } from "../achievements";
 import { JsSplash } from "./loading";
@@ -85,18 +85,15 @@ useChange([gameState.playing, gameState.initting], () => {
 });
 
 let nativefetch = window.fetch;
-let wasm;
+let wasm: any;
 let dotnet: DotnetHostBuilder;
 let exports: any;
 
-export async function getDlls(): Promise<(readonly [string, string])[]> {
-	const resources: any = await nativefetch("_framework/blazor.boot.json").then(
-		(r) => r.json()
-	);
-
-	return Object.entries(resources.resources.fingerprinting)
-		.map((x) => [x[0] as string, x[1] as string] as const)
-		.filter((x) => x[1].endsWith(".dll"));
+export function getDlls(): (readonly [string, string])[] {
+	const config: MonoConfig = wasm.dotnet.instance.config;
+	const resources = [...(config.resources?.coreAssembly || []), ...(config.resources?.assembly || [])];
+	return resources
+		.map((x) => [x.name, x.virtualPath] as const)
 }
 
 // the funny custom rsa
@@ -192,14 +189,17 @@ export const loadedLibcurlPromise = new Promise((r) => (libcurlresolver = r));
 export async function preInit() {
 	if (gameState.ready) return;
 
-	wasm = await eval(`import("../_framework/dotnet.js")`);
+	let url = "../_framework/dotnet.js";
+	if (import.meta.env.DEV) {
+		url = "/_framework/dotnet.js";
+	}
+
+	wasm = await eval(`import("${url}")`);
 	dotnet = wasm.dotnet;
 
 	console.debug("initializing dotnet");
 	const runtime = await dotnet
 		.withConfig({
-			pthreadPoolInitialSize: 32,
-			pthreadPoolUnusedSize: 512,
 		})
 		.withRuntimeOptions([
 			// jit functions quickly and jit more functions
@@ -317,7 +317,7 @@ export async function preInit() {
 		exports,
 	};
 
-	const dlls = await getDlls();
+	const dlls = getDlls();
 
 	const loc = location.pathname;