Skip to content

Commit

Permalink
Further tuning of the CORE_ROOT folder content (dotnet#35546)
Browse files Browse the repository at this point in the history
Based on Sergey's feedback I'm putting back the alternate JITs
(linuxonjit, protononjit) as they are actively used by the JIT team
in specialized scenarios. I have also pruned the PDB subfolder -
after extensive discussions I tried to be conservative in removing
only those PDB's we believe we don't need in Helix.

Thanks

Tomas
  • Loading branch information
trylek authored Apr 29, 2020
1 parent cc62091 commit 846d7a4
Showing 1 changed file with 33 additions and 4 deletions.
37 changes: 33 additions & 4 deletions src/coreclr/tests/src/Common/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,45 @@
<RunTimeDependencyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)" Exclude="@(RunTimeDependencyExcludeFiles)"/>
<RunTimeDependencyCopyLocal Include="@(RunTimeDependencyCopyLocalFile -> '%(File)')" />
<RunTimeDependencyCopyLocal Include="$(TargetingPackPath)/*" />

<RunTimeArtifactsExcludeFiles Include="protononjit.dll" />
<RunTimeArtifactsExcludeFiles Include="linuxonjit.dll" />

</ItemGroup>

<ItemGroup>
<RunTimeArtifactsExcludeFiles Include="PDB/createdump.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/dbgshim.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/linuxonjit.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mcs.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mscordaccore.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mscordbi.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mscorrc.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/protononjit.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi-shim-collector.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi-shim-counter.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi-shim-simple.pdb" />
</ItemGroup>

<ItemGroup Condition="'$(MinimalCoreRoot)' == 'true'">
<RunTimeArtifactsExcludeFiles Include="PDB/ilasm.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/ildasm.pdb" />
</ItemGroup>

<ItemGroup>
<RunTimeArtifactsIncludeFolders Include="/" />

<!-- Used by the Crossgen comparison job -->
<RunTimeArtifactsIncludeFolders Include="IL/" />

<!-- Used for Crossgen2 R2R tests -->
<RunTimeArtifactsIncludeFolders Include="crossgen2/" />

<!-- Used for capturing symbolic stack traces using Watson -->
<RunTimeArtifactsIncludeFolders Include="PDB/" />

<!-- Used by the coreroot_determinism test -->
<RunTimeArtifactsIncludeFolders Include="R2RTest/" />
</ItemGroup>

<ItemGroup>
<!-- Add binary dependencies to copy-local items -->
<RunTimeDependencyCopyLocal
Include="$(CoreCLRArtifactsPath)%(RunTimeArtifactsIncludeFolders.Identity)*"
Expand Down

0 comments on commit 846d7a4

Please sign in to comment.