Skip to content

Commit f364bf2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0] Update dependencies from dotnet/emscripten, dotnet/node (#1501)
[release/9.0] Update dependencies from dotnet/emscripten, dotnet/node
1 parent ccf8c2e commit f364bf2

File tree

4 files changed

+37
-123
lines changed

4 files changed

+37
-123
lines changed

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,37 +49,37 @@
4949
<Uri>https://github.com/dotnet/cpython</Uri>
5050
<Sha>bbdcd1d66c245d46433da4869ef0b09d87fd3775</Sha>
5151
</Dependency>
52-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
52+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
5353
<Uri>https://github.com/dotnet/node</Uri>
54-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
54+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
5555
</Dependency>
56-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
56+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
5757
<Uri>https://github.com/dotnet/node</Uri>
58-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
58+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
5959
</Dependency>
60-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
60+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
6161
<Uri>https://github.com/dotnet/node</Uri>
62-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
62+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
6363
</Dependency>
64-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
64+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
6565
<Uri>https://github.com/dotnet/node</Uri>
66-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
66+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
6767
</Dependency>
68-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
68+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
6969
<Uri>https://github.com/dotnet/node</Uri>
70-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
70+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
7171
</Dependency>
72-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
72+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
7373
<Uri>https://github.com/dotnet/node</Uri>
74-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
74+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
7575
</Dependency>
76-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
76+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
7777
<Uri>https://github.com/dotnet/node</Uri>
78-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
78+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
7979
</Dependency>
80-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
80+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
8181
<Uri>https://github.com/dotnet/node</Uri>
82-
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
82+
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
8383
</Dependency>
8484
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport" Version="19.1.0-alpha.1.25565.2">
8585
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -145,9 +145,9 @@
145145
<Uri>https://github.com/dotnet/llvm-project</Uri>
146146
<Sha>55fbf5793d3f255f5525ae7cb57736ab71270a52</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport" Version="9.0.0-alpha.1.25563.2">
148+
<Dependency Name="Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport" Version="9.0.0-alpha.1.25574.3">
149149
<Uri>https://github.com/dotnet/emscripten</Uri>
150-
<Sha>e4b9356443189c19a5e4ebeef58652f9c436402f</Sha>
150+
<Sha>f5b445017e80145a9baf893401083b1367455bc6</Sha>
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
2929
<runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
3030
<runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
31-
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
32-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
33-
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
34-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
35-
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
36-
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
37-
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
38-
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
31+
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
32+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
33+
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
34+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
35+
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
36+
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
37+
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
38+
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
3939
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
4040
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
4141
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
@@ -44,7 +44,7 @@
4444
<runtimeosxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimeosxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
4545
<runtimewinarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
4646
<runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
47-
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>9.0.0-alpha.1.25563.2</MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>
47+
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>9.0.0-alpha.1.25574.3</MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>

‎eng/emsdk.proj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,6 @@
174174
<Message Importance="High" Text="Found LLVM directory: $(LLVMDir)" />
175175
<Message Importance="High" Text="Found emscripten directory: $(EmscriptenDir)" />
176176

177-
<Message Importance="High" Text="Pruning node modules in: $(EmscriptenDir)" />
178-
<PropertyGroup>
179-
<NpmPath>$(NodeDir)/bin:$(PATH)</NpmPath>
180-
<NpmPath Condition="$([MSBuild]::IsOSPlatform(Windows))">$(NodeDir)\bin%3B$(PATH.Replace(';', '%3B'))</NpmPath>
181-
</PropertyGroup>
182-
<ItemGroup>
183-
<NpmEnvironmentVariables Include="PATH=$(NpmPath)" />
184-
</ItemGroup>
185-
186177
<!-- Fix npm symlinks, which are caused by NuGet not supporting them -->
187178
<Exec WorkingDirectory="$(HostNodeDir)\bin"
188179
Command="ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm"
@@ -201,8 +192,16 @@
201192
Condition="'$(PackageHostOS)' != 'win'"
202193
IgnoreStandardErrorWarningFormat="true" />
203194

204-
<Exec WorkingDirectory="$(RepoRoot)"
205-
Command="$(PythonPath) eng/sanitize.py $(EmscriptenDir) $([System.IO.Directory]::GetParent($(HostNodeDir)))" />
195+
<Message Importance="High" Text="Installing node modules in: $(EmscriptenDir)" />
196+
<PropertyGroup>
197+
<NpmPath>$(HostNodeDir)/bin:$(PATH)</NpmPath>
198+
<NpmPath Condition="$([MSBuild]::IsOSPlatform(Windows))">$(HostNodeDir)\bin%3B$(PATH.Replace(';', '%3B'))</NpmPath>
199+
</PropertyGroup>
200+
<Exec WorkingDirectory="$(EmscriptenDir)"
201+
Command="$(HostNodeDir)\bin\$(NpmFileName) ci"
202+
IgnoreStandardErrorWarningFormat="true"
203+
EnvironmentVariables="PATH=$(NpmPath);npm_config_userconfig=$(RepoRoot)\.npmrc" />
204+
206205
<!-- clang-wrapper.sh hardcodes clang-19 at the moment so make sure it still exists -->
207206
<Error Text="Update clang-wrapper.sh to point at the correct clang-* version"
208207
Condition="!Exists('$(LLVMDir)\bin\clang-19') and !$([MSBuild]::IsOSPlatform(Windows))" />

‎eng/sanitize.py‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)