Skip to content

Update CompatibilitySuppressions after updating APICompat that uses references #58208

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

Merged
joperezr merged 1 commit into from
Sep 1, 2021
Merged

Update CompatibilitySuppressions after updating APICompat that uses references #58208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -234,9 +234,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>9a1f02eff42635a5a9934735f12c722c3bfba8e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.0.0-rc.1.21426.17">
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.0.0-rc.1.21426.26">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c9baf2d5ea9d76cbef13b0dcd51877715c9b009a</Sha>
<Sha>2a329734e8af66c8b3fc428ad044d95d86b36968</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
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 @@ -51,7 +51,7 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21413.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.1.21426.17</MicrosoftDotNetCompatibilityVersion>
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.1.21426.26</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21427.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksFeedVersion>
Expand Down
8 changes: 0 additions & 8 deletions src/libraries/Microsoft.Bcl.AsyncInterfaces/src/CompatibilitySuppressions.xml
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.ServiceModel.Internals.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>SMDiagnostics.dll</Target>
</Suppression>
</Suppressions>
8 changes: 0 additions & 8 deletions src/libraries/Microsoft.Win32.SystemEvents/src/CompatibilitySuppressions.xml
View file
Open in desktop

This file was deleted.

33 changes: 32 additions & 1 deletion src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingsAttributeDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingsContext.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.RefreshConfigPaths</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.get_HasLocalConfig</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.get_HasRoamingConfig</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.get_IsAppConfigHttp</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
Expand Down
13 changes: 8 additions & 5 deletions src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>lib/net461/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
Expand Down Expand Up @@ -149,6 +144,14 @@
<Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
<Right>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.ServiceModel.Internals.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>SMDiagnostics.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Data.Odbc.ODBC32</Target>
Expand Down
11 changes: 7 additions & 4 deletions src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Left>lib/netstandard2.0/System.Data.OleDb.dll</Left>
<Right>lib/net461/System.Data.OleDb.dll</Right>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.ServiceModel.Internals.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>SMDiagnostics.dll</Target>
</Suppression>
</Suppressions>
8 changes: 0 additions & 8 deletions src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
View file
Open in desktop

This file was deleted.

57 changes: 53 additions & 4 deletions src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@)</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@,System.Drawing.Region@)</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Drawing.FontConverter</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Drawing.IconConverter</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Drawing.ImageConverter</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Drawing.ColorTranslator</Target>
<Target>T:System.Drawing.ImageFormatConverter</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/netcoreapp3.1/System.Drawing.Common.dll</Right>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Drawing.SystemColors</Target>
<Target>T:System.Drawing.Printing.MarginsConverter</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Drawing.Imaging.Encoder.ColorSpace</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Drawing.Imaging.Encoder.ImageItems</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/netcoreapp3.1/System.Drawing.Common.dll</Right>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Drawing.Imaging.Encoder.SaveAsCmyk</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Drawing.Imaging.EncoderParameterValueType.ValueTypePointer</Target>
<Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
<Right>lib/net461/System.Drawing.Common.dll</Right>
</Suppression>
</Suppressions>
5 changes: 0 additions & 5 deletions src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Left>lib/netstandard2.0/System.IO.Packaging.dll</Left>
<Right>lib/net461/System.IO.Packaging.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>.NETFramework,Version=v4.6</Target>
Expand Down
86 changes: 0 additions & 86 deletions src/libraries/System.IO.Ports/src/CompatibilitySuppressions.xml
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ...CodeDom/src/CompatibilitySuppressions.xml → ...Caching/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Left>lib/netstandard2.0/System.CodeDom.dll</Left>
<Right>lib/net461/System.CodeDom.dll</Right>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.Runtime.CompilerServices.Unsafe.dll</Target>
</Suppression>
</Suppressions>
Loading