Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

<NetCoreAppLatestStableVersion>5.0</NetCoreAppLatestStableVersion>
<NetCoreAppLatestStableVersion>6.0</NetCoreAppLatestStableVersion>
<NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
<NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

143 changes: 131 additions & 12 deletions src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,84 +147,203 @@
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
<Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Left>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to check these runtime net6.0 assets vs lib assets.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so I was able to figure these out. The package doesn't have a ref folder, and this is comparing runtimes/* as the contract, VS the ridless lib (the compile asset), and it seems like the ref is not exposing these APIs. It seems like that is by design. As we even have this: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt

<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/illumos/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/illumos/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/ios/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/ios/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/solaris/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/solaris/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/tvos/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/tvos/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Left>
<Right>lib/net6.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
<Left>runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
<Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
<Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
<Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
<Left>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
Expand Down

This file was deleted.

Loading