diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 845e8fccfd8d3c..331fa460c6ba38 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -14,8 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.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.EventSource.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.Shared.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.Shared.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.Shared.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.Shared.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.Shared.xml
index 25a8429f396d3f..c572a3e06c4683 100644
--- a/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.xml
+++ b/src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Shared.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..322c4c10680fec 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.Shared.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..d14aa9f72e4075 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'">$(MSBuildProjectDirectory)\ILLink\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/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.xml
new file mode 100644
index 00000000000000..3cdf676501162c
--- /dev/null
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.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/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>
diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
index b6b4f889a81fb4..6f12b7071d678e 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.EventSource.xml" />
 
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml"