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.

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

Update emsdk dependency to match what emsdk produces #105434

Merged
merged 3 commits into from
Jul 25, 2024

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Jul 24, 2024

No description provided.

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 24, 2024
@mmitche mmitche requested review from lewing and carlossanlop July 24, 2024 22:57
@lewing lewing added the Servicing-approved Approved for servicing release label Jul 24, 2024
@lewing
Copy link
Member

lewing commented Jul 24, 2024

actually it looks there is a reference to this package in part of the tooling, let me see if I can clean that up

@mmitche
Copy link
Member Author

mmitche commented Jul 24, 2024

@lewing I also needed to clean up the version props, if you aren't getting to that too

@mmitche mmitche requested a review from marek-safar as a code owner July 24, 2024 23:06
src/mono/mono.proj Outdated Show resolved Hide resolved
src/mono/mono.proj Outdated Show resolved Hide resolved
@@ -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

@lewing
Copy link
Member

lewing commented Jul 25, 2024

/ba-g analysis is green but preview branch

@lewing lewing merged commit eedf30e into dotnet:release/9.0-preview7 Jul 25, 2024
159 of 161 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Build-mono Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants