Update emsdk dependency to match what emsdk produces (#105434)

* Update emsdk dependency to match what emsdk produces * Update refs * Fix other variables --------- Co-authored-by: Larry Ewing <[email protected]>
dotnet · Jul 25, 2024 · eedf30e · eedf30e
1 parent 48e5bd6
commit eedf30e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -12,9 +12,9 @@
  <Uri>https:/dotnet/wcf</Uri>
  <Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64" Version="9.0.0-preview.7.24352.2">
+ <Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Python.win-x64" Version="9.0.0-preview.7.24373.5">
  <Uri>https:/dotnet/emsdk</Uri>
- <Sha>d3583522209829d1ed0440662ba136c7b7700b16</Sha>
+ <Sha>75567e63c265cb0a69bb11f8024349eda83f0878</Sha>
  </Dependency>
  <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.0.0-alpha.1.24370.2">
  <Uri>https:/dotnet/llvm-project</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -241,7 +241,7 @@
  -->
  <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.7.24373.5</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
  <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
- <MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.7.24352.2</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
+ <MicrosoftNETRuntimeEmscripten3156Pythonwinx64Version>9.0.0-preview.7.24373.5</MicrosoftNETRuntimeEmscripten3156Pythonwinx64Version>
  <!-- workloads -->
  <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
  <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
@@ -83,9 +83,9 @@
 
  <ItemGroup Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsMacCatalyst)' == 'true'">
  <PackageReference Condition="'$(HostOS)' == 'windows'"
- Include="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64"
+ Include="Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-x64"
  PrivateAssets="all"
- Version="$(MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version)"
+ Version="$(EmsdkPackageVersion)"
  GeneratePathProperty="true" />
  </ItemGroup>
 
@@ -108,7 +108,7 @@
  Only wasi doesn't come with its own python and windows uses 32-bit python, so refer to the transport pack instead.
  -->
  <PropertyGroup Condition="'$(HostOS)' == 'windows' and '$(TargetsWasi)' == 'true'">
- <PythonCmd>$([MSBuild]::NormalizePath('$(PkgMicrosoft_NET_Runtime_Emscripten_3_1_34_Python_win-x64)', 'tools', 'python'))</PythonCmd>
+ <PythonCmd>$([MSBuild]::NormalizePath('$(PkgMicrosoft_NET_Runtime_Emscripten_3_1_56_Python_win-x64)', 'tools', 'python'))</PythonCmd>
  </PropertyGroup>
 
  <!-- CI specific build options -->
@@ -259,13 +259,13 @@ JS_ENGINES = [NODE_JS]
  </PropertyGroup>
 
  <RemoveDir Directories="$(EMSDK_PATH)" />
- 
+
  <ItemGroup>
- <EmsdkFiles Condition="'%(PackageReference.Identity)' != 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport' and '%(PackageReference.Identity)' != 'Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-$(BuildArchitecture)'"
+ <EmsdkFiles Condition="'%(PackageReference.Identity)' != 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport' and '%(PackageReference.Identity)' != 'Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-$(BuildArchitecture)'"
  Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**" />
  <NodeFiles Condition="'%(PackageReference.Identity)' == 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport'"
  Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\$(_portableHostOS)-$(BuildArchitecture)\**" />
- <PythonFiles Condition="'$(HostOS)' == 'windows' and '%(PackageReference.Identity)' == 'Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-$(BuildArchitecture)'"
+ <PythonFiles Condition="'$(HostOS)' == 'windows' and '%(PackageReference.Identity)' == 'Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-$(BuildArchitecture)'"
  Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**" />
  </ItemGroup>
 
@@ -281,7 +281,7 @@ JS_ENGINES = [NODE_JS]
  <ReadLinesFromFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)">
  <Output TaskParameter="Lines" PropertyName="_EmsdkEnvFileText" />
  </ReadLinesFromFile>
- <WriteLinesToFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)" 
+ <WriteLinesToFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)"
  Overwrite="true"
  Lines="$(_EmsdkPaths);$(_EmsdkEnvFileText)" />
  <WriteLinesToFile File="$(EMSDK_PATH)emscripten/.emscripten"
@@ -299,7 +299,7 @@ JS_ENGINES = [NODE_JS]
 
  <PropertyGroup>
  <ShouldProvisionEmscripten>false</ShouldProvisionEmscripten>
- </PropertyGroup> 
+ </PropertyGroup>
  </Target>
 
  <!-- Sets up WASI SDK if you don't have the WASI_SDK_PATH env variable set -->