From a79dc9ded86277198bac50413485bdf80a1c8663 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 7 May 2021 16:14:47 -0700
Subject: [PATCH 1/3] Removing all shared framework linker noWarns

---
 .../CreateRuntimeRootILLinkDescriptorFile.targets   |  3 ++-
 ...escriptors.xml => ILLink.Descriptors.Common.xml} |  4 ----
 .../src/ILLink/ILLink.Descriptors.Windows.xml       |  8 ++++++++
 ...escriptors.xml => ILLink.Descriptors.Common.xml} |  5 -----
 .../src/ILLink/ILLink.Descriptors.Windows.xml       |  6 ++++++
 .../Microsoft.CSharp/src/Microsoft.CSharp.csproj    |  4 ++++
 ...scriptors.xml => ILLink.Descriptors.Windows.xml} |  0
 .../src/Microsoft.VisualBasic.Core.vbproj           |  3 +++
 src/libraries/illink-sharedframework.targets        | 13 -------------
 9 files changed, 23 insertions(+), 23 deletions(-)
 rename src/coreclr/System.Private.CoreLib/src/ILLink/{ILLink.Descriptors.xml => ILLink.Descriptors.Common.xml} (85%)
 create mode 100644 src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Windows.xml
 rename src/libraries/Microsoft.CSharp/src/ILLink/{ILLink.Descriptors.xml => ILLink.Descriptors.Common.xml} (73%)
 create mode 100644 src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Windows.xml
 rename src/libraries/Microsoft.VisualBasic.Core/src/ILLink/{ILLink.Descriptors.xml => ILLink.Descriptors.Windows.xml} (100%)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 845e8fccfd8d3c..2f644f01d40ff4 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -14,7 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
+    <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.Common.xml" />
+    <_ILLinkDescriptorsFilePaths Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
     <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
   </ItemGroup>
 
diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Common.xml
similarity index 85%
rename from src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
rename to src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Common.xml
index d65f03c0405bb0..e3682b253e3a7e 100644
--- a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
+++ b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Common.xml
@@ -9,10 +9,6 @@
     <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerable" />
     <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerator" />
     <type fullname="System.Runtime.InteropServices.CustomMarshalers.*" />
-    <!-- Workaround for https://github.com/mono/linker/issues/378 -->
-    <type fullname="System.Runtime.InteropServices.IDispatch" />
-    <type fullname="System.Runtime.InteropServices.IMarshal" />
-    <type fullname="Internal.Runtime.InteropServices.IClassFactory2" />
 
     <!-- GetActualImplementationForArrayGenericIListOrIReadOnlyListMethod depends on slots of these interfaces not changing -->
     <type fullname="System.Collections.Generic.IEnumerable`1" />
diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Windows.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Windows.xml
new file mode 100644
index 00000000000000..0648aed9763d13
--- /dev/null
+++ b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Windows.xml
@@ -0,0 +1,8 @@
+<linker>
+  <assembly fullname="System.Private.CoreLib">
+    <!-- Workaround for https://github.com/mono/linker/issues/378 -->
+    <type fullname="System.Runtime.InteropServices.IDispatch" />
+    <type fullname="System.Runtime.InteropServices.IMarshal" />
+    <type fullname="Internal.Runtime.InteropServices.IClassFactory2" />
+  </assembly>
+</linker>
diff --git a/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.xml b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Common.xml
similarity index 73%
rename from src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.xml
rename to src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Common.xml
index 25a8429f396d3f..c572a3e06c4683 100644
--- a/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.xml
+++ b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Common.xml
@@ -1,9 +1,4 @@
 <linker>
-  <assembly fullname="Microsoft.CSharp">
-    <!-- Required for COM event dispatch -->
-    <type fullname="System.Runtime.InteropServices.ComEventsSink"/>
-  </assembly>
-
   <assembly fullname="Microsoft.CSharp" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="true" featuredefault="true">
     <!-- Required by the Expression Evaluator -->
     <type fullname="Microsoft.CSharp.RuntimeBinder.DynamicMetaObjectProviderDebugView"/>
diff --git a/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Windows.xml b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Windows.xml
new file mode 100644
index 00000000000000..4bf5dd43f040f8
--- /dev/null
+++ b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Windows.xml
@@ -0,0 +1,6 @@
+<linker>
+  <assembly fullname="Microsoft.CSharp">
+    <!-- Required for COM event dispatch -->
+    <type fullname="System.Runtime.InteropServices.ComEventsSink"/>
+  </assembly>
+</linker>
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 1a5bbb93ca99f4..9e18677697f0dd 100644
--- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -9,6 +9,10 @@
     <DefineConstants Condition="'$(EnableComBinder)'=='true'">$(DefineConstants);ENABLECOMBINDER</DefineConstants>
     <AllowUnsafeBlocks Condition="'$(EnableComBinder)'=='true'">true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <ItemGroup>
+    <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.Common.xml" />
+    <ILLinkDescriptorsXmls Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
     <Compile Include="Microsoft\CSharp\RuntimeBinder\Binder.cs" />
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/ILLink/ILLink.Descriptors.xml b/src/libraries/Microsoft.VisualBasic.Core/src/ILLink/ILLink.Descriptors.Windows.xml
similarity index 100%
rename from src/libraries/Microsoft.VisualBasic.Core/src/ILLink/ILLink.Descriptors.xml
rename to src/libraries/Microsoft.VisualBasic.Core/src/ILLink/ILLink.Descriptors.Windows.xml
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index 3724c9fb49baa9..d4362680482cb0 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -18,6 +18,9 @@
     <RootNamespace />
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
   </PropertyGroup>
+  <PropertyGroup>
+    <ILLinkDescriptorsXml Condition="'$(TargetsWindows)' == 'true'">$(ILLinkDirectory)ILLink.Descriptors.Windows.xml</ILLinkDescriptorsXml>
+  </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="Microsoft\VisualBasic\Helpers\NativeMethods.vb" />
     <Compile Include="Microsoft\VisualBasic\Helpers\NativeTypes.vb" />
diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets
index 1a0df98022d721..ac28f2824bc228 100644
--- a/src/libraries/illink-sharedframework.targets
+++ b/src/libraries/illink-sharedframework.targets
@@ -14,19 +14,6 @@
       <RuntimePackILLinkArgs>$(ILLinkArgs)</RuntimePackILLinkArgs>
       <!-- update debug symbols -->
       <RuntimePackILLinkArgs>$(RuntimePackILLinkArgs) -b true</RuntimePackILLinkArgs>
-      <!-- suppress warnings with the following codes:
-           IL2009: Could not find method A in type B specified in resource C
-           IL2025: Duplicate preserve of A in B
-      -->
-      <LinkerNoWarn>IL2009;IL2025</LinkerNoWarn>
-      <!-- https://github.com/dotnet/runtime/issues/40336 - need to also suppress the following on non-Windows:
-           IL2008: Could not find type A specified in resource B
-           and on 32-bit builds:
-           IL2012: Could not find field 'Padding' in type 'System.Runtime.CompilerServices.RawArrayData'
-      -->
-      <LinkerNoWarn Condition="'$(TargetOS)' != 'windows'">$(LinkerNoWarn);IL2008</LinkerNoWarn>
-      <LinkerNoWarn Condition="'$(Platform)' != 'x64' AND '$(Platform)' != 'arm64'">$(LinkerNoWarn);IL2012</LinkerNoWarn>
-      <RuntimePackILLinkArgs>$(RuntimePackILLinkArgs) --nowarn $(LinkerNoWarn)</RuntimePackILLinkArgs>
     </PropertyGroup>
 
     <ItemGroup>

From 378193d7e2f7221db663b21a897aeee49a3f303e Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Mon, 10 May 2021 11:51:28 -0700
Subject: [PATCH 2/3] Addressing feedback and fixing Browser and windows legs

---
 .../CreateRuntimeRootILLinkDescriptorFile.targets          | 3 ++-
 ...escriptors.Common.xml => ILLink.Descriptors.Shared.xml} | 0
 ...escriptors.Common.xml => ILLink.Descriptors.Shared.xml} | 0
 src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj | 2 +-
 .../src/Microsoft.VisualBasic.Core.vbproj                  | 2 +-
 .../src/ILLink/ILLink.Descriptors.NonBrowser.xml           | 7 +++++++
 .../src/ILLink/ILLink.Descriptors.Shared.xml               | 6 ------
 .../System.Private.CoreLib/System.Private.CoreLib.csproj   | 1 +
 8 files changed, 12 insertions(+), 9 deletions(-)
 rename src/coreclr/System.Private.CoreLib/src/ILLink/{ILLink.Descriptors.Common.xml => ILLink.Descriptors.Shared.xml} (100%)
 rename src/libraries/Microsoft.CSharp/src/ILLink/{ILLink.Descriptors.Common.xml => ILLink.Descriptors.Shared.xml} (100%)
 create mode 100644 src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 2f644f01d40ff4..7c58ddf21df3a2 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -14,9 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.Common.xml" />
+    <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.Shared.xml" />
     <_ILLinkDescriptorsFilePaths Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
     <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
+    <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.NonBrowser.xml" />
   </ItemGroup>
 
   <!--
diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Common.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
similarity index 100%
rename from src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Common.xml
rename to src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
diff --git a/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Common.xml b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Shared.xml
similarity index 100%
rename from src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Common.xml
rename to src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Shared.xml
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 9e18677697f0dd..322c4c10680fec 100644
--- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -10,7 +10,7 @@
     <AllowUnsafeBlocks Condition="'$(EnableComBinder)'=='true'">true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.Common.xml" />
+    <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.Shared.xml" />
     <ILLinkDescriptorsXmls Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index d4362680482cb0..d14aa9f72e4075 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -19,7 +19,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <ILLinkDescriptorsXml Condition="'$(TargetsWindows)' == 'true'">$(ILLinkDirectory)ILLink.Descriptors.Windows.xml</ILLinkDescriptorsXml>
+    <ILLinkDescriptorsXml Condition="'$(TargetsWindows)' == 'true'">$(MSBuildProjectDirectory)\ILLink\ILLink.Descriptors.Windows.xml</ILLinkDescriptorsXml>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="Microsoft\VisualBasic\Helpers\NativeMethods.vb" />
diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml
new file mode 100644
index 00000000000000..3cdf676501162c
--- /dev/null
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml
@@ -0,0 +1,7 @@
+<linker>
+  <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Tracing.EventSource.IsSupported" featurevalue="true" featuredefault="true">
+    <type fullname="System.Diagnostics.Tracing.RuntimeEventSource">
+      <method signature="System.Void Initialize()" />
+    </type>
+  </assembly>
+</linker>
diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
index 3c93283df29b54..1989afaeda1bd5 100644
--- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
@@ -61,10 +61,4 @@
       <method name="GetApplyUpdateCapabilities" />
     </type>
   </assembly>
-
-  <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Tracing.EventSource.IsSupported" featurevalue="true" featuredefault="true">
-    <type fullname="System.Diagnostics.Tracing.RuntimeEventSource">
-      <method signature="System.Void Initialize()" />
-    </type>
-  </assembly>
 </linker>
diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
index b6b4f889a81fb4..f40fc7c65f6e59 100644
--- a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -132,6 +132,7 @@
   <ItemGroup>
     <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
     <ILLinkDescriptorsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
+    <ILLinkDescriptorsXmls Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.NonBrowser.xml" />
 
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml"

From afd4ea3b18793f2a5a1fa02aa51391eb02dcd1e4 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 11 May 2021 12:53:27 -0700
Subject: [PATCH 3/3] Renaming ILLinkDescriptors file

---
 .../CreateRuntimeRootILLinkDescriptorFile.targets               | 2 +-
 ...iptors.NonBrowser.xml => ILLink.Descriptors.EventSource.xml} | 0
 src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/libraries/System.Private.CoreLib/src/ILLink/{ILLink.Descriptors.NonBrowser.xml => ILLink.Descriptors.EventSource.xml} (100%)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 7c58ddf21df3a2..331fa460c6ba38 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -17,7 +17,7 @@
     <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.Shared.xml" />
     <_ILLinkDescriptorsFilePaths Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
     <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
-    <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.NonBrowser.xml" />
+    <_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />
   </ItemGroup>
 
   <!--
diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.xml
similarity index 100%
rename from src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.NonBrowser.xml
rename to src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.xml
diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
index f40fc7c65f6e59..6f12b7071d678e 100644
--- a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -132,7 +132,7 @@
   <ItemGroup>
     <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
     <ILLinkDescriptorsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
-    <ILLinkDescriptorsXmls Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.NonBrowser.xml" />
+    <ILLinkDescriptorsXmls Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />
 
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml"