Bump the wasi-sdk to 22.0

[jsturtevant]

This updates to the latest version and also works towards removing EMSDK for the c# generator (dotnet/runtimelab#2592)

[dicej]

Looks like the Windows CI job is still running as I type this. I'll be interested to see if we need to change anything in the NuGet or csproj config to get the latest build of the NativeAOT-LLVM packages or if that will just happen automatically.

[yowl]

just happen automatically.

Should do, we use 9.0.0-* so until .net 9 goes out (when we will go to 10) we should be fine.

[dicej]

Oops, I just realized: we should use wasi-sdk-22.0.m-mingw64.tar.gz instead of wasi-sdk-22.0.m-mingw.tar.gz, since that will help us avoid WebAssembly/wasi-sdk#326

[jsturtevant]

Oops, I just realized: we should use wasi-sdk-22.0.m-mingw64.tar.gz instead of wasi-sdk-22.0.m-mingw.tar.gz, since that will help us avoid https://github.com/WebAssembly/wasi-sdk/issues/326Oops, I just realized: we should use wasi-sdk-22.0.m-mingw64.tar.gz instead of wasi-sdk-22.0.m-mingw.tar.gz, since that will help us avoid WebAssembly/wasi-sdk#326

I can address that in a followup. I was going to open up a PR to use clang instead of emscripten for

wit-bindgen/crates/csharp/src/csproj.rs

Lines 114 to 119 in 2645c4f

	<Target Name=\"CompileCabiRealloc\" BeforeTargets=\"IlcCompile\" DependsOnTargets=\"CheckWasmSdks\"
	Inputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c\"
	Outputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o\"
	>
	<Exec Command=\"emcc.bat &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c&quot; -c -o &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o&quot;\"/>
	</Target>

[dicej]

This is what I did locally for testing, FWIW:

                 <Target Name="CheckWasmSdks">
-                    <Error Text="Emscripten not found, not compiling to WebAssembly. To enable WebAssembly compilation, install Emscripten and ensure the EMSDK environment variable points to the directory containing upstream/emscripten/emcc.bat"
-                        Condition="'$(EMSDK)' == ''" />
+                    <Error Text="Wasi SDK not found, not compiling to WebAssembly. To enable WebAssembly compilation, install Wasi SDK and ensure the WASI_SDK_PATH environment variable points to the directory containing share/wasi-sysroot"
+                           Condition="'$(WASI_SDK_PATH)' == ''" />
+                    <Warning Text="The WASI SDK version is too low. Please use WASI SDK 22 or newer with a 64 bit Clang."
+                             Condition="!Exists('$(WASI_SDK_PATH)/VERSION')" />
                 </Target>
                 "#,
             );
@@ -115,7 +117,7 @@ impl CSProjectLLVMBuilder {
                 Inputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c\"
                 Outputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o\"
                 >
-                <Exec Command=\"emcc.bat &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c&quot; -c -o &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o&quot;\"/>
+                <Exec Command=\"&quot;$(WASI_SDK_PATH)/bin/clang&quot; --target=wasm32-wasi &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c&quot; -c -o &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o&quot;\"/>
               </Target>
             "
             ));