Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update emsdk dependency to match what emsdk produces #105434

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Update emsdk dependency to match what emsdk produces #105434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1559f24
Update emsdk dependency to match what emsdk produces
mmitche Jul 24, 2024
ca0f636
Update refs
mmitche Jul 24, 2024
6b0d6de
Fix other variables
lewing Jul 24, 2024
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<Uri>https://github.com/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://github.com/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://github.com/dotnet/llvm-project</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see an obvious way to keep the version string out of this one, the plan is to move this logic to emsdk properly where it is easier to do

cc @radekdoulik

</PropertyGroup>

<!-- CI specific build options -->
Expand Down Expand Up @@ -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>

Expand All @@ -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"
Expand All @@ -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 -->
Expand Down
Loading