try different approach

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

Directory.Packages.props

@@ -8,8 +8,8 @@
     <PackageVersion Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.24525.6" />
 
     <!-- Tests -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>

samples/calculator/CalculatorComposed/CalculatorComposed.csproj

@@ -8,6 +8,9 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
+        <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
+        <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
 
     <ItemGroup>

samples/calculator/CalculatorHost/CalculatorHost.csproj

@@ -12,6 +12,9 @@
         <InvariantGlobalization>true</InvariantGlobalization>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
+        <WasmSingleFileBundle>true</WasmSingleFileBundle>
+        <WasmBuildNative>true</WasmBuildNative>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>

src/WasmComponent.Sdk/WasmComponent.Sdk.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="build\BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props" />
     <PropertyGroup>
         <PackageId>BytecodeAlliance.Componentize.DotNet.Wasm.SDK</PackageId>
         <Authors>Bytecode Alliance Developers</Authors>
@@ -40,6 +40,12 @@
     <Target Name="BuildOrDownloadNativeTooling" BeforeTargets="Build" DependsOnTargets="BuildNativeTooling; DownloadNativeTooling;">
     </Target>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
+        <PackageReference Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
+        <PackageReference Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
+    </ItemGroup>
+
     <Target Name="BuildNativeTooling" Condition="'$(BuildWasmToolsLocally)' == 'true'">
         <Exec Command="cargo build --release" WorkingDirectory="$(WasmToolsModuleRoot)" />
 

src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props

@@ -12,8 +12,4 @@
 		<WasmToolsExe Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(WasmToolsExe).exe</WasmToolsExe>
 	</PropertyGroup>
 
-	<ItemGroup>
-        <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
-        <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" PrivateAssets="None" />
-    </ItemGroup>
 </Project>

test/E2ETest/PackageTest/PackageTest.csproj

@@ -37,8 +37,8 @@
         <RemoveDir Directories="$(NugetPackageRoot)\bytecodealliance.componentize.dotnet.witbindgen\$(PackageVersion)" />
         <RemoveDir Directories="..\testapps\E2EProducer\obj" />
         <RemoveDir Directories="..\testapps\E2EConsumer\obj" />
-        <Exec Command="dotnet restore --no-cache" WorkingDirectory="..\testapps\E2EConsumer" />
-        <Exec Command="dotnet build --no-restore /bl" WorkingDirectory="..\testapps\E2EConsumer" />
+        <Exec Command="dotnet publish  /bl" WorkingDirectory="..\testapps\E2EProducer" />
+        <Exec Command="dotnet publish  /bl" WorkingDirectory="..\testapps\E2EConsumer" />
     </Target>
 
     <Target Name="PackPackagesForE2ETest">

test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj

@@ -28,7 +28,7 @@
     </ItemGroup>
 
     <!-- After build, create the composed component so it can be executed in the test -->
-    <Target Name="ComposeWasmComponent" AfterTargets="AfterBuild">
+    <Target Name="ComposeWasmComponent" AfterTargets="LinkNativeLlvm">
         <PropertyGroup>
             <DependencyComponent>../E2EProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/e2eproducer.wasm</DependencyComponent>
         </PropertyGroup>

test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj

@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <!-- After build, create the composed component so it can be executed in the test -->
-    <Target Name="ComposeWasmComponent" AfterTargets="AfterBuild">
+    <Target Name="ComposeWasmComponent" AfterTargets="LinkNativeLlvm">
         <PropertyGroup>
             <DependencyComponent>../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm</DependencyComponent>
         </PropertyGroup>