From 5e260b52776906a92d98973c57e1ab4896ed88b0 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 21 Aug 2024 12:25:12 +0200 Subject: [PATCH] re-generate --- .../Net/Http/WasiHttpHandler/WasiHttp.cs | 2 +- ...asi.clocks.v0_2_1.MonotonicClockInterop.cs | 2 +- ...rld.wit.imports.wasi.http.v0_2_1.ITypes.cs | 2 +- ...wasi.http.v0_2_1.OutgoingHandlerInterop.cs | 2 +- ...t.imports.wasi.http.v0_2_1.TypesInterop.cs | 2 +- ...wit.imports.wasi.io.v0_2_1.ErrorInterop.cs | 2 +- ...World.wit.imports.wasi.io.v0_2_1.IError.cs | 2 +- ...pWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs | 2 +- ...rld.wit.imports.wasi.io.v0_2_1.IStreams.cs | 2 +- ....wit.imports.wasi.io.v0_2_1.PollInterop.cs | 2 +- ...t.imports.wasi.io.v0_2_1.StreamsInterop.cs | 2 +- .../generate-wasi-http-bindings.ps1 | 21 +++++++++++++++++++ .../generate-wasi-http-bindings.sh | 12 ++++------- .../System/Net/Http/WasiHttpHandler/world.wit | 3 +++ .../src/System/Threading/Wasi/WasiPoll.cs | 2 +- ...asi.clocks.v0_2_1.MonotonicClockInterop.cs | 2 +- ...lWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs | 2 +- ....wit.imports.wasi.io.v0_2_1.PollInterop.cs | 2 +- .../Wasi/generate-wasi-poll-bindings.ps1 | 21 +++++++++++++++++++ .../Wasi/generate-wasi-poll-bindings.sh | 2 +- .../src/System/Threading/Wasi/world.wit | 4 ++++ 21 files changed, 69 insertions(+), 24 deletions(-) create mode 100644 src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.ps1 create mode 100644 src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/world.wit create mode 100644 src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.ps1 create mode 100644 src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/world.wit diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs index 67ec0a4b7c8dc4..db7224a70342d8 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable using System; diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs index 1de0ee2b24744d..4eef64ee389e5a 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs index ed00640bb855e2..b65506f194c44f 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.OutgoingHandlerInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.OutgoingHandlerInterop.cs index 10aba859a4ba56..77435d5b2c7f28 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.OutgoingHandlerInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.OutgoingHandlerInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.TypesInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.TypesInterop.cs index 121f6cfdd5035e..8a5802302e148e 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.TypesInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.TypesInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.ErrorInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.ErrorInterop.cs index 2c3246555fcc2f..a395aa89033fb0 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.ErrorInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.ErrorInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IError.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IError.cs index 3621e1c1fd3728..be423962894b5b 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IError.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IError.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs index 0c4559fe841dde..b9116711bf03d0 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IStreams.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IStreams.cs index ab775cbfeb08aa..737858ba97f5c1 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IStreams.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IStreams.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs index 4c48ffe69e2f90..01157399463dd5 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.StreamsInterop.cs b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.StreamsInterop.cs index 7d479e6b160c4f..1e2ade74bb38cc 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.StreamsInterop.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.StreamsInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.ps1 b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.ps1 new file mode 100644 index 00000000000000..b57834c224208f --- /dev/null +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.ps1 @@ -0,0 +1,21 @@ +# Prerequisites: +# powershell +# tar +# [cargo](https://rustup.rs/) +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference='Stop' +$scriptpath = $MyInvocation.MyCommand.Path +$dir = Split-Path $scriptpath + +Push-Location $dir + + +cargo install --locked --no-default-features --features csharp --version 0.30.0 wit-bindgen-cli +Invoke-WebRequest -Uri https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.1.tar.gz -OutFile v0.2.1.tar.gz +tar xzf v0.2.1.tar.gz +cp world.wit wasi-http-0.2.1/wit/world.wit +wit-bindgen c-sharp -w wasi-http -r native-aot --internal --skip-support-files wasi-http-0.2.1/wit +rm -r wasi-http-0.2.1 +rm v0.2.1.tar.gz + +Pop-Location diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.sh b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.sh index f4bc2b72ef74de..f79fdbc61bd83f 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.sh +++ b/src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-wasi-http-bindings.sh @@ -11,13 +11,9 @@ set -ex # [cargo](https://rustup.rs/) # [curl](https://curl.se/download.html) -cargo install --locked --no-default-features --features csharp --version 0.29.0 wit-bindgen-cli +cargo install --locked --no-default-features --features csharp --version 0.30.0 wit-bindgen-cli curl -OL https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.1.tar.gz tar xzf v0.2.1.tar.gz -cat >wasi-http-0.2.1/wit/world.wit < #nullable enable using System; diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs index 1a0ef026540eb5..b3c646e7e4bb8a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs index 8ad5cabf64b6a3..fd8a827304a91d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs index dc01e875749009..c403ef10d1ff28 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/WasiPollWorld.wit.imports.wasi.io.v0_2_1.PollInterop.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT! // #nullable enable diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.ps1 b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.ps1 new file mode 100644 index 00000000000000..0a7cd7bebb7228 --- /dev/null +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.ps1 @@ -0,0 +1,21 @@ +# Prerequisites: +# powershell +# tar +# [cargo](https://rustup.rs/) +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference='Stop' +$scriptpath = $MyInvocation.MyCommand.Path +$dir = Split-Path $scriptpath + +Push-Location $dir + + +cargo install --locked --no-default-features --features csharp --version 0.30.0 wit-bindgen-cli +Invoke-WebRequest -Uri https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.1.tar.gz -OutFile v0.2.1.tar.gz +tar xzf v0.2.1.tar.gz +cp world.wit wasi-http-0.2.1/wit/world.wit +wit-bindgen c-sharp -w wasi-poll -r native-aot --internal --skip-support-files wasi-http-0.2.1/wit +rm -r wasi-http-0.2.1 +rm v0.2.1.tar.gz + +Pop-Location diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.sh b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.sh index fd20df8e9df20f..f722aeaa668fbf 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.sh +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Wasi/generate-wasi-poll-bindings.sh @@ -11,7 +11,7 @@ set -ex # [cargo](https://rustup.rs/) # [curl](https://curl.se/download.html) -cargo install --locked --no-default-features --features csharp --version 0.29.0 wit-bindgen-cli +cargo install --locked --no-default-features --features csharp --version 0.30.0 wit-bindgen-cli curl -OL https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.1.tar.gz tar xzf v0.2.1.tar.gz cat >wasi-http-0.2.1/wit/world.wit <