Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<NoWarn>$(NoWarn);NU1507</NoWarn>

<!-- tool versions -->
<WasmToolsVersion>1.227.1</WasmToolsVersion>
<WacVersion>v0.6.1</WacVersion>
<PrebuiltWitBindgenVersion>0.52.0</PrebuiltWitBindgenVersion>
<PrebuildWkgVersion>0.10.0</PrebuildWkgVersion>
<WasmToolsVersion>1.251.0</WasmToolsVersion>
<WacVersion>v0.10.0</WacVersion>
<PrebuiltWitBindgenVersion>0.58.0</PrebuiltWitBindgenVersion>
<PrebuildWkgVersion>0.15.1</PrebuildWkgVersion>

<!-- test artifacts -->
<WasmtimeVersion>30.0.2</WasmtimeVersion>
<WasmtimeVersion>45.0.1</WasmtimeVersion>

</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>
<ItemGroup>
<!-- find latest versions at https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-experimental by name of package -->
<PackageVersion Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25162.1" />
<PackageVersion Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25162.1" />
<PackageVersion Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-rc.1.26306.1" />
<PackageVersion Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-rc.1.26306.1" />

<!-- Tests -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.12.0,)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<WitBindgenRuntime>native-aot</WitBindgenRuntime>

<!-- Keep this block all in sync manually, since URLs can be arbitrary -->
<WasiSdkVersion Condition="'$(WasiSdkVersion)' == ''">24.0</WasiSdkVersion>
<WasiSdkVersion Condition="'$(WasiSdkVersion)' == ''">29.0</WasiSdkVersion>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<WasiSdkUrl Condition="$([MSBuild]::IsOSPlatform('Windows'))">https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-windows.tar.gz</WasiSdkUrl>
<WasiSdkUrl Condition="$([MSBuild]::IsOSPlatform('Linux'))">https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-linux.tar.gz</WasiSdkUrl>
<WasiSdkUrl Condition="$([MSBuild]::IsOSPlatform('OSX'))">https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-macos.tar.gz</WasiSdkUrl>
Expand All @@ -20,7 +20,7 @@
MSBuild stuff to acquire the necessary SDKs (WASI SDK) automatically. It will take a few mins on the
first build on a given machine, but after that should no-op.
-->
<Target Name="PrepareWasmSdks" BeforeTargets="CheckWasmSdks" DependsOnTargets="ObtainWasiSdk">
<Target Name="PrepareWasmSdks" BeforeTargets="_InitializeWasiSdk;CheckWasmSdks" DependsOnTargets="ObtainWasiSdk">
<PropertyGroup>
<WASI_SDK_PATH>$(WasiSdkRoot)</WASI_SDK_PATH>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions templates/content/wasi-cli/wasi-cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="BytecodeAlliance.Componentize.DotNet.Wasm.SDK" Version="0.7.0-preview*" />
<PackageReference Condition="'$(platform)' == 'Windows_NT'" Include="runtime.win-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-alpha.1.25162.1" />
<PackageReference Condition="'$(platform)' == 'linux'" Include="runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-alpha.1.25162.1" />
<PackageReference Condition="'$(platform)' == 'Windows_NT'" Include="runtime.win-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-rc.1.26306.1" />
<PackageReference Condition="'$(platform)' == 'linux'" Include="runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-rc.1.26306.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions templates/content/wasi-lib/OperationsImpl.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace LibraryWorld.wit.exports.example.component;
namespace LibraryWorld.wit.Exports.example.component;

public class OperationsImpl : IOperations
public class OperationsExportsImpl : IOperationsExports
{
public static int Add(int left, int right)
{
Expand Down
4 changes: 2 additions & 2 deletions templates/content/wasi-lib/wasi-lib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

<ItemGroup>
<PackageReference Include="BytecodeAlliance.Componentize.DotNet.Wasm.SDK" Version="0.7.0-preview*" />
<PackageReference Condition="'$(platform)' == 'Windows_NT'" Include="runtime.win-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-alpha.1.25162.1" />
<PackageReference Condition="'$(platform)' == 'linux'" Include="runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-alpha.1.25162.1" />
<PackageReference Condition="'$(platform)' == 'Windows_NT'" Include="runtime.win-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-rc.1.26306.1" />
<PackageReference Condition="'$(platform)' == 'linux'" Include="runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm" Version="10.0.0-rc.1.26306.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="BytecodeAlliance.Componentize.DotNet.Wasm.SDK" Version="$(PackageVersion)" />
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25118.1"/>
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-rc.1.26306.1"/>

<!-- Just to ensure build order -->
<ProjectReference Include="..\E2EProducer\E2EProducer.csproj" ReferenceOutputAssembly="false" />
Expand Down
2 changes: 1 addition & 1 deletion test/E2ETest/testapps/E2EProducer/E2EProducer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="BytecodeAlliance.Componentize.DotNet.Wasm.SDK" Version="$(PackageVersion)" />
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25118.1"/>
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-rc.1.26306.1"/>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
// Generated by `wit-bindgen` 0.40.0. DO NOT EDIT!
// Generated by `wit-bindgen` 0.58.0. DO NOT EDIT!
// <auto-generated />
#nullable enable

using System;
using System.Runtime.InteropServices;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;

namespace MySimpleWorld {

public interface IMySimpleWorld {
public interface IMySimpleWorldImports{
}

public interface IMySimpleWorldExports{
static abstract int GetNumber();

}

public readonly struct None {}

[StructLayout(LayoutKind.Sequential)]
[global::System.Runtime.InteropServices.StructLayoutAttribute(global::System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly struct Result<TOk, TErr>
{
public readonly byte Tag;
Expand Down Expand Up @@ -45,7 +54,7 @@ public TOk AsOk
return (TOk)value;
}

throw new ArgumentException("expected k, got " + Tag);
throw new global::System.ArgumentException("expected k, got " + Tag);
}
}

Expand All @@ -58,7 +67,7 @@ public TErr AsErr
return (TErr)value;
}

throw new ArgumentException("expected Err, got " + Tag);
throw new global::System.ArgumentException("expected Err, got " + Tag);
}
}

Expand All @@ -69,20 +78,22 @@ public class Tags
}
}

namespace exports {
using System.Runtime.InteropServices;
public static class MySimpleWorld
namespace Imports {
public partial class MySimpleWorldImportsInterop : IMySimpleWorldImports
{}
}
namespace Exports {
public static class MySimpleWorldInterop
{

[UnmanagedCallersOnly(EntryPoint = "get-number")]
[global::System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute(EntryPoint = "get-number")]
public static unsafe int wasmExportGetNumber() {

int ret;
ret = MySimpleWorldImpl.GetNumber();
ret = MySimpleWorldExportsImpl.GetNumber();
return ret;

}

}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Generated by `wit-bindgen` 0.40.0. DO NOT EDIT!
// Generated by `wit-bindgen` 0.58.0. DO NOT EDIT!
// <auto-generated />
#nullable enable

#if !NET9_0_OR_GREATER
// temporarily add this attribute until it is available in dotnet 9
namespace System.Runtime.InteropServices
{
internal partial class WasmImportLinkageAttribute : Attribute {}
internal partial class WasmImportLinkageAttribute : global::System.Attribute {}
}
#endif
Loading