Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from mono/linker #57203

Merged
merged 8 commits into from
Aug 14, 2021
Merged

[main] Update dependencies from mono/linker #57203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8f4460
Update dependencies from https://github.com/mono/linker build 20210811.1
dotnet-maestro[bot] Aug 11, 2021
d3ab157
Update dependencies from https://github.com/mono/linker build 20210811.2
dotnet-maestro[bot] Aug 11, 2021
5467077
Update dependencies from https://github.com/mono/linker build 20210811.3
dotnet-maestro[bot] Aug 12, 2021
9096bff
Suppress trimmer warning
vitek-karas Aug 13, 2021
d844800
Fix warning code value
vitek-karas Aug 13, 2021
2e83587
Fix netstandard build of libs
vitek-karas Aug 13, 2021
9fd63b4
Revert the code fix and just fix the XML suppression
vitek-karas Aug 13, 2021
d1075c0
Revert project change
vitek-karas Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d90f6b6c86be7001dc839e147ab229dfd1c7d20d</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>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,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.21402.1</MicrosoftNETCoreRuntimeICUTransportVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion src/libraries/System.Data.OleDb/src/OleDbDataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down