Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,37 @@
<Uri>https://github.com/dotnet/cpython</Uri>
<Sha>bbdcd1d66c245d46433da4869ef0b09d87fd3775</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25312.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.25602.7">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7</Sha>
<Sha>47afc4864111d5af2ce03262bc49073140e0821b</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport" Version="19.1.0-alpha.1.25565.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -145,9 +145,9 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>55fbf5793d3f255f5525ae7cb57736ab71270a52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport" Version="9.0.0-alpha.1.25563.2">
<Dependency Name="Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport" Version="9.0.0-alpha.1.25574.3">
<Uri>https://github.com/dotnet/emscripten</Uri>
<Sha>e4b9356443189c19a5e4ebeef58652f9c436402f</Sha>
<Sha>f5b445017e80145a9baf893401083b1367455bc6</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>9.0.0-alpha.1.25563.2</runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25312.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>9.0.0-alpha.1.25602.7</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimelinuxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
Expand All @@ -44,7 +44,7 @@
<runtimeosxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimeosxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>19.1.0-alpha.1.25565.2</runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion>
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>9.0.0-alpha.1.25563.2</MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>9.0.0-alpha.1.25574.3</MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion>
</PropertyGroup>
<PropertyGroup>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
Expand Down
21 changes: 10 additions & 11 deletions eng/emsdk.proj
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,6 @@
<Message Importance="High" Text="Found LLVM directory: $(LLVMDir)" />
<Message Importance="High" Text="Found emscripten directory: $(EmscriptenDir)" />

<Message Importance="High" Text="Pruning node modules in: $(EmscriptenDir)" />
<PropertyGroup>
<NpmPath>$(NodeDir)/bin:$(PATH)</NpmPath>
<NpmPath Condition="$([MSBuild]::IsOSPlatform(Windows))">$(NodeDir)\bin%3B$(PATH.Replace(';', '%3B'))</NpmPath>
</PropertyGroup>
<ItemGroup>
<NpmEnvironmentVariables Include="PATH=$(NpmPath)" />
</ItemGroup>

<!-- Fix npm symlinks, which are caused by NuGet not supporting them -->
<Exec WorkingDirectory="$(HostNodeDir)\bin"
Command="ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm"
Expand All @@ -201,8 +192,16 @@
Condition="'$(PackageHostOS)' != 'win'"
IgnoreStandardErrorWarningFormat="true" />

<Exec WorkingDirectory="$(RepoRoot)"
Command="$(PythonPath) eng/sanitize.py $(EmscriptenDir) $([System.IO.Directory]::GetParent($(HostNodeDir)))" />
<Message Importance="High" Text="Installing node modules in: $(EmscriptenDir)" />
<PropertyGroup>
<NpmPath>$(HostNodeDir)/bin:$(PATH)</NpmPath>
<NpmPath Condition="$([MSBuild]::IsOSPlatform(Windows))">$(HostNodeDir)\bin%3B$(PATH.Replace(';', '%3B'))</NpmPath>
</PropertyGroup>
<Exec WorkingDirectory="$(EmscriptenDir)"
Command="$(HostNodeDir)\bin\$(NpmFileName) ci"
IgnoreStandardErrorWarningFormat="true"
EnvironmentVariables="PATH=$(NpmPath);npm_config_userconfig=$(RepoRoot)\.npmrc" />

<!-- clang-wrapper.sh hardcodes clang-19 at the moment so make sure it still exists -->
<Error Text="Update clang-wrapper.sh to point at the correct clang-* version"
Condition="!Exists('$(LLVMDir)\bin\clang-19') and !$([MSBuild]::IsOSPlatform(Windows))" />
Expand Down
85 changes: 0 additions & 85 deletions eng/sanitize.py

This file was deleted.