Skip to content

Revert "Bump emscripten to 3.1.12" #227

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
radekdoulik merged 2 commits into from
Jun 20, 2022
Merged

Revert "Bump emscripten to 3.1.12" #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a8864
Revert "Bump emscripten to 3.1.12"
lewing Jun 18, 2022
8286d0b
Merge branch 'dotnet/main' into revert-223-pr-bump-emscripten-3-1-12-…
radekdoulik Jun 20, 2022
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
4 changes: 2 additions & 2 deletions eng/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220317214646-1ad56e8
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Browser /p:TargetArchitecture=wasm $(_InternalBuildArgs)
Expand All @@ -62,7 +62,7 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220317214646-1ad56e8
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:WasmEnableThreads=true $(_InternalBuildArgs)
Expand Down
2 changes: 2 additions & 0 deletions eng/icu.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
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\emcmake.py"
DestinationFolder="$(EMSDK_PATH)\upstream\emscripten" />
<Copy SourceFiles="$(MSBuildThisFileDirectory)patches\emcc.py"
DestinationFolder="$(EMSDK_PATH)\upstream\emscripten" />
</Target>
Expand Down
Loading