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

[wasm] Don't use EMSDK_PATH in external builds #52215

Merged
merged 2 commits into from
May 4, 2021

Conversation

lewing
Copy link
Member

@lewing lewing commented May 3, 2021

@radical we need to either include EmSdkRepo.Defaults.props in the package (in an appropriate folder) or do something like this.

@lewing lewing requested a review from radical May 3, 2021 21:58
@lewing lewing changed the title Don't use EMSDK_PATH in external builds [wasm] Don't use EMSDK_PATH in external builds May 3, 2021
@lewing lewing added the arch-wasm WebAssembly architecture label May 3, 2021
@ghost
Copy link

ghost commented May 3, 2021

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

@radical we need to either include EmSdk.props in the package (in an appropriate folder) or do something like this.

Author: lewing
Assignees: -
Labels:

arch-wasm, area-Build-mono

Milestone: -

@radical
Copy link
Member

radical commented May 3, 2021

Include it:

diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
index 522d70fa1e4..b7f3256bfed 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
+++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
@@ -13,6 +13,7 @@
     <PackageFile Include="Sdk\AutoImport.props" TargetPath="Sdk" />
     <PackageFile Include="$(RepoRoot)\src\mono\wasm\build\WasmApp.props" TargetPath="Sdk" />
     <PackageFile Include="$(RepoRoot)\src\mono\wasm\build\WasmApp.targets" TargetPath="Sdk" />
+    <PackageFile Include="$(RepoRoot)\src\mono\wasm\build\EmSdkRepo.Defaults.props" TargetPath="Sdk" />
   </ItemGroup>

   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

@lewing
Copy link
Member Author

lewing commented May 4, 2021

Yeah I started with that and then realized for general builds this is the wrong thing. It should definitely be opt in for out of tree builds otherwise we're setting things up poorly.

@lewing lewing marked this pull request as ready for review May 4, 2021 01:27
@lewing lewing requested a review from marek-safar as a code owner May 4, 2021 01:27
Copy link
Member

@radical radical left a comment

Choose a reason for hiding this comment

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

Good for now

@lewing lewing merged commit bde0bab into dotnet:main May 4, 2021
@lewing lewing deleted the wasm-emsdk-path branch May 4, 2021 14:13
@karelz karelz added this to the 6.0.0 milestone May 20, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Jun 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
arch-wasm WebAssembly architecture area-Build-mono
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants