From 373e4772e386ff8b5f62000fc1eb9ab483d62e7d Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 14 Jul 2020 10:53:31 -0700
Subject: [PATCH 1/2] Fix issue with Trimming tests on Windows

---
 eng/pipelines/runtime-linker-tests.yml | 2 +-
 src/libraries/pretest.proj             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml
index a14af99374f919..ceffb1e237e76c 100644
--- 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
index 1ba9c731246433..5e55468f388649 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -106,6 +106,12 @@
       <FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFrameworkName)" />
     </ItemGroup>
 
+    <ItemGroup>
+      <!-- Remove pdbs form RuntimeList.xml as they shouldn't be there -->
+      <_runtimePackLibFiles Remove="@(_runtimePackLibFiles)" Condition="'%(Extension)' == '.pdb'" />
+      <_runtimePackNativeFiles Remove="@(_runtimePackNativeFiles)" Condition="'%(Extension)' == '.pdb'" />
+    </ItemGroup>
+
     <CreateFrameworkListFile Files="@(_refPackLibFile)"
                              TargetFile="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml"
                              TargetFilePrefixes="ref/;runtimes/"

From 0d8acc9c79f1ea37b677c02231f66df6786dffc4 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Wed, 15 Jul 2020 11:53:20 -0700
Subject: [PATCH 2/2] Update the IsSymbolFile metadata calculation

---
 src/libraries/pretest.proj | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 5e55468f388649..23a4041ff30a66 100644
--- 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,10 +104,18 @@
       <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>
-      <!-- Remove pdbs form RuntimeList.xml as they shouldn't be there -->
-      <_runtimePackLibFiles Remove="@(_runtimePackLibFiles)" Condition="'%(Extension)' == '.pdb'" />
-      <_runtimePackNativeFiles Remove="@(_runtimePackNativeFiles)" Condition="'%(Extension)' == '.pdb'" />
+      <_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)"