From ec320873876cc0dbd39605e7b609e0617dc1f47a Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Mon, 28 Oct 2024 11:48:26 -0700 Subject: [PATCH 1/4] Remove the Windows specific dep in SDK Signed-off-by: James Sturtevant --- src/WasmComponent.Sdk/WasmComponent.Sdk.csproj | 5 ----- .../BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets | 6 +----- src/WitBindgen/WitBindgen.csproj | 4 ---- test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj index 6231713..daa59a6 100644 --- a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj +++ b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj @@ -1,5 +1,4 @@  - BytecodeAlliance.Componentize.DotNet.Wasm.SDK @@ -38,10 +37,6 @@ - - - - diff --git a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets index 4f10238..351ed4e 100644 --- a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets +++ b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.targets @@ -1,6 +1,2 @@ - - - - + diff --git a/src/WitBindgen/WitBindgen.csproj b/src/WitBindgen/WitBindgen.csproj index be64f7d..130700e 100644 --- a/src/WitBindgen/WitBindgen.csproj +++ b/src/WitBindgen/WitBindgen.csproj @@ -84,10 +84,6 @@ - - - - <_PackageFiles Include="build\**" BuildAction="Content" PackagePath="build" /> diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index 806e33b..c3daa9b 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -34,7 +34,7 @@ - + From cfedf56d1d80c799a4e987ae785a11791a0c92cd Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 29 Oct 2024 00:31:51 +0000 Subject: [PATCH 2/4] try different approach Signed-off-by: James Sturtevant --- Directory.Packages.props | 6 +++--- .../CalculatorComposed/CalculatorComposed.csproj | 3 +++ samples/calculator/CalculatorHost/CalculatorHost.csproj | 3 +++ src/WasmComponent.Sdk/WasmComponent.Sdk.csproj | 8 +++++++- .../BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props | 4 ---- test/E2ETest/PackageTest/PackageTest.csproj | 4 ++-- test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj | 2 +- .../testapps/SimpleConsumer/SimpleConsumer.csproj | 2 +- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ab9f4dc..4bb211c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,8 +8,8 @@ - - - + + + diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj index 4cfa6db..c7f8d66 100644 --- a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj +++ b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj @@ -8,6 +8,9 @@ net8.0 + wasi-wasm + true + false diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj index 630d40c..4b89218 100644 --- a/samples/calculator/CalculatorHost/CalculatorHost.csproj +++ b/samples/calculator/CalculatorHost/CalculatorHost.csproj @@ -12,6 +12,9 @@ true wasi-wasm true + true + true + true diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj index daa59a6..c04105f 100644 --- a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj +++ b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj @@ -1,5 +1,5 @@  - + BytecodeAlliance.Componentize.DotNet.Wasm.SDK Bytecode Alliance Developers @@ -40,6 +40,12 @@ + + + + + + diff --git a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props index e898b7d..9a6cfa1 100644 --- a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props +++ b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props @@ -12,8 +12,4 @@ $(WasmToolsExe).exe - - - - diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj index a94f4f9..bfa7c76 100644 --- a/test/E2ETest/PackageTest/PackageTest.csproj +++ b/test/E2ETest/PackageTest/PackageTest.csproj @@ -37,8 +37,8 @@ - - + + diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index c3daa9b..10de5c5 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -28,7 +28,7 @@ - + ../E2EProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/e2eproducer.wasm diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index bb390be..243584d 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -26,7 +26,7 @@ - + ../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm From c457bd41f44d9cd756eb8d819d6db804f63b193e Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 29 Oct 2024 10:37:20 -0700 Subject: [PATCH 3/4] use commands that work with older version of sdk Signed-off-by: James Sturtevant --- .../calculator/CalculatorComposed/CalculatorComposed.csproj | 3 --- samples/calculator/CalculatorHost/CalculatorHost.csproj | 3 --- src/WasmComponent.Sdk/WasmComponent.Sdk.csproj | 4 ++++ src/WitBindgen/WitBindgen.csproj | 4 ++++ test/E2ETest/PackageTest/PackageTest.csproj | 4 ++-- test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj | 2 +- .../testapps/SimpleConsumer/SimpleConsumer.csproj | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj index c7f8d66..4cfa6db 100644 --- a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj +++ b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj @@ -8,9 +8,6 @@ net8.0 - wasi-wasm - true - false diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj index 4b89218..630d40c 100644 --- a/samples/calculator/CalculatorHost/CalculatorHost.csproj +++ b/samples/calculator/CalculatorHost/CalculatorHost.csproj @@ -12,9 +12,6 @@ true wasi-wasm true - true - true - true diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj index c04105f..29d4ebd 100644 --- a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj +++ b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj @@ -37,6 +37,10 @@ + + + + diff --git a/src/WitBindgen/WitBindgen.csproj b/src/WitBindgen/WitBindgen.csproj index 130700e..be64f7d 100644 --- a/src/WitBindgen/WitBindgen.csproj +++ b/src/WitBindgen/WitBindgen.csproj @@ -84,6 +84,10 @@ + + + + <_PackageFiles Include="build\**" BuildAction="Content" PackagePath="build" /> diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj index bfa7c76..a94f4f9 100644 --- a/test/E2ETest/PackageTest/PackageTest.csproj +++ b/test/E2ETest/PackageTest/PackageTest.csproj @@ -37,8 +37,8 @@ - - + + diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index 10de5c5..c3daa9b 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -28,7 +28,7 @@ - + ../E2EProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/e2eproducer.wasm diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index 243584d..bb390be 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -26,7 +26,7 @@ - + ../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm From 1608049f36f86039567208f5d84d5ae5ab1555fa Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 29 Oct 2024 23:19:51 +0000 Subject: [PATCH 4/4] Use publish instead of build to support latest sdk Signed-off-by: James Sturtevant --- .github/workflows/build.yml | 2 +- .../calculator/CalculatorComposed/CalculatorComposed.csproj | 3 +++ test/E2ETest/PackageTest/PackageTest.csproj | 2 +- test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj | 2 +- .../testapps/SimpleConsumer/SimpleConsumer.csproj | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59a26bb..24c1a17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: Prepare WASM SDKs run: dotnet msbuild src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets /t:PrepareWasmSdks - name: Build - run: dotnet build --no-restore /p:BuildNumber=${{ github.run_number }} + run: dotnet publish --no-restore /p:BuildNumber=${{ github.run_number }} - name: Test run: dotnet test --no-build --verbosity normal - name: Pack diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj index 4cfa6db..c7f8d66 100644 --- a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj +++ b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj @@ -8,6 +8,9 @@ net8.0 + wasi-wasm + true + false diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj index a94f4f9..294c396 100644 --- a/test/E2ETest/PackageTest/PackageTest.csproj +++ b/test/E2ETest/PackageTest/PackageTest.csproj @@ -38,7 +38,7 @@ - + diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index c3daa9b..10de5c5 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -28,7 +28,7 @@ - + ../E2EProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/e2eproducer.wasm diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index bb390be..243584d 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -26,7 +26,7 @@ - + ../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm