bytecodealliance · GerardSmit · Sep 16, 2025 · Sep 16, 2025 · Sep 16, 2025 · Sep 17, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
       run: |
         ls ./artifacts/*.nupkg
         version=$(unzip -p ./artifacts/*SDK*.nupkg '*.nuspec' | grep -oE "<version>[^<]+" | sed 's/<version>//' | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+-preview")
-        template_version=$(grep -oE "Version=\"[^\"]+" ./templates/content/wasi-cli/wasi-cli.csproj | sed 's/Version="//' | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+-preview")
+        template_version=$(grep -oE 'Version="[^"]+' ./templates/content/wasi-cli/wasi-cli.csproj | sed 's/Version="//' | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+-preview")
         echo "Package Version: $version | Template version: $template_version"
         if [ "$version" != "$template_version" ]; then 
           echo "Version mismatch: Package version ($version) does not match template version ($template_version)";

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ artifacts/
 test/WasmComponentSdkTest/testapps/OciWit/wit/*.wasm
 *.binlog
 .DS_Store
+templates/content/wasi-cli/wasi-cli.csproj
+src/WasmComponent.Sdk/sdk/Version.props
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,4 +18,40 @@
         <WasmtimeVersion>30.0.2</WasmtimeVersion>
 
     </PropertyGroup>
+
+    <UsingTask TaskName="ReplaceFileText" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll">
+        <ParameterGroup>
+        <InputFilename ParameterType="System.String" Required="true" />
+        <OutputFilename ParameterType="System.String" Required="true" />
+        <MatchExpression ParameterType="System.String" Required="true" />
+        <ReplacementText ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+        <Using Namespace="System" />
+        <Using Namespace="System.IO" />
+        <Using Namespace="System.Text.RegularExpressions" />
+        <Code Type="Fragment" Language="cs">
+            <![CDATA[
+            if (File.Exists(InputFilename))
+            {
+                string result = File.ReadAllText(InputFilename);
+                var matches = MatchExpression.Split('|');
+                var replacements = ReplacementText.Split('|');
+
+                for (int i = 0; i < matches.Length; i++)
+                {
+                result = Regex.Replace(result, matches[i], replacements[i]);
+                }
+
+                File.WriteAllText(
+                    OutputFilename,
+                    "<!--\n    This code was generated by a tool.\n\n    Changes to this file may cause incorrect behavior and will be lost if\n    the code is regenerated.\n-->\n\n" +
+                    result
+                );
+            }
+            ]]>
+        </Code>
+        </Task>
+    </UsingTask>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,10 +3,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </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" />
-
     <!-- Tests -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.12.0,)" />
     <PackageVersion Include="xunit" Version="[2.9.0,)" />

diff --git a/README.md b/README.md
@@ -256,41 +256,21 @@ If you get a build error along the lines of _failed to encode a component from m
 * `dotnet new console -o MyApp`
 * `cd MyApp`
 
-Create a `nuget.config` file and add the `dotnet-experimental` package source for the `NativeAOT-LLVM` dependency:
+Edit the `.csproj` file:
 
-* `dotnet new nugetconfig`
-* Add these keys to `nuget.config` after `<clear />`:
+1. Add the following line under `<Project>`:
 
-```xml
-    <add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-```
-
-Add the `componentize-dotnet` package:
-
-`dotnet add package BytecodeAlliance.Componentize.DotNet.Wasm.SDK --prerelease`
-
-Add the platform specific LLVM package:
-
-```
-## On Linux
-dotnet add package runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm --prerelease
+  ```xml
+  <Project Sdk="BytecodeAlliance.Componentize.DotNet.WitBindgen" Version="[LatestVersion]" />
+  ```
+2. Add the following inside the `<PropertyGroup>`:
 
-## or
-
-## On Windows
-dotnet add package runtime.win-x64.microsoft.dotnet.ilcompiler.llvm --prerelease
-```
-
-Edit the `.csproj` file, adding the following inside the `<PropertyGroup>`:
-
-```
-<RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
-<UseAppHost>false</UseAppHost>
-<PublishTrimmed>true</PublishTrimmed>
-<InvariantGlobalization>true</InvariantGlobalization>
-<SelfContained>true</SelfContained>
-```
+  ```xml
+  <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
+  <PublishTrimmed>true</PublishTrimmed>
+  <InvariantGlobalization>true</InvariantGlobalization>
+  <SelfContained>true</SelfContained>
+  ```
 
 Now you can `dotnet build` to produce a `.wasm` file using NativeAOT compilation.
 
@@ -314,6 +294,18 @@ Caused by:
 
 Some imports automatically imported since they are so common.  In this case you should tell the runtime to implement those imports. For instance for the error above, in wasmtime you might add `-S cli` to the `wasmtime serve` command like `wasmtime serve -S cli` to include the `wasi:cli/environment@0.2.0` in wasmtime runtime host implementation.
 
+## SDK configuration
+You can configure the SDK by setting properties in your project file. The following are supported:
+
+| Property Name | Description | Default |
+|---------------|-------------|---------|
+| `WasiSdkVersion` | Version of the WASI SDK to use.<br />Be aware that not all versions of the WASI SDK are compatible with NativeAOT-LLVM. A warning will appear if you select an incompatible version for NativeAOT-LLVM.<br /><br />⚠️ When changing this value, or the NativeAOT-LLVM version, check the build output for a warning! | `24.0` |
+| `NativeAotLlvmVersion` | Version of the NativeAOT-LLVM package to use.<br />Find latest versions in the [dotnet-experimental feed](https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-experimental/NuGet/Microsoft.DotNet.ILCompiler.LLVM/versions). | `10.0.0-alpha.1.25162.1` |
+| `WitBindgenVersion` | Version of the `BytecodeAlliance.Componentize.DotNet.WitBindgen` package to use. | Current SDK version |
+| `RegisterExperimentalNuGetSource` | Whether to register the [dotnet-experimental feed](https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-experimental/NuGet) to find the NativeAOT-LLVM package. Set this to `false` if you have a NuGet.config that already includes this feed. | `true` |
+| `WitBindgenAddtionalArgs` | Additional arguments to pass to `wit-bindgen` when generating C# bindings. Separate multiple arguments with spaces. For example: `--with-wit-results --features tls`. | (empty) |
 <Exec Command="$(WitBindgenExe) c-sharp %(Wit.Identity) %(Wit.WitWorldArg) --runtime $(WitBindgenRuntime) $(WitBindgenAddtionalArgs) --out-dir $(WitGeneratedFilesRoot)" /> 
 <Exec Command="$(WitBindgenExe) c-sharp %(Wit.Identity) %(Wit.WitWorldArg) --runtime $(WitBindgenRuntime) $(WitBindgenAddtionalArgs) --out-dir $(WitGeneratedFilesRoot)" /> 
+| `WitGeneratedFilesRoot` | Folder (relative to the project root) where generated WIT files will be placed. | (empty) |
+
 ## Credits
 
 This project was original developed and forked from https://github.com/SteveSandersonMS/wasm-component-sdk under the Apache 2.0 License with a LLVM exception.

diff --git a/nuget.config b/nuget.config
diff --git a/samples/calculator/Adder/Adder.csproj b/samples/calculator/Adder/Adder.csproj
@@ -17,7 +17,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\WasmComponent.Sdk\WasmComponent.Sdk.csproj" />
-        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj
@@ -13,7 +13,6 @@
     <ItemGroup>
       <ProjectReference Include="..\Adder\Adder.csproj" ReferenceOutputAssembly="false" />
       <ProjectReference Include="..\CalculatorHost\CalculatorHost.csproj" ReferenceOutputAssembly="false" />
-      <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM"/>
     </ItemGroup>
 
     <Target Name="ComposeWasmComponent" AfterTargets="Publish">

diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj
@@ -14,7 +14,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\WasmComponent.Sdk\WasmComponent.Sdk.csproj" />
-        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WasmComponent.Sdk/ImportInDev.proj b/src/WasmComponent.Sdk/ImportInDev.proj
@@ -4,7 +4,4 @@
     <Import Project="build/*.targets" />
 
     <Import Project="../WitBindgen/ImportInDev.proj" />
-
-    <ItemGroup>
-	</ItemGroup>
 </Project>
diff --git a/src/WasmComponent.Sdk/Version.xml b/src/WasmComponent.Sdk/Version.xml
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <WitBindgenVersion Condition="'$(WitBindgenVersion)' == ''">$version$</WitBindgenVersion>
+    </PropertyGroup>
+</Project>
diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj
@@ -34,10 +34,6 @@
         <TarPath Condition="'$(TarPath)' == ''">tar</TarPath>
     </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\WitBindgen\WitBindgen.csproj" PrivateAssets="None" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="../../Readme.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
@@ -106,8 +102,15 @@
     </Target>
 
     <Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
+        <!-- 
+            Copy Version.xml to sdk\Version.props and replace $version$ with the current NuGet version
+            We need this to reference the current 'BytecodeAlliance.Componentize.DotNet.WitBindgen' in the SDK project
+         -->
+        <ReplaceFileText InputFilename="Version.xml" OutputFilename="sdk\Version.props" MatchExpression="\$version\$" ReplacementText="$(PackageVersion)" />
+
         <ItemGroup>
-            <_PackageFiles Include="build\**" BuildAction="Content" PackagePath="build" />
+            <_PackageFiles Include="sdk\**" BuildAction="Content" PackagePath="Sdk" />
+            <_PackageFiles Include="build\**" BuildAction="Content" PackagePath="Sdk" />
             <_PackageFiles Include="tools\**" BuildAction="Content" PackagePath="tools" />
         </ItemGroup>
     </Target>

diff --git a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props
@@ -19,9 +19,11 @@
 
 		<WacExe>$(MSBuildThisFileDirectory)..\tools\$(ToolsTarget)\wac</WacExe>
 		<WacExe Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(WacExe).exe</WacExe>
+
+		<!-- find latest versions at https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-experimental by name of package -->
+        <NativeAotLlvmVersion Condition="'$(NativeAotLlvmVersion)' == ''">10.0.0-alpha.1.25162.1</NativeAotLlvmVersion>
+		<RegisterExperimentalNuGetSource Condition="'$(RegisterExperimentalNuGetSource)' == ''">true</RegisterExperimentalNuGetSource>
 	</PropertyGroup>
 
-	<ItemGroup>
-        <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
-    </ItemGroup>
+
 </Project>
diff --git a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets
@@ -1,4 +1,13 @@
 <Project>
+	<PropertyGroup Condition="'$(RegisterExperimentalNuGetSource)' == 'true'">
+        <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;</RestoreAdditionalProjectSources>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" IsImplicitlyDefined="true" Version="$(NativeAotLlvmVersion)" />
+        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).microsoft.dotnet.ilcompiler.llvm" IsImplicitlyDefined="true" Version="$(NativeAotLlvmVersion)" />
+    </ItemGroup>
+
     <!-- 
         This links the publish step with the build so that when a user runs `dotnet build` they get a wasm file.
      -->

diff --git a/src/WasmComponent.Sdk/sdk/Sdk.props b/src/WasmComponent.Sdk/sdk/Sdk.props
@@ -0,0 +1,4 @@
+<Project>
+    <Import Project="Version.props" />
+    <Import Project="BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props" />
+</Project>
diff --git a/src/WasmComponent.Sdk/sdk/Sdk.targets b/src/WasmComponent.Sdk/sdk/Sdk.targets
@@ -0,0 +1,7 @@
+<Project>
+    <ItemGroup>
+        <PackageReference Include="BytecodeAlliance.Componentize.DotNet.WitBindgen" IsImplicitlyDefined="true" Version="$(WitBindgenVersion)" />
+    </ItemGroup>
+
+    <Import Project="BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets" />
+</Project>
diff --git a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets
@@ -1,4 +1,5 @@
 <Project>
+
     <PropertyGroup>
         <WitBindgenRuntime>native-aot</WitBindgenRuntime>
 
@@ -8,7 +9,6 @@
         <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>
         <WasiSdkRoot>$([System.IO.Path]::Combine("$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))", ".wasi-sdk", "wasi-sdk-$(WasiSdkVersion)"))</WasiSdkRoot>
-
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj b/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj
@@ -42,4 +42,9 @@
     <None Include="../README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
+  <Target Name="ReplaceVersion" BeforeTargets="BeforeBuild">
+    <!-- Copy wasi-cli.xml to content/wasi-cli/wasi-cli.csproj and replace $version$ with the current NuGet version -->
+    <ReplaceFileText InputFilename="wasi-cli.xml" OutputFilename="content\wasi-cli\wasi-cli.csproj" MatchExpression="\$version\$" ReplacementText="$(PackageVersion)" />
+  </Target>
+
 </Project>
diff --git a/templates/content/wasi-cli/.template.config/template.json b/templates/content/wasi-cli/.template.config/template.json
@@ -14,13 +14,6 @@
     "language": "C#",
     "type": "project"
   },
-  "symbols": {
-    "platform": {
-      "type": "bind",
-      "binding": "env:OS",
-      "defaultValue": "linux"
-    }
-  },
   "postActions": [
     {
       "description": "Welcome to Componetize dotnet",

diff --git a/templates/content/wasi-cli/nuget.config b/templates/content/wasi-cli/nuget.config
diff --git a/templates/content/wasi-cli/wasi-cli.csproj b/templates/content/wasi-cli/wasi-cli.csproj
diff --git a/templates/wasi-cli.xml b/templates/wasi-cli.xml
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="BytecodeAlliance.Componentize.DotNet.Wasm.SDK" Version="$version$" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <RootNamespace>wasi_cli</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <InvariantGlobalization>true</InvariantGlobalization>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj
@@ -28,7 +28,6 @@
 
         <!-- To ensure we don't build this until we've built the underlying packages -->
         <ProjectReference Include="..\..\..\src\WasmComponent.Sdk\WasmComponent.Sdk.csproj" ReferenceOutputAssembly="false" />
-        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM"/>
     </ItemGroup>
 
     <!-- The next targets (+ nuget.config in folder above) ensures we have the latest nuget packages for the e2e test since there is no great way to force a project to use a particular nuget pacakage -->

diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- This project can't be included in the solution because its package reference can't be satisfied except when running under test -->
+    <!-- Only needed when referencing the dependencies as projects. For package references, these are imported automatically. -->
+    <Import Project="..\..\..\..\src\WasmComponent.Sdk\ImportInDev.proj" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -19,7 +20,6 @@
 
     <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"/>
 
         <!-- Just to ensure build order -->
         <ProjectReference Include="..\E2EProducer\E2EProducer.csproj" ReferenceOutputAssembly="false" />

diff --git a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- This project can't be included in the solution because its package reference can't be satisfied except when running under test -->
+    <!-- Only needed when referencing the dependencies as projects. For package references, these are imported automatically. -->
+    <Import Project="..\..\..\..\src\WasmComponent.Sdk\ImportInDev.proj" />
 
     <PropertyGroup>
         <TargetFramework>net10.0</TargetFramework>
@@ -17,7 +18,6 @@
 
     <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"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj b/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj
@@ -33,7 +33,6 @@
         <ProjectReference Include="..\testapps\SimpleConsumer\SimpleConsumer.csproj" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\testapps\AppWithWitFolder\AppWithWitFolder.csproj" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\testapps\OciWit\OciWit.csproj" ReferenceOutputAssembly="false"/>
-        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM"/>
     </ItemGroup>
 
 </Project>