Skip to content

[wasi] compile with libs.native #79046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelsavara merged 56 commits into from
Jan 7, 2023
Merged

[wasi] compile with libs.native #79046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
bbd925f
wip
pavelsavara Nov 30, 2022
fa5081a
wip
pavelsavara Nov 30, 2022
31964c3
wip
pavelsavara Nov 30, 2022
d261d1b
wip
pavelsavara Nov 30, 2022
2782819
wip
pavelsavara Nov 30, 2022
867e8d8
wip
pavelsavara Nov 30, 2022
87de23e
wip
pavelsavara Nov 30, 2022
2ae0339
fix
pavelsavara Nov 30, 2022
269d7a2
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 1, 2022
2efd28f
provision SDK to WASI_SDK_PATH
pavelsavara Dec 1, 2022
6bffc9d
fix
pavelsavara Dec 1, 2022
83a54e3
wip
pavelsavara Dec 1, 2022
8de88e1
wip
pavelsavara Dec 1, 2022
9382309
Merge branch 'wasi_native_prep' of https://github.com/pavelsavara/run…
pavelsavara Dec 1, 2022
dd71877
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 5, 2022
9b36c3b
fix after merge
pavelsavara Dec 5, 2022
e67bb29
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 5, 2022
2a3d7ea
wip
pavelsavara Dec 5, 2022
f213ab6
feedback
pavelsavara Dec 5, 2022
97687bc
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 6, 2022
61f1276
add wasi_wasm container
pavelsavara Dec 6, 2022
288199b
feedback
pavelsavara Dec 6, 2022
db57540
wip
pavelsavara Dec 6, 2022
0434363
fix
pavelsavara Dec 6, 2022
8a3c728
container
pavelsavara Dec 6, 2022
d494bec
fix
pavelsavara Dec 7, 2022
461eeda
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 7, 2022
b4f9759
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 8, 2022
d039ca6
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 12, 2022
f80e897
wasm-library-tests: re-enable tests
radical Dec 12, 2022
596689a
Add back wasm linker-tests job
radical Dec 12, 2022
033164b
getrusage isn't available
radical Dec 12, 2022
86a1024
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 12, 2022
4947cf8
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 14, 2022
a9fd1ad
fix
pavelsavara Dec 14, 2022
39e58f2
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 16, 2022
bd8fb9e
Update eng/pipelines/common/templates/pipeline-with-resources.yml
pavelsavara Dec 19, 2022
9bb5faf
Update src/libraries/System.Private.CoreLib/src/System/Runtime/Intero…
pavelsavara Dec 19, 2022
d4ba0b2
Update src/libraries/System.Private.CoreLib/src/System/Threading/Over…
pavelsavara Dec 19, 2022
829ae38
Update src/mono/Directory.Build.props
pavelsavara Dec 19, 2022
d640c98
Update Directory.Build.props
pavelsavara Dec 19, 2022
1dc21c6
Update src/mono/cmake/configure.cmake
pavelsavara Dec 19, 2022
0d79ba5
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 20, 2022
17f9043
feedback
pavelsavara Dec 20, 2022
92f9bc8
wip
pavelsavara Dec 20, 2022
9d26f1d
wip
pavelsavara Dec 20, 2022
8026107
feedback
pavelsavara Dec 20, 2022
609c42e
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 21, 2022
99065d9
feedback
pavelsavara Dec 21, 2022
2700e30
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 26, 2022
f53ba77
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 2, 2023
b172a04
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 3, 2023
edfe354
feedback
pavelsavara Jan 3, 2023
f7f8cb9
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 6, 2023
3a273db
fix merge
pavelsavara Jan 6, 2023
c1b834d
fix
pavelsavara Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into wasi_native_prep 
# Conflicts:
#	src/libraries/System.Console/src/System.Console.csproj
#	src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
#	src/libraries/System.Net.Http/src/System.Net.Http.csproj
#	src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
  • Loading branch information
@pavelsavara
pavelsavara committed Jan 3, 2023
commit b172a048ba9e73afdbb1f5cddda46a797e8ef55d
4 changes: 2 additions & 2 deletions src/libraries/System.Console/src/System.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down Expand Up @@ -50,7 +50,7 @@
</Compile>
</ItemGroup>
<!-- Browser -->
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Browser'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser'">
<Compile Include="System\ConsolePal.WebAssembly.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Dup.cs"
Link="Common\Interop\Unix\Interop.Dup.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down Expand Up @@ -50,7 +50,7 @@
Link="Common\Interop\Windows\Interop.Libraries.cs" />
</ItemGroup>
<!-- Unix specific files -->
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Unix' or '$(TargetPlatformIdentifier)' == 'Browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix' or '$(TargetPlatformIdentifier)' == 'browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<Compile Include="System\IO\Compression\ZipArchiveEntry.Unix.cs" />
<Compile Include="$(CommonPath)System\IO\Compression\ZipArchiveEntryConstants.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs"
Expand Down
20 changes: 10 additions & 10 deletions src/libraries/System.Net.Http/src/System.Net.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-linux;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-freebsd;$(NetCoreAppCurrent)-maccatalyst;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-solaris;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
Expand All @@ -9,22 +9,22 @@
<PropertyGroup>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.PlatformNotSupported_NetHttp</GeneratePlatformNotSupportedAssemblyMessage>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'OSX' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'tvOS' or '$(TargetPlatformIdentifier)' == 'MacCatalyst'">$(DefineConstants);SYSNETHTTP_NO_OPENSSL</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'Android' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'MacCatalyst' or '$(TargetPlatformIdentifier)' == 'tvOS'">$(DefineConstants);TARGET_MOBILE</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'Android'">$(DefineConstants);TARGET_ANDROID</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'iOS'">$(DefineConstants);TARGET_IOS</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'">$(DefineConstants);TARGET_MACCATALYST</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'tvOS'">$(DefineConstants);TARGET_TVOS</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'Browser'">$(DefineConstants);TARGET_BROWSER</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'osx' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'tvos' or '$(TargetPlatformIdentifier)' == 'maccatalyst'">$(DefineConstants);SYSNETHTTP_NO_OPENSSL</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos'">$(DefineConstants);TARGET_MOBILE</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'android'">$(DefineConstants);TARGET_ANDROID</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'ios'">$(DefineConstants);TARGET_IOS</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">$(DefineConstants);TARGET_MACCATALYST</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'tvos'">$(DefineConstants);TARGET_TVOS</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'browser'">$(DefineConstants);TARGET_BROWSER</DefineConstants>
<DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'wasi'">$(DefineConstants);TARGET_WASI</DefineConstants>
<!-- ILLinker settings -->
<ILLinkDirectory>$(MSBuildThisFileDirectory)ILLink\</ILLinkDirectory>
</PropertyGroup>
<ItemGroup>
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Android' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'MacCatalyst' or '$(TargetPlatformIdentifier)' == 'tvOS' or '$(TargetPlatformIdentifier)' == 'Browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.mobile.xml" Condition="'$(TargetPlatformIdentifier)' != 'Browser' and '$(TargetPlatformIdentifier)' != 'wasi'" />
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or '$(TargetPlatformIdentifier)' == 'browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.mobile.xml" Condition="'$(TargetPlatformIdentifier)' != 'browser' and '$(TargetPlatformIdentifier)' != 'wasi'" />
<ILLinkSuppressionsXmls Include="$(ILLinkDirectory)ILLink.Suppressions.Mobile.LibraryBuild.xml" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''">
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ILLinkKeepDepAttributes>false</ILLinkKeepDepAttributes> <!-- See comments in Cookie.cs -->
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
System.Net.Internals namespace. -->
<DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants>
Expand Down Expand Up @@ -113,7 +113,7 @@
<Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs"
Link="Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Unix' or '$(TargetPlatformIdentifier)' == 'Browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix' or '$(TargetPlatformIdentifier)' == 'browser' or '$(TargetPlatformIdentifier)' == 'wasi'">
<Compile Include="System\Net\SocketException.Unix.cs" />
<Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
Link="Common\System\Net\SocketAddressPal.Unix.cs" />
Expand Down Expand Up @@ -144,7 +144,7 @@
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs"
Link="Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Browser' or '$(TargetPlatformIdentifier)' == 'Wasi'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser' or '$(TargetPlatformIdentifier)' == 'Wasi'">
<Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Browser.cs"
Link="Common\System\Net\NetworkInformation\HostInformationPal.Browser.cs" />
<Compile Include="$(CommonPath)System\Net\NetworkInformation\InterfaceInfoPal.Browser.cs"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.