Add testing project

.github/workflows/dotnet.yml

@@ -10,19 +10,34 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
-
+  test:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
+      with: 
+        submodules: 'true'
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
+    - name: Initialize submodules
+      run: |
+        git submodule init
+        git submodule update
+    - name: install standalone wasmtime
+      run: |
+        curl https://wasmtime.dev/install.sh -sSf | bash
+        echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
+        export PATH=$HOME/.wasmtime/bin:$PATH
+        wasmtime --version
+    - name: build MSBuild for unit test .dll
+      run: ./msbuild/build.sh
     - name: Restore dependencies
       run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
+    - name: Publish
+      run: dotnet publish src
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test
+    - name: Examples
+      run: dotnet build examples

.gitignore

@@ -1,4 +1,5 @@
 bin/
 obj/
 .vs
-Playground/
+Playground/
+/MSBuildWasmLocal.sln

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "msbuild"]
+	path = msbuild
+	url = https://github.com/dotnet/msbuild

MSBuildWasm.sln

@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleProject", "examples\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WasmTasksTests", "test\WasmTasksTests\WasmTasksTests.csproj", "{94FE5153-34D6-4F93-9792-7408AD89945D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "Playground\Playground.csproj", "{047F357B-00C5-49E1-B577-A17D5CFBD02E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,10 +27,6 @@ Global
 		{94FE5153-34D6-4F93-9792-7408AD89945D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94FE5153-34D6-4F93-9792-7408AD89945D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94FE5153-34D6-4F93-9792-7408AD89945D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{047F357B-00C5-49E1-B577-A17D5CFBD02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{047F357B-00C5-49E1-B577-A17D5CFBD02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{047F357B-00C5-49E1-B577-A17D5CFBD02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{047F357B-00C5-49E1-B577-A17D5CFBD02E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

examples/ExampleProject/ExampleProject.csproj

@@ -11,8 +11,8 @@
     <ProjectReference Include="../../src/MSBuildWasm.csproj" />
   </ItemGroup>
 
-  <UsingTask TaskName="WasmWasiTasks.WasmTask" AssemblyFile="..\..\src\bin\Release\net8.0\publish\MSBuildWasm.dll" TaskFactory="TaskHostFactory" />
-  <UsingTask TaskName="WasmWasiTasks.WasmExec" AssemblyFile="..\..\src\bin\Release\net8.0\publish\MSBuildWasm.dll" TaskFactory="TaskHostFactory" />
+  <UsingTask TaskName="MSBuildWasm.WasmTask" AssemblyFile="..\..\src\bin\Release\net8.0\publish\MSBuildWasm.dll" TaskFactory="TaskHostFactory" />
+  <UsingTask TaskName="MSBuildWasm.WasmExec" AssemblyFile="..\..\src\bin\Release\net8.0\publish\MSBuildWasm.dll" TaskFactory="TaskHostFactory" />
 
 <Target Name="RunWasm1" BeforeTargets="AfterBuild">
 		<WasmTask WasmFilePath="..\rust_template\target\wasm32-wasi\release\rust_template.wasm" EnableTmp="false" EnableIO="true" />

src/WasmExec.cs

@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.Build.Framework;
 
-namespace WasmWasiTasks
+namespace MSBuildWasm 
 {
     public class WasmExec : Microsoft.Build.Utilities.Task, IWasmTask
     {

src/WasmTask.cs

@@ -28,6 +28,18 @@ public class WasmTask : Microsoft.Build.Utilities.Task, IWasmTask
         public bool EnableIO { get; set; } = true;
 
 
+        readonly string outputPath = Path.GetFullPath("output.txt");
+        readonly string errorPath = Path.GetFullPath("output.txt");
+        readonly string tmpPath = Path.GetFullPath("tmp");
+
+        const string executeFunctionName = "execute";
+        const string outDirName = "wasmtaskoutput";
+
+        public WasmTask()
+        {
+
+        }
+
         public override bool Execute()
         {
             try
@@ -51,14 +63,13 @@ public override bool Execute()
                 }
                 if (HomeDir != null)
                 {
-                    var dir = Directory.CreateDirectory("wasmtaskoutput");
+                    var dir = Directory.CreateDirectory(outDirName);
                     wasiConfigBuilder = wasiConfigBuilder.WithPreopenedDirectory(dir.FullName, "/out");
                 }
-
                 if (EnableIO)
                 {
-                    wasiConfigBuilder = wasiConfigBuilder.WithStandardOutput("output.txt")
-                                                         .WithStandardError("error.txt");
+                    wasiConfigBuilder = wasiConfigBuilder.WithStandardOutput(outputPath)
+                                                         .WithStandardError(errorPath);
                 }
 
                 using var store = new Store(engine);
@@ -67,7 +78,11 @@ public override bool Execute()
 
 
                 Instance instance = linker.Instantiate(store, module);
-                Action fn = instance.GetAction("execute"); // TBD parameters
+                Action fn = instance.GetAction(executeFunctionName);
+                //dynamic instance =
+
+                //var instancedifferent = instance.GetFunction();
+
 
                 if (fn == null)
                 {
@@ -86,19 +101,24 @@ public override bool Execute()
             {
                 if (EnableTmp)
                 {
-                    Directory.Delete("tmp", true);
+                    Directory.Delete(tmpPath, true);
                 }
                 if (EnableIO)
                 {
                     // TODO unique filenames
-                    string output = File.ReadAllText("output.txt");
-                    string error = File.ReadAllText("error.txt");
-
-                    Log.LogMessage(MessageImportance.High, $"Output: {output}");
-                    Log.LogMessage(MessageImportance.Normal, $"Error: {error}");
+                    if (File.Exists(outputPath))
+                    {
+                        string output = File.ReadAllText(outputPath);
+                        Log.LogMessage(MessageImportance.High, $"Output: {output}");
+                        File.Delete(outputPath);
+                    }
 
-                    File.Delete("output.txt");
-                    File.Delete("error.txt");
+                    if (File.Exists(errorPath))
+                    {
+                        string error = File.ReadAllText(errorPath);
+                        Log.LogMessage(MessageImportance.Normal, $"Error: {error}");
+                        File.Delete(errorPath);
+                    }
                 }
             }
 

test/WasmTasksTests/WasmTask_Tests.cs

@@ -2,15 +2,26 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.Build.UnitTests.Shared;
 using MSBuildWasm;
+using Xunit;
+using Shouldly;
+using Microsoft.Build.UnitTests;
 
 namespace WasmTasksTests
 {
     public class WasmTask_Tests
     {
         [Fact]
-        public void Execute_WithDefaultSettings_ShouldSucceed()
+        public void ExecuteTemplate_WithDefaultSettings_ShouldSucceed()
         {
+            IWasmTask task = new WasmTask {
+                BuildEngine = new MockEngine(),
+                WasmFilePath = "../../../../../examples/rust_template/target/wasm32-wasi/release/rust_template.wasm"
+            };
+
+            task.Execute().ShouldBeTrue();
         }
 
     }

test/WasmTasksTests/WasmTasksTests.csproj

@@ -11,13 +11,20 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\MSBuildWasm.csproj" />
+    <Reference Include="Microsoft.Build.UnitTests.Shared">
+      <HintPath>$(MSBuildThisFileDirectory)\..\..\msbuild\artifacts\bin\Microsoft.Build.UnitTests.Shared\Debug\net8.0\Microsoft.Build.UnitTests.Shared.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
   <ItemGroup>