Skip to content

Commit 113fd97

Browse files
lewingdirecthex
authored andcommitted
Pull the python dependency from the EmsdkVersion where possible (#105437)
1 parent c50bd0b commit 113fd97

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

eng/Version.Details.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<Uri>https://github.com/dotnet/wcf</Uri>
1313
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64" Version="9.0.0-preview.7.24352.2">
16-
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>d3583522209829d1ed0440662ba136c7b7700b16</Sha>
18-
</Dependency>
1915
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.0.0-alpha.1.24370.2">
2016
<Uri>https://github.com/dotnet/llvm-project</Uri>
2117
<Sha>3358dfd351b424698f3f2cd67432dc62c333a64d</Sha>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@
241241
-->
242242
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.1.24373.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
243243
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
244-
<MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.7.24352.2</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
245244
<!-- workloads -->
246245
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
247246
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
@@ -262,6 +261,7 @@
262261
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
263262
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
264263
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>
264+
<!-- The package path for python in src/mono/mono.proj needs to be updated if this changes-->
265265
<EmsdkVersion>3.1.56</EmsdkVersion>
266266
</PropertyGroup>
267267
</Project>

src/mono/mono.proj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383

8484
<ItemGroup Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsMacCatalyst)' == 'true'">
8585
<PackageReference Condition="'$(HostOS)' == 'windows'"
86-
Include="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64"
86+
Include="Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-x64"
8787
PrivateAssets="all"
88-
Version="$(MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version)"
88+
Version="$(EmsdkPackageVersion)"
8989
GeneratePathProperty="true" />
9090
</ItemGroup>
9191

@@ -108,7 +108,7 @@
108108
Only wasi doesn't come with its own python and windows uses 32-bit python, so refer to the transport pack instead.
109109
-->
110110
<PropertyGroup Condition="'$(HostOS)' == 'windows' and '$(TargetsWasi)' == 'true'">
111-
<PythonCmd>$([MSBuild]::NormalizePath('$(PkgMicrosoft_NET_Runtime_Emscripten_3_1_34_Python_win-x64)', 'tools', 'python'))</PythonCmd>
111+
<PythonCmd>$([MSBuild]::NormalizePath('$(PkgMicrosoft_NET_Runtime_Emscripten_3_1_56_Python_win-x64)', 'tools', 'python'))</PythonCmd>
112112
</PropertyGroup>
113113

114114
<!-- CI specific build options -->
@@ -261,11 +261,11 @@ JS_ENGINES = [NODE_JS]
261261
<RemoveDir Directories="$(EMSDK_PATH)" />
262262

263263
<ItemGroup>
264-
<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)'"
264+
<EmsdkFiles Condition="'%(PackageReference.Identity)' != 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport' and '%(PackageReference.Identity)' != 'Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-$(BuildArchitecture)'"
265265
Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**" />
266266
<NodeFiles Condition="'%(PackageReference.Identity)' == 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport'"
267267
Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\$(_portableHostOS)-$(BuildArchitecture)\**" />
268-
<PythonFiles Condition="'$(HostOS)' == 'windows' and '%(PackageReference.Identity)' == 'Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-$(BuildArchitecture)'"
268+
<PythonFiles Condition="'$(HostOS)' == 'windows' and '%(PackageReference.Identity)' == 'Microsoft.NET.Runtime.Emscripten.$(EmsdkVersion).Python.win-$(BuildArchitecture)'"
269269
Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**" />
270270
</ItemGroup>
271271

0 commit comments

Comments
 (0)