diff --git a/eng/illink.targets b/eng/illink.targets
index ecbe07e8438376f9338ffeef7632bf642ab11d4e..7dd3238a5fb431b6c2e66528cc18e6495e2cccc5 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -222,15 +222,10 @@
   <!-- ILLink.Tasks arguments common to runs for both individual libraries and for the entire runtime pack -->
   <Target Name="SetCommonILLinkArgs">
     <PropertyGroup>
-      <!-- don't remove the embedded link attributes xml resource since ILLink may run again on the assembly -->
-      <!-- and ignore the link attributes xml file during the library build, since we need the attributes preserved until the final app is linked -->
-      <ILLinkArgs>$(ILLinkArgs) --strip-link-attributes false --ignore-link-attributes true</ILLinkArgs>
+      <!-- don't remove attributes after build, our tooling is not ready for that -->
+      <ILLinkArgs>$(ILLinkArgs) --ignore-link-attributes true</ILLinkArgs>
       <!-- ignore unresolved references -->
       <ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
-      <!-- keep interface implementations -->
-      <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
-      <!-- keep any type check -->
-      <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedtypechecks</ILLinkArgs>
     </PropertyGroup>
   </Target>
 
@@ -250,14 +245,8 @@
       <!-- trim the target assembly -->
       <ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs>
       <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
-      <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
       <!-- pass the non-embedded root xml file on the command line -->
       <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
-      <!-- don't remove the embedded substitutions xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkSubstitutionsXml)' != ''">$(ILLinkArgs) --strip-substitutions false</ILLinkArgs>
-      <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
-      <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
       <!-- suppress warnings with the following codes:
            IL2008: Could not find type A specified in resource B
            IL2009: Could not find method A in type B specified in resource C
@@ -307,7 +296,7 @@
       <_DependencyDirectories Remove="@(_DependencyDirectories)" />
       <_DependencyDirectories Include="%(_DependencyDirectoriesNoSlash.PathWithoutSlash)" />
       <ILLinkTrimInputAssembly Include="$(ILLinkTrimInputPath)$(TargetName)$(TargetExt)">
-        <RootMode>visible</RootMode>
+        <RootMode>library</RootMode>
       </ILLinkTrimInputAssembly>
     </ItemGroup>
 
diff --git a/src/libraries/System.Private.DataContractSerialization/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Private.DataContractSerialization/src/ILLink/ILLink.Suppressions.xml
index beceae03cc8635c3ed0a31b125d210d569edf23f..032094abce4ffd691dfe40e0cf96aa31248431a2 100644
--- a/src/libraries/System.Private.DataContractSerialization/src/ILLink/ILLink.Suppressions.xml
+++ b/src/libraries/System.Private.DataContractSerialization/src/ILLink/ILLink.Suppressions.xml
@@ -229,6 +229,12 @@
       <property name="Scope">member</property>
       <property name="Target">M:System.Runtime.Serialization.XmlFormatReaderGenerator.UnsafeGetUninitializedObject(System.Type)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2067</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Runtime.Serialization.SurrogateDataContract.GetUninitializedObject(System.Type)</property>
+    </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
       <argument>IL2070</argument>
@@ -446,4 +452,4 @@
       <property name="Target">M:System.Runtime.Serialization.XmlFormatWriterGenerator.CriticalHelper.WriteCollection(System.Runtime.Serialization.CollectionDataContract)</property>
     </attribute>
   </assembly>
-</linker>
\ No newline at end of file
+</linker>
diff --git a/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.Debug.xml b/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.Debug.xml
index f85796e4727006c5016af8b923306511b2133e13..60e784a5c938c5c14f8fddf331524945c7c699f2 100644
--- a/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.Debug.xml
+++ b/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.Debug.xml
@@ -13,5 +13,11 @@
       <property name="Scope">member</property>
       <property name="Target">M:System.Text.Json.Serialization.ReflectionEmitMemberAccessor.CreateParameterizedConstructor(System.Reflection.ConstructorInfo)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2090</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.CreateParameterizedConstructor(System.Reflection.ConstructorInfo)</property>
+    </attribute>
   </assembly>
-</linker>
\ No newline at end of file
+</linker>
diff --git a/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.xml
index 641878bc5256577f16174942e781513be254b908..36be4bd6570dd4955e1551c633043a9d4ea513b7 100644
--- a/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.xml
+++ b/src/libraries/System.Text.Json/src/ILLink/ILLink.Suppressions.xml
@@ -67,5 +67,35 @@
       <property name="Scope">member</property>
       <property name="Target">M:System.Text.Json.Serialization.IEnumerableConverterFactoryHelpers.GetImmutableEnumerableCreateRangeMethod(System.Type,System.Type)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2077</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.&lt;&gt;c__DisplayClass0_0.&lt;CreateConstructor&gt;b__0</property>
+    </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2080</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.CreateConstructor(System.Type)</property>
+    </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2090</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.CreateAddMethodDelegate``1</property>
+    </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2090</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.CreateParameterizedConstructor``1(System.Reflection.ConstructorInfo)</property>
+    </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2090</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.Text.Json.Serialization.ReflectionMemberAccessor.CreateParameterizedConstructor``5(System.Reflection.ConstructorInfo)</property>
+    </attribute>
   </assembly>
-</linker>
\ No newline at end of file
+</linker>
diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets
index d0229349d3b0eaa0693e502e77171c83afa6ed20..264c03533badf3df4c92cfd3d6a72b937e37ca8c 100644
--- a/src/libraries/illink-sharedframework.targets
+++ b/src/libraries/illink-sharedframework.targets
@@ -63,7 +63,7 @@
       <_LibrariesToLink Include="$(SystemPrivateCoreLibPath)" />
 
       <RootAssemblies Include="@(_LibrariesToLink)">
-        <RootMode>visible</RootMode>
+        <RootMode>library</RootMode>
       </RootAssemblies>
     </ItemGroup>