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

[wasm] Drop extra files from ReferenceCopyLocalPaths #83670

Closed
wants to merge 8 commits into from
Closed

[wasm] Drop extra files from ReferenceCopyLocalPaths #83670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec22a5b
Drop extra files from ReferenceCopyLocalPaths
maraf Mar 20, 2023
8a73283
Drop "filename contains" conditions before I figure out how to write …
maraf Mar 20, 2023
eb56b20
Filter by filename contains
maraf Mar 20, 2023
91d8141
Use list to check for extensions
maraf Mar 20, 2023
fd63806
Fix extensions. Exclude * from "src".
maraf Mar 22, 2023
9820fb0
Exclude .js from src folder.
maraf Mar 22, 2023
0f588e9
[revert] Copy the filtering target to intree targets, so it's used by…
maraf Mar 24, 2023
7c15c0d
Merge remote-tracking branch 'upstream/main' into WasmDropExtraBuildF…
maraf Mar 28, 2023
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
10 changes: 10 additions & 0 deletions .../nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,14 @@
BeforeTargets="Build">
<Error Text="WebAssembly workloads can only support one active threading mode at a time. Either set WasmEnableThreads or WasmEnablePerfTracing to true, but not both." />
</Target>

<Target Name="_DropIntermediaryFilesFromOuput" AfterTargets="ResolveRuntimePackAssets">
<PropertyGroup>
<_WasmExtensionsToDrop>.a;.c;.h;.rsp;.json;.symbols;.ts;</_WasmExtensionsToDrop>
</PropertyGroup>
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="$(_WasmExtensionsToDrop.Contains('%(ReferenceCopyLocalPaths.Extension);')) or ('%(Extension)' == '.js' and $([MSBuild]::ValueOrDefault('%(FullPath)', '').Contains('src')))" />
</ItemGroup>
</Target>
</Project>
10 changes: 10 additions & 0 deletions src/mono/wasm/build/WasmApp.InTree.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,14 @@
<ZipDirectory SourceDirectory="$(WasmAppDir)" DestinationFile="$(ZippedApp)" />
<Copy SourceFiles="$(ZippedApp)" DestinationFolder="$(HelixArchiveRunOnlyAppsDir)" />
</Target>

<Target Name="_DropIntermediaryFilesFromOuput" AfterTargets="ResolveRuntimePackAssets">
<PropertyGroup>
<_WasmExtensionsToDrop>.a;.c;.h;.rsp;.json;.symbols;.ts;</_WasmExtensionsToDrop>
</PropertyGroup>
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="$(_WasmExtensionsToDrop.Contains('%(ReferenceCopyLocalPaths.Extension);')) or ('%(Extension)' == '.js' and $([MSBuild]::ValueOrDefault('%(FullPath)', '').Contains('src')))" />
</ItemGroup>
</Target>
</Project>