diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c0f44982fbecb..6e35220d454f6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/runtime d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/mono/linker - e21bb44ca909d33c18acf3ed0b68f94a413351a5 + 5d376b1f8963c5c0013482ec63d857d359658809 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 8f33bb72f730c8..091bc86f604b2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21409.3 + 6.0.100-preview.6.21411.3 $(MicrosoftNETILLinkTasksVersion) 6.0.0-rc.1.21402.1 diff --git a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml index d54caa4452859d..52bca59a2fc21b 100644 --- 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 @@ ILLink IL2111 member - M:System.Data.OleDb.OleDbDataReader.BuildSchemaTable(MetaData[]) + M:System.Data.OleDb.OleDbDataReader.BuildSchemaTable(System.Data.OleDb.MetaData[]) \ No newline at end of file diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs index e305bfd04167ee..51186f08e09e7f 100644 --- 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));