Fix issue with Trimming tests on Windows (dotnet#39307)

* Fix issue with Trimming tests on Windows * Update the IsSymbolFile metadata calculation
waiyiptam · Jul 16, 2020 · 7d5f717 · 7d5f717
1 parent ace324d
commit 7d5f717
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml
@@ -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:

diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
@@ -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>
@@ -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/"