Added wasi-sdk flow

.devcontainer/devcontainer.json

@@ -11,6 +11,7 @@
 	},
 	"remoteEnv": {
 		"EMSDK_PATH": "${containerWorkspaceFolder}/artifacts/emsdk",
+		"WASI_SDK_PATH": "${containerWorkspaceFolder}/artifacts/wasi-sdk",
 	},
 
 	// Use 'postCreateCommand' to run commands after the container is created.

.devcontainer/postCreateCommand.sh

@@ -1,8 +1,16 @@
+if [[ "$__TargetOS" == Browser ]]; then
 EMSDK_PATH=$PWD/artifacts/emsdk
 rm -rf $EMSDK_PATH
 git clone https://github.com/emscripten-core/emsdk.git $EMSDK_PATH
 EMSCRIPTEN_VERSION="`cat ./.devcontainer/emscripten-version.txt 2>&1`"
 cd $EMSDK_PATH && ./emsdk install $EMSCRIPTEN_VERSION
 cd $EMSDK_PATH && ./emsdk activate $EMSCRIPTEN_VERSION
 # ready to build, e.g.:
-# ./build.sh /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:IcuTracing=true
+# ./build.sh /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:IcuTracing=true
+elif [[ "$__TargetOS" == Wasi ]]; then
+WASI_SDK_PATH=$PWD/artifacts/wasi-sdk
+rm -rf $WASI_SDK_PATH
+git clone https://github.com/WebAssembly/wasi-sdk.git $WASI_SDK_PATH
+# ready to build, e.g.:
+# ./build.sh /p:TargetOS=Wasi /p:TargetArchitecture=wasm /p:IcuTracing=true
+fi

.devcontainer/wasi-sdk-version.txt

@@ -0,0 +1 @@
+16

eng/azure-pipelines.yml

@@ -77,6 +77,51 @@ stages:
             artifactName: Artifacts_Browser_Threading
             condition: and(succeeded(), ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
 
+      ############ WASI BUILD ############
+      - job: Build_Wasi
+        displayName: Wasi
+        timeoutInMinutes: 360
+        pool:
+          ${{ if eq(variables['System.TeamProject'], 'public') }}:
+            vmImage: ubuntu-20.04
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+        container:
+          image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
+        steps:
+        - bash: |
+            ./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Wasi /p:TargetArchitecture=wasm $(_InternalBuildArgs)
+          displayName: Build
+        - task: PublishPipelineArtifact@1
+          displayName: Upload artifacts
+          inputs:
+            targetPath: 'artifacts/bin'
+            artifactName: Artifacts_Wasi
+            condition: and(succeeded(), ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+      - job: Build_Wasi_Threading
+        displayName: Wasi_Threading
+        timeoutInMinutes: 360
+        pool:
+          ${{ if eq(variables['System.TeamProject'], 'public') }}:
+            vmImage: ubuntu-20.04
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+        container:
+          image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
+        steps:
+        - bash: |
+            ./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Wasi /p:TargetArchitecture=wasm /p:WasmEnableThreads=true $(_InternalBuildArgs)
+          displayName: Build
+        - task: PublishPipelineArtifact@1
+          displayName: Upload artifacts
+          inputs:
+            targetPath: 'artifacts/bin'
+            artifactName: Artifacts_Wasi_Threading
+            condition: and(succeeded(), ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))      
+
       ############ iOS BUILD ############
       - job: Build_iOS
         displayName: iOS
@@ -168,6 +213,8 @@ stages:
         dependsOn:
           - Build_Browser
           - Build_Browser_Threading
+          - Build_Wasi
+          - Build_Wasi_Threading
           - Build_iOS
           - Build_MacCatalyst
           - Build_tvOS
@@ -188,6 +235,14 @@ stages:
           inputs:
             artifact: Artifacts_Browser_Threading
             path: 'artifacts/bin/browser-threading'
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifact: Artifacts_Wasi
+            path: 'artifacts/bin'
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifact: Artifacts_Wasi_Threading
+            path: 'artifacts/bin/wasi-threading'
         - task: DownloadPipelineArtifact@2
           inputs:
             artifact: Artifacts_iOS

eng/icu.mk

@@ -91,8 +91,8 @@ data-$(2): $(TARGET_OBJDIR)/$(1)/.stamp-configure | $(TARGET_OBJDIR)/$(1) $(TARG
 
 endef
 
-ifeq ($(TARGET_OS),browser)
-$(eval $(call TargetBuildTemplate,icudt_browser,icudt))
+ifeq ($(TARGET_ARCHITECTURE),wasm)
+$(eval $(call TargetBuildTemplate,icudt_wasm,icudt))
 else
 $(eval $(call TargetBuildTemplate,icudt_mobile,icudt))
 endif

eng/icu.proj

@@ -1,5 +1,5 @@
 <Project>
-  <Target Name="Build" Condition="'$(PackOnly)' != 'true'" DependsOnTargets="PatchEmscripten;CopyEmscriptenVersion">
+  <Target Name="Build" Condition="'$(PackOnly)' != 'true'" DependsOnTargets="PatchEmscripten;CopyEmscriptenVersion;PatchWasiSdk">
     <Error Condition="'$(TargetOS)' == ''" Text="TargetOS needs to be specified!" />
     <Error Condition="'$(TargetArchitecture)' == ''" Text="TargetArchitecture needs to be specified!" />
 
@@ -37,4 +37,28 @@
             Lines="@(_ItemsFromEmscriptenVersionFile->Replace('&quot;', ''))"
             Overwrite="true" />
   </Target>
+  <Target Name="PatchWasiSdk" Condition="'$(TargetOS)' == 'Wasi'">
+    <ReadLinesFromFile File="../.devcontainer/wasi-sdk-version.txt">
+    <Output TaskParameter="Lines" ItemName="_VersionLines" />
+    </ReadLinesFromFile>
+
+    <PropertyGroup>
+      <WASI_SDK_PATH>$(RepoRoot)\artifacts</WASI_SDK_PATH>
+      <WasiLocalPath>$(RepoRoot)\artifacts</WasiLocalPath>
+      <WasiSdkVersion>%(_VersionLines.Identity)</WasiSdkVersion>
+      <WasiSdkUrl>https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion)/wasi-sdk-$(WasiSdkVersion).0-linux.tar.gz</WasiSdkUrl>
+      <WasiSdkUrl Condition="'$(HostOS)' == 'osx'" >https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion)/wasi-sdk-$(WasiSdkVersion).0-macos.tar.gz</WasiSdkUrl>
+      <WasiSdkUrl Condition="'$(HostOS)' == 'windows'" >https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion)/wasi-sdk-$(WasiSdkVersion).0-mingw.tar.gz</WasiSdkUrl>
+    </PropertyGroup>
+
+    <Exec Command="rm -rf wasi-sdk-*/ wasi-sdk/ &amp;&amp; curl -L -o- $(WasiSdkUrl) | tar -xvz &amp;&amp; mv wasi-sdk-$(WasiSdkVersion).*/ wasi-sdk/"
+          Condition="'$(HostOS)' != 'windows'"
+          WorkingDirectory="$(WasiLocalPath)"
+          IgnoreStandardErrorWarningFormat="true" />
+
+    <Exec Command="powershell -NonInteractive -command &quot;&amp; .\provision.ps1 -WasiSdkUrl $(WasiSdkUrl) -WasiSdkVersion $(WasiSdkVersion) ; Exit $LastExitCode &quot;"
+          Condition="'$(HostOS)' == 'windows'"
+          WorkingDirectory="$(WasiLocalPath)"
+          IgnoreStandardErrorWarningFormat="true" />  
+  </Target>
 </Project>

eng/icu.wasi.mk

@@ -0,0 +1,10 @@
+ifeq ($(WASM_ENABLE_THREADS),true)
+	THREADS_FLAG="-pthread"
+endif
+
+CONFIGURE_COMPILER_FLAGS += \
+	CFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(THREADS_FLAG) $(ICU_DEFINES)" \
+	CXXFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(THREADS_FLAG) $(ICU_DEFINES)"
+
+check-env:
+  :