[main] Update dependencies from mono/linker (#57203)

* Update dependencies from https://github.com/mono/linker build 20210811.1 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21409.3 -> To Version 6.0.100-preview.6.21411.1 * Update dependencies from https://github.com/mono/linker build 20210811.2 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21409.3 -> To Version 6.0.100-preview.6.21411.2 * Update dependencies from https://github.com/mono/linker build 20210811.3 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21409.3 -> To Version 6.0.100-preview.6.21411.3 * Suppress trimmer warning * Fix warning code value * Fix netstandard build of libs * Revert the code fix and just fix the XML suppression * Revert project change Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: vitek-karas <[email protected]>
dotnet · Aug 14, 2021 · 6c39236 · 6c39236
1 parent d95758f
commit 6c39236
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -190,9 +190,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>85441ce69b81dfd5bf57b9d00ba525440b7bb25d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21409.3">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21411.3">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>e21bb44ca909d33c18acf3ed0b68f94a413351a5</Sha>
+      <Sha>5d376b1f8963c5c0013482ec63d857d359658809</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21404.1">
       <Uri>https://github.com/dotnet/xharness</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -169,7 +169,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21409.3</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21411.3</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rc.1.21410.2</MicrosoftNETCoreRuntimeICUTransportVersion>

diff --git a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml
@@ -101,6 +101,6 @@
       <argument>ILLink</argument>
       <argument>IL2111</argument>
       <property name="Scope">member</property>
-      <property name="Target">M:System.Data.OleDb.OleDbDataReader.BuildSchemaTable(MetaData[])</property>
+      <property name="Target">M:System.Data.OleDb.OleDbDataReader.BuildSchemaTable(System.Data.OleDb.MetaData[])</property>
     </attribute>  </assembly>
 </linker>
diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs
@@ -7,6 +7,7 @@
 using System.Data.Common;
 using System.Data.ProviderBase;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -329,7 +330,7 @@ private DataTable BuildSchemaTable(MetaData[] metadata)
             DataColumn precision = new DataColumn("NumericPrecision", typeof(short));
             DataColumn scale = new DataColumn("NumericScale", typeof(short));
 
-            DataColumn dataType = new DataColumn("DataType", typeof(System.Type));
+            DataColumn dataType = new DataColumn(SchemaTableColumn.DataType, typeof(Type));
             DataColumn providerType = new DataColumn("ProviderType", typeof(int));
 
             DataColumn isLong = new DataColumn("IsLong", typeof(bool));