Bump emscripten version to 2.0.1 (#41509)

Updates the emscripten Docker container we use to build in CI. We no longer need to explicitly set `EMSDK_PATH` since the container already does it.
Also remove `--embedded` flag from `./emsdk activate` since it was deprecated and is now the default.

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index ff89dc1..cfec860 100644 (file)
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -157,7 +157,7 @@ jobs:
       archType: wasm
       platform: Browser_wasm
       container:
-        image: ubuntu-18.04-webassembly-20200529220811-6a6da63
+        image: ubuntu-18.04-webassembly-20200827125937-9740252
         registry: mcr
       jobParameters:
         runtimeFlavor: ${{ parameters.runtimeFlavor }}

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index 4854b68..6a70952 100644 (file)
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -62,8 +62,6 @@ jobs:
         - _subset: libs
         - _additionalBuildArguments: ''
         - ${{ parameters.variables }}
-        - ${{ if eq(parameters.osGroup, 'Browser') }}:
-          - EMSDK_PATH: /usr/local/emscripten
 
         # Tests only run for 'allConfiguration' and 'net48' build-jobs
         # If platform is in testBuildPlatforms we build tests as well.

diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index 901bab9..e46ca5e 100644 (file)
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -68,8 +68,6 @@ jobs:
       - name: osOverride
         value: -os Android
     - ${{ if eq(parameters.osGroup, 'Browser') }}:
-      - name: EMSDK_PATH
-        value: /usr/local/emscripten
       - name: archType
         value: wasm
       - name: osOverride

diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
index 16ea3dc..c55c9cc 100644 (file)
--- a/src/mono/wasm/Makefile
+++ b/src/mono/wasm/Makefile
@@ -34,7 +34,7 @@ EMCC=source $(EMSDK_PATH)/emsdk_env.sh && emcc
        git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_LOCAL_PATH)
        cd $(EMSDK_LOCAL_PATH) && git checkout $(EMSCRIPTEN_VERSION)
        cd $(EMSDK_LOCAL_PATH) && ./emsdk install $(EMSCRIPTEN_VERSION)
-       cd $(EMSDK_LOCAL_PATH) && ./emsdk activate --embedded $(EMSCRIPTEN_VERSION)
+       cd $(EMSDK_LOCAL_PATH) && ./emsdk activate $(EMSCRIPTEN_VERSION)
        touch $@
 
 ifeq ($(EMSDK_PATH),emsdk)