fix CI for Windows builds; remove unused file

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

eng/pipelines/common/global-build-job.yml

@@ -225,8 +225,8 @@ jobs:
         displayName: Install wasi-sdk
       - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-wasmtime.cmd $(Build.SourcesDirectory)\wasm-tools
         displayName: Install wasmtime
-      - script: npm install -g @bytecodealliance/jco
-        displayName: Install jco
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-jco.ps1 $(Build.SourcesDirectory)
+        displayName: Install Jco
 
     - ${{ if or(eq(parameters.platform, 'browser_wasm_win'), and(eq(parameters.platform, 'wasi_wasm_win'), not(eq(parameters.runtimeFlavor, 'coreclr')))) }}:
       # Update machine certs

eng/pipelines/runtimelab/install-jco.ps1

@@ -0,0 +1,12 @@
+$RootPath = $Args[0]
+
+$NpmExePath = $Env:NPM_EXECUTABLE
+
+Set-Location -Path $RootPath
+
+$NpmCommand = "$NpmExePath install @bytecodealliance/jco"
+Invoke-Expression $NpmCommand
+
+$NpmCommand = "$NpmExePath install @bytecodealliance/preview2-shim"
+Invoke-Expression $NpmCommand
+

eng/pipelines/runtimelab/install-nodejs.ps1

@@ -51,11 +51,13 @@ if ($IsWindows)
 {
     Expand-Archive -LiteralPath "$InstallPath\$NodeJSZipName" -DestinationPath $InstallPath -Force
     $NodeJSExePath = "$InstallPath\$NodeJSInstallName\node.exe"
+    $NpmExePath = "$InstallPath\$NodeJSInstallName\npm.cmd"
 }
 else
 {
     tar xJf $InstallPath/$NodeJSZipName -C $InstallPath
     $NodeJSExePath = "$InstallPath/$NodeJSInstallName/bin/node"
+    $NpmExePath = "$InstallPath/$NodeJSInstallName/bin/npm"
 }
 
 if (!(Test-Path $NodeJSExePath))
@@ -64,5 +66,14 @@ if (!(Test-Path $NodeJSExePath))
     exit 1
 }
 
+if (!(Test-Path $NpmExePath))
+{
+    Write-Error "Did not find NPM at: '$NpmExePath'"
+    exit 1
+}
+
 Write-Host Setting NODEJS_EXECUTABLE to $NodeJSExePath
 Write-Host "##vso[task.setvariable variable=NODEJS_EXECUTABLE]$NodeJSExePath"
+
+Write-Host Setting NPM_EXECUTABLE to $NpmExePath
+Write-Host "##vso[task.setvariable variable=NPM_EXECUTABLE]$NpmExePath"

src/tests/Directory.Build.props

@@ -179,7 +179,7 @@
   <!-- Set Test Wrapper running host OS -->
   <PropertyGroup>
     <TestWrapperTargetsWindows>false</TestWrapperTargetsWindows>
-    <TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64' )">true</TestWrapperTargetsWindows>
+    <TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64' ) OR ($(WindowsHost) And '$(TargetArchitecture)' == 'wasm')">true</TestWrapperTargetsWindows>
     <TestScriptExtension Condition="'$(TestWrapperTargetsWindows)' != 'true' ">sh</TestScriptExtension>
     <TestScriptExtension Condition="'$(TestWrapperTargetsWindows)' == 'true' ">cmd</TestScriptExtension>
   </PropertyGroup>

src/tests/nativeaot/SmokeTests/SharedLibrary/LibraryWorld_wasm_import_linkage_attribute.cs

@@ -17,3 +17,4 @@ cargo install --locked --no-default-features --features csharp-naot \
       --git https://github.com/bytecodealliance/wit-bindgen --rev 266d638f7a9c4535ba5fa1f1bb2e8cc6b5d58667 \
       wit-bindgen-cli
 wit-bindgen c-sharp -w library -r native-aot wit
+rm -r LibraryWorld_wasm_import_linkage_attribute.cs