Skip to content

[wasm] Bump ICU transport for Emsdk 5.0.6 / LLVM 23 #764

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

Draft
pavelsavara wants to merge 1 commit into
base: dotnet/main
Choose a base branch
from
Draft

[wasm] Bump ICU transport for Emsdk 5.0.6 / LLVM 23 #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</solution>
<packageSources>
<clear />
<add key="local-emsdk" value="/home/pavelsavara/dev/emsdk/artifacts/packages/Release/Shipping" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- emsdk -->
<MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>11.0.0-preview.5.26230.101</MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>
<MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>11.0.0-preview.5.26230.101</MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>
<MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>11.0.0-preview.5.26230.101</MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>
<MicrosoftNETRuntimeEmscripten506Nodelinuxx64Version>11.0.0-preview.4.26253.2</MicrosoftNETRuntimeEmscripten506Nodelinuxx64Version>
<MicrosoftNETRuntimeEmscripten506Sdklinuxx64Version>11.0.0-preview.4.26253.2</MicrosoftNETRuntimeEmscripten506Sdklinuxx64Version>
<MicrosoftNETRuntimeEmscripten506Cachelinuxx64Version>11.0.0-preview.4.26253.2</MicrosoftNETRuntimeEmscripten506Cachelinuxx64Version>
<!-- arcade -->
<MicrosoftDotNetBuildTasksPackagingVersion>11.0.0-beta.26230.101</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
Expand Down
19 changes: 7 additions & 12 deletions eng/icu.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version)" />
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version)" />
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version)" />
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.5.0.6.Cache.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten506Cachelinuxx64Version)" />
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.5.0.6.Node.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten506Nodelinuxx64Version)" />
<PackageReference Include="Microsoft.NET.Runtime.Emscripten.5.0.6.Sdk.linux-x64" Version="$(MicrosoftNETRuntimeEmscripten506Sdklinuxx64Version)" />
</ItemGroup>

<Target Name="CopyEmsdkToTree" BeforeTargets="ReallyBuild" Condition="'$(TargetOS)' == 'Browser'">
Expand All @@ -12,10 +12,13 @@
<Copy SourceFiles="@(EmsdkFiles)" DestinationFolder="$(MonoEmsdkDir)\%(RecursiveDir)">
<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
</Copy>
<!-- Overwrite Node's old libc++ in bin/ with LLVM 23's version from lib/ so clang-23 finds the correct one via $ORIGIN -->
<Copy SourceFiles="$(MonoEmsdkDir)lib/libc++.so.1" DestinationFolder="$(MonoEmsdkDir)bin/" OverwriteReadOnlyFiles="true" />
<Copy SourceFiles="$(MonoEmsdkDir)lib/libc++abi.so.1" DestinationFolder="$(MonoEmsdkDir)bin/" OverwriteReadOnlyFiles="true" />
</Target>


<Target Name="ReallyBuild" BeforeTargets="Build" Condition="'$(PackOnly)' != 'true'" DependsOnTargets="PatchEmscripten;CopyEmscriptenVersion;DownloadWasiSdk">
<Target Name="ReallyBuild" BeforeTargets="Build" Condition="'$(PackOnly)' != 'true'" DependsOnTargets="CopyEmscriptenVersion;DownloadWasiSdk">
<Error Condition="'$(TargetOS)' == ''" Text="TargetOS needs to be specified!" />
<Error Condition="'$(TargetArchitecture)' == ''" Text="TargetArchitecture needs to be specified!" />

Expand Down Expand Up @@ -46,14 +49,6 @@
<MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NETCore.Runtime.ICU.Transport.pkgproj" Targets="Build" />
</Target>

<!--
The version of emscripten we are on, emcmake does not pass 'experimental-wasm-threads' to node. In order for the build to
succeed, we need to provide a patched version of that file. Ideally, fixing upstream would be best, but until then, patch.
-->
<Target Name="PatchEmscripten" Condition="'$(TargetOS)' == 'Browser' and '$(WasmEnableThreads)' == 'true'">
<Copy SourceFiles="$(MSBuildThisFileDirectory)patches\emcc.py"
DestinationFolder="$(MonoEmsdkDir)\emscripten" />
</Target>
<Target Name="CopyEmscriptenVersion" Condition="'$(TargetOS)' == 'Browser'">
<ReadLinesFromFile File="$(MonoEmsdkDir)\emscripten\emscripten-version.txt" >
<Output TaskParameter="Lines"
Expand Down
Loading
Loading