Skip to content

Fix issue with Trimming tests on Windows #39307

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

Merged
joperezr merged 2 commits into from
Jul 16, 2020
Merged

Fix issue with Trimming tests on Windows #39307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373e477
Fix issue with Trimming tests on Windows
joperezr Jul 14, 2020
0d8acc9
Update the IsSymbolFile metadata calculation
joperezr Jul 15, 2020
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
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-linker-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: release
platforms:
# - Windows_NT_x64
- Windows_NT_x64
- OSX_x64
- Linux_x64
jobParameters:
Expand Down
16 changes: 14 additions & 2 deletions src/libraries/pretest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,9 @@
<ItemGroup>
<_refPackLibFile Include="$(MicrosoftNetCoreAppRefPackRefDir)*.*">
<TargetPath>ref/$(NetCoreAppCurrent)</TargetPath>
<IsSymbolFile Condition="$([System.String]::Copy('%(Identity)').EndsWith('pdb'))">true</IsSymbolFile>
</_refPackLibFile>
<_runtimePackLibFiles Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.*">
<TargetPath>runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)</TargetPath>
<IsSymbolFile Condition="$([System.String]::Copy('%(Identity)').EndsWith('pdb'))">true</IsSymbolFile>
</_runtimePackLibFiles>
<_runtimePackNativeFiles Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)*.*">
<TargetPath>runtimes/$(PackageRID)/native</TargetPath>
Expand All @@ -106,6 +104,20 @@
<FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFrameworkName)" />
</ItemGroup>

<!-- We need to set this metadata in a separate ItemGroup than when the Items are initially populated in order to
have access to the Extension metadata. -->
<ItemGroup>
<_refPackLibFile>
<IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
</_refPackLibFile>
<_runtimePackLibFiles>
<IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
</_runtimePackLibFiles>
<_runtimePackNativeFiles>
<IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
</_runtimePackNativeFiles>
</ItemGroup>

<CreateFrameworkListFile Files="@(_refPackLibFile)"
TargetFile="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml"
TargetFilePrefixes="ref/;runtimes/"
Expand Down