diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36e7ce7..fd60f5b 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: [ '9.x'] + dotnet: [ '10.x'] os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 @@ -51,5 +51,5 @@ jobs: name: nuget-packages path: artifacts/*.nupkg if-no-files-found: error - if: ${{ matrix.dotnet == '9.x' && matrix.os == 'windows-latest' }} + if: ${{ matrix.dotnet == '10.x' && matrix.os == 'windows-latest' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6600ab4..4b6e8a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Download artifacts uses: actions/download-artifact@v4 with: diff --git a/Directory.Build.props b/Directory.Build.props index cbf41b3..7b9cd8b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,9 +9,9 @@ $(NoWarn);NU1507 - 1.227.0 + 1.227.1 v0.6.1 - 0.40.0 + 0.41.0 0.10.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index f65dc57..8e653e8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,8 +4,8 @@ - - + + diff --git a/README.md b/README.md index 03628c8..52ff48d 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 9+ SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) +If you don't already have it, install [.NET 10+ preview SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) ### 2. Install template and build @@ -39,7 +39,7 @@ dotnet build MyApp If you have a recent version of [wasmtime](https://github.com/bytecodealliance/wasmtime/releases) on your path, you can now run ```bash -wasmtime ./MyApp/bin/Debug/net9.0/wasi-wasm/publish/MyApp.wasm +wasmtime ./MyApp/bin/Debug/net10.0/wasi-wasm/publish/MyApp.wasm Hello world from compontize-dotnet! ``` @@ -200,7 +200,7 @@ By default the project will find all wit files and execute wit-bindgen against e ### Configuring location of generaged wit files -By default the wit files are generated under the itermediate path `$(IntermediateOutputPath)wit_bindgen` which is by default at a location like `\obj\Debug\net9.0\wit_bindgen`. This means you can't really see the files and they will be ignored and not checked in to source by default (assuming you have a standard .net `.gitignore`) but intillisense will work. +By default the wit files are generated under the itermediate path `$(IntermediateOutputPath)wit_bindgen` which is by default at a location like `\obj\Debug\net10.0\wit_bindgen`. This means you can't really see the files and they will be ignored and not checked in to source by default (assuming you have a standard .net `.gitignore`) but intillisense will work. If you would like to have the files in a more discoverable place and potentially check the source files in you can configure the output location with a folder name and location of your choice, for example the following will create a folder `genererated/wit/` at the root of your project and put all the files in there. diff --git a/samples/calculator/Adder/Adder.csproj b/samples/calculator/Adder/Adder.csproj index c3fa6ab..3909d08 100644 --- a/samples/calculator/Adder/Adder.csproj +++ b/samples/calculator/Adder/Adder.csproj @@ -5,7 +5,7 @@ Library - net9.0 + net10.0 enable enable diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj index 0603bf6..786cffc 100644 --- a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj +++ b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj @@ -7,7 +7,7 @@ - net9.0 + net10.0 diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj index 24d0618..ab2c1a8 100644 --- a/samples/calculator/CalculatorHost/CalculatorHost.csproj +++ b/samples/calculator/CalculatorHost/CalculatorHost.csproj @@ -5,7 +5,7 @@ Exe - net9.0 + net10.0 enable enable diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj index 37e9804..a3d1c57 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) - net9.0 + net10.0 enable enable true diff --git a/src/WitBindgen/WitBindgen.csproj b/src/WitBindgen/WitBindgen.csproj index 3ec3863..e1dba4f 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) - net9.0 + net10.0 enable enable true diff --git a/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj b/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj index 72ad77f..fc4c3c0 100644 --- a/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj +++ b/templates/BytecodeAlliance.Componentize.DotNet.Templates.csproj @@ -16,7 +16,7 @@ Template - net9.0 + net10.0 true false content diff --git a/templates/content/wasi-cli/wasi-cli.csproj b/templates/content/wasi-cli/wasi-cli.csproj index 3e851ff..77fabe3 100644 --- a/templates/content/wasi-cli/wasi-cli.csproj +++ b/templates/content/wasi-cli/wasi-cli.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 wasi_cli enable enable @@ -15,7 +15,7 @@ - - + + diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj index 0a9c5b4..4e5e093 100644 --- a/test/E2ETest/PackageTest/PackageTest.csproj +++ b/test/E2ETest/PackageTest/PackageTest.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index 2d3dbb3..8582dd3 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -4,7 +4,7 @@ Exe - net9.0 + net10.0 enable enable false diff --git a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj index c011da0..02ac3d8 100644 --- a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj +++ b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable false diff --git a/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj b/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj index b078eb6..acd75a5 100644 --- a/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj +++ b/test/WasmComponentSdkTest/WasmComponentSdkTest/WasmComponentSdkTest.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj index 7649447..938cdcb 100644 --- a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj +++ b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/AppWithWitFolder.csproj @@ -5,7 +5,7 @@ Exe - net9.0 + net10.0 enable enable diff --git a/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj b/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj index cebaace..1e315b6 100644 --- a/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj +++ b/test/WasmComponentSdkTest/testapps/OciWit/OciWit.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index af3e961..de0792a 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -5,7 +5,7 @@ Exe - net9.0 + net10.0 enable enable diff --git a/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj b/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj index 537733e..89ba5c6 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleProducer/SimpleProducer.csproj @@ -4,7 +4,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj b/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj index 663f47d..ca17c22 100644 --- a/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj +++ b/test/WitBindgenTest/WitBindgenTest/WitBindgenTest.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj b/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj index 72e594e..1341151 100644 --- a/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj +++ b/test/WitBindgenTest/testapps/LibraryUsingWit/LibraryUsingWit.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/LibraryWithCustomGeneratedFilesLocation.csproj b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/LibraryWithCustomGeneratedFilesLocation.csproj index 083589d..31cb00a 100644 --- a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/LibraryWithCustomGeneratedFilesLocation.csproj +++ b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/LibraryWithCustomGeneratedFilesLocation.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable generated/wit diff --git a/test/WitBindgenTest/testapps/LibraryWithExceptions/LibraryWitExceptions.csproj b/test/WitBindgenTest/testapps/LibraryWithExceptions/LibraryWitExceptions.csproj index 2068f3c..2c35d8f 100644 --- a/test/WitBindgenTest/testapps/LibraryWithExceptions/LibraryWitExceptions.csproj +++ b/test/WitBindgenTest/testapps/LibraryWithExceptions/LibraryWitExceptions.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable diff --git a/test/WitBindgenTest/testapps/LibraryWithWitResultType/LibraryWithWitResultType.csproj b/test/WitBindgenTest/testapps/LibraryWithWitResultType/LibraryWithWitResultType.csproj index ce7a703..9d2aab3 100644 --- a/test/WitBindgenTest/testapps/LibraryWithWitResultType/LibraryWithWitResultType.csproj +++ b/test/WitBindgenTest/testapps/LibraryWithWitResultType/LibraryWithWitResultType.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable enable --with-wit-results