From b8f4460096041b431284cc788b260e9f342aedff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Aug 2021 12:13:46 +0000 Subject: [PATCH 1/8] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c0f44982fbecb..7874b72c9867fd 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 + 7bf5cd4505d6c36f6c33984789e2a23b8837b6f1 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 8f33bb72f730c8..84913b1e0bc9b9 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.1 $(MicrosoftNETILLinkTasksVersion) 6.0.0-rc.1.21402.1 From d3ab157d400d21ae5b9bfa76f253141e92f7116f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Aug 2021 18:14:52 +0000 Subject: [PATCH 2/8] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7874b72c9867fd..afdfec7600aad6 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 - 7bf5cd4505d6c36f6c33984789e2a23b8837b6f1 + 272bd6d4d1e0da69b1b779c40d2927a0141a5bc8 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 84913b1e0bc9b9..bebc0865e8fcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21411.1 + 6.0.100-preview.6.21411.2 $(MicrosoftNETILLinkTasksVersion) 6.0.0-rc.1.21402.1 From 5467077059f795eec3f388aaf4f8c4dbc20065c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Aug 2021 12:16:51 +0000 Subject: [PATCH 3/8] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afdfec7600aad6..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 - 272bd6d4d1e0da69b1b779c40d2927a0141a5bc8 + 5d376b1f8963c5c0013482ec63d857d359658809 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index bebc0865e8fcd9..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.21411.2 + 6.0.100-preview.6.21411.3 $(MicrosoftNETILLinkTasksVersion) 6.0.0-rc.1.21402.1 From 9096bff6bb2239db9c90acf5b3edc647b5b01294 Mon Sep 17 00:00:00 2001 From: vitek-karas Date: Fri, 13 Aug 2021 03:02:11 -0700 Subject: [PATCH 4/8] Suppress trimmer warning --- src/libraries/System.Data.OleDb/src/OleDbDataReader.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs index e305bfd04167ee..a995719d3b8967 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,14 @@ 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 = GetSystemTypeDataColumn(); + + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2110", + Justification = "The problem is Type.TypeInitializer which requires static .ctor on the type" + + "which in this case is System.Type itself. System.Type.cctor will always be preserved anyway.")] + static DataColumn GetSystemTypeDataColumn() => + new DataColumn(SchemaTableColumn.DataType, typeof(Type)); + DataColumn providerType = new DataColumn("ProviderType", typeof(int)); DataColumn isLong = new DataColumn("IsLong", typeof(bool)); From d844800cf77e6c87c50550cb96eb58f78d8095eb Mon Sep 17 00:00:00 2001 From: vitek-karas Date: Fri, 13 Aug 2021 08:35:59 -0700 Subject: [PATCH 5/8] Fix warning code value --- src/libraries/System.Data.OleDb/src/OleDbDataReader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs index a995719d3b8967..b6c7ed66ecc460 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs @@ -332,7 +332,7 @@ private DataTable BuildSchemaTable(MetaData[] metadata) DataColumn dataType = GetSystemTypeDataColumn(); - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2110", + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2111", Justification = "The problem is Type.TypeInitializer which requires static .ctor on the type" + "which in this case is System.Type itself. System.Type.cctor will always be preserved anyway.")] static DataColumn GetSystemTypeDataColumn() => From 2e8358705b106ef941ac7316073b622d1cd33cfc Mon Sep 17 00:00:00 2001 From: vitek-karas Date: Fri, 13 Aug 2021 11:16:17 -0700 Subject: [PATCH 6/8] Fix netstandard build of libs --- src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index a5e9b248302241..6e0cbcc97e8707 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -157,4 +157,9 @@ System.Data.OleDb.OleDbTransaction + + + + + From 9fd63b458f5a0c7e10f9dd6942260525b9525c48 Mon Sep 17 00:00:00 2001 From: vitek-karas Date: Fri, 13 Aug 2021 12:23:40 -0700 Subject: [PATCH 7/8] Revert the code fix and just fix the XML suppression --- .../System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml | 2 +- src/libraries/System.Data.OleDb/src/OleDbDataReader.cs | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) 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 b6c7ed66ecc460..51186f08e09e7f 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs @@ -330,14 +330,7 @@ private DataTable BuildSchemaTable(MetaData[] metadata) DataColumn precision = new DataColumn("NumericPrecision", typeof(short)); DataColumn scale = new DataColumn("NumericScale", typeof(short)); - DataColumn dataType = GetSystemTypeDataColumn(); - - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2111", - Justification = "The problem is Type.TypeInitializer which requires static .ctor on the type" + - "which in this case is System.Type itself. System.Type.cctor will always be preserved anyway.")] - static DataColumn GetSystemTypeDataColumn() => - new DataColumn(SchemaTableColumn.DataType, typeof(Type)); - + DataColumn dataType = new DataColumn(SchemaTableColumn.DataType, typeof(Type)); DataColumn providerType = new DataColumn("ProviderType", typeof(int)); DataColumn isLong = new DataColumn("IsLong", typeof(bool)); From d1075c0e4cfb59a48677a4d2995db91a0f65dabe Mon Sep 17 00:00:00 2001 From: vitek-karas Date: Fri, 13 Aug 2021 12:24:59 -0700 Subject: [PATCH 8/8] Revert project change --- src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 6e0cbcc97e8707..a5e9b248302241 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -157,9 +157,4 @@ System.Data.OleDb.OleDbTransaction - - - - -