From 89db099eee1ca3f84defbac3dc1cd45bc50c298e Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Mon, 25 Nov 2024 14:16:13 -0800 Subject: [PATCH] Update readme to support Linux Signed-off-by: James Sturtevant --- .github/workflows/build.yml | 4 ++-- Directory.Packages.props | 10 ++++----- README.md | 22 +++++++++---------- samples/calculator/Adder/Adder.csproj | 4 ++-- .../CalculatorComposed.csproj | 3 ++- .../CalculatorHost/CalculatorHost.csproj | 5 ++--- .../WasmComponent.Sdk.csproj | 2 +- ...lliance.Componentize.DotNet.Wasm.SDK.props | 10 ++++++--- src/WitBindgen/WitBindgen.csproj | 2 +- test/E2ETest/PackageTest/PackageTest.csproj | 3 ++- .../testapps/E2EConsumer/E2EConsumer.csproj | 3 ++- .../testapps/E2EProducer/E2EProducer.csproj | 3 ++- test/E2ETest/testapps/nuget.config | 4 ++++ .../WasmComponentSdkTest.csproj | 6 ++++- .../AppWithWitFolder/AppWithWitFolder.csproj | 4 ++-- .../testapps/OciWit/OciWit.csproj | 4 ++-- .../SimpleConsumer/SimpleConsumer.csproj | 3 ++- .../SimpleProducer/SimpleProducer.csproj | 3 ++- .../WitBindgenTest/WitBindgenTest.csproj | 2 +- .../LibraryUsingWit/LibraryUsingWit.csproj | 3 ++- 20 files changed, 59 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59a26bb..e4dda88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: name: Build on ${{ matrix.os }} with Dotnet ${{ matrix.dotnet }} strategy: matrix: - dotnet: [ '8.x', '9.0.100-rc.1.24452.12'] + dotnet: [ '9.x'] os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 @@ -42,5 +42,5 @@ jobs: name: nuget-packages path: artifacts/*.nupkg if-no-files-found: error - if: ${{ matrix.dotnet == '8.x' && matrix.os == 'windows-latest' }} + if: ${{ matrix.dotnet == '9.x' && matrix.os == 'windows-latest' }} diff --git a/Directory.Packages.props b/Directory.Packages.props index ab9f4dc..8ed703b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,12 +4,12 @@ - - + + - - - + + + diff --git a/README.md b/README.md index 7c49c47..1d331e3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ With this package, you can add one NuGet reference. The build output is fully AO ### 1. Set up SDKs -If you don't already have it, install [.NET 8+ SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) +If you don't already have it, install [.NET 9+ SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) ### 2. Create a project and add BytecodeAlliance.Componentize.DotNet.Wasm.SDK package @@ -43,21 +43,21 @@ Create a `nuget.config` file and add the `dotnet-experimental` package source fo Add the `componentize-dotnet` package: -* `dotnet add package BytecodeAlliance.Componentize.DotNet.Wasm.SDK --prerelease` +`dotnet add package BytecodeAlliance.Componentize.DotNet.Wasm.SDK --prerelease` -### 3. Configure the compilation output +Add the platform specific LLVM package: -Edit the `.csproj` file, adding the following inside the ``: +``` +## On Linux +dotnet add package runtime.linux-x64.microsoft.dotnet.ilcompiler.llvm --version 10.0.0-alpha.1.24573.1 --prerelease -```xml - wasi-wasm - false - true - true - true +## or + +## On Windows +dotnet add package runtime.windows-x64.microsoft.dotnet.ilcompiler.llvm --version 10.0.0-alpha.1.24573.1 --prerelease ``` -Now you can `dotnet build` to produce a `.wasm` file using NativeAOT compilation. +Now you can `dotnet publish` to produce a `.wasm` file using NativeAOT compilation. ### 4. Run the WebAssembly binary diff --git a/samples/calculator/Adder/Adder.csproj b/samples/calculator/Adder/Adder.csproj index f33449c..c3fa6ab 100644 --- a/samples/calculator/Adder/Adder.csproj +++ b/samples/calculator/Adder/Adder.csproj @@ -5,11 +5,10 @@ Library - net8.0 + net9.0 enable enable - true wasi-wasm @@ -18,6 +17,7 @@ + diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj index 4cfa6db..8d3965c 100644 --- a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj +++ b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj @@ -7,12 +7,13 @@ - net8.0 + net9.0 + diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj index 630d40c..24d0618 100644 --- a/samples/calculator/CalculatorHost/CalculatorHost.csproj +++ b/samples/calculator/CalculatorHost/CalculatorHost.csproj @@ -5,17 +5,16 @@ Exe - net8.0 + net9.0 enable enable - true - wasi-wasm true + diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj index 6231713..18f543a 100644 --- a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj +++ b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj @@ -11,7 +11,7 @@ webassembly, .net, wasm https://github.com/bytecodealliance/componentize-dotnet/releases/tag/$(PackageVersion) - net8.0 + net9.0 enable enable true 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..7d246cd 100644 --- a/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props +++ b/src/WasmComponent.Sdk/build/BytecodeAlliance.Componentize.DotNet.Wasm.SDK.props @@ -1,9 +1,14 @@ - true - false false + + wasi-wasm + false + true + true + true + win linux osx @@ -14,6 +19,5 @@ - diff --git a/src/WitBindgen/WitBindgen.csproj b/src/WitBindgen/WitBindgen.csproj index be64f7d..cab1b4a 100644 --- a/src/WitBindgen/WitBindgen.csproj +++ b/src/WitBindgen/WitBindgen.csproj @@ -11,7 +11,7 @@ webassembly, .net, wasm https://github.com/bytecodealliance/componentize-dotnet/releases/tag/$(PackageVersion) - net8.0 + net9.0 enable enable true diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj index a94f4f9..0a9c5b4 100644 --- a/test/E2ETest/PackageTest/PackageTest.csproj +++ b/test/E2ETest/PackageTest/PackageTest.csproj @@ -2,7 +2,7 @@ - net8.0 + net9.0 enable enable @@ -28,6 +28,7 @@ + diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index 806e33b..1ba5f6b 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -4,7 +4,7 @@ Exe - net8.0 + net9.0 enable enable false @@ -18,6 +18,7 @@ + diff --git a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj index 141022c..9879d27 100644 --- a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj +++ b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 enable enable false @@ -16,6 +16,7 @@ + diff --git a/test/E2ETest/testapps/nuget.config b/test/E2ETest/testapps/nuget.config index 40f6b38..36a74bc 100644 --- a/test/E2ETest/testapps/nuget.config +++ b/test/E2ETest/testapps/nuget.config @@ -2,11 +2,15 @@ + + + + diff --git a/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj b/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj index 304f688..b078eb6 100644 --- a/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj +++ b/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj @@ -3,10 +3,13 @@ - net8.0 + net9.0 enable enable + false + false + false true @@ -30,6 +33,7 @@ + diff --git a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj index 0120f43..7649447 100644 --- a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj +++ b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj @@ -5,17 +5,17 @@ Exe - net8.0 + net9.0 enable enable - true wasi-wasm appwithwitfolder + diff --git a/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj b/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj index 89cb397..714467c 100644 --- a/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj +++ b/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj @@ -3,17 +3,17 @@ - net8.0 + net9.0 enable enable - true wasi-wasm ociwit + diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index bb390be..8b4ecd6 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -5,7 +5,7 @@ Exe - net8.0 + net9.0 enable enable @@ -16,6 +16,7 @@ + diff --git a/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj b/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj index ecab52f..537733e 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj @@ -4,7 +4,7 @@ - net8.0 + net9.0 enable enable @@ -16,6 +16,7 @@ + diff --git a/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj b/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj index ed65ed5..199b69a 100644 --- a/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj +++ b/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj b/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj index b07cf6e..72e594e 100644 --- a/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj +++ b/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj @@ -3,13 +3,14 @@ - net8.0 + net9.0 enable enable +