Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 8842923

Browse files
committed
Consolidate matching ref generated baseline files
This change collapses some baseline files as well as fixes some of the reference mis-matches
1 parent ddb31b5 commit 8842923

File tree

42 files changed

+13
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+13
-142
lines changed

src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.netcoreapp.txt renamed to src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.txt

File renamed without changes.

src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.uap.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/System.Data.Common/ref/System.Data.Common.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,9 +1781,7 @@ public abstract partial class DbConnection : System.ComponentModel.Component, Sy
17811781
{
17821782
protected DbConnection() { }
17831783
[System.ComponentModel.DefaultValueAttribute("")]
1784-
#pragma warning disable 0618
17851784
[System.ComponentModel.RecommendedAsConfigurableAttribute(true)]
1786-
#pragma warning restore 0618
17871785
[System.ComponentModel.RefreshPropertiesAttribute((System.ComponentModel.RefreshProperties)(1))]
17881786
[System.ComponentModel.SettingsBindableAttribute(true)]
17891787
public abstract string ConnectionString { get; set; }
@@ -2204,6 +2202,12 @@ public static partial class DbProviderFactories
22042202
public static System.Data.Common.DbProviderFactory GetFactory(System.Data.DataRow providerRow) { throw null; }
22052203
public static System.Data.Common.DbProviderFactory GetFactory(string providerInvariantName) { throw null; }
22062204
public static System.Data.DataTable GetFactoryClasses() { throw null; }
2205+
public static System.Collections.Generic.IEnumerable<string> GetProviderInvariantNames() { throw null; }
2206+
public static void RegisterFactory(string providerInvariantName, System.Data.Common.DbProviderFactory factory) { }
2207+
public static void RegisterFactory(string providerInvariantName, string factoryTypeAssemblyQualifiedName) { }
2208+
public static void RegisterFactory(string providerInvariantName, System.Type providerFactoryClass) { }
2209+
public static bool TryGetFactory(string providerInvariantName, out System.Data.Common.DbProviderFactory factory) { throw null; }
2210+
public static bool UnregisterFactory(string providerInvariantName) { throw null; }
22072211
}
22082212
public abstract partial class DbProviderFactory
22092213
{

src/System.Data.Common/ref/System.Data.Common.csproj

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<PropertyGroup>
55
<ProjectGuid>{D2DB0D6F-F65E-4174-B31E-27DC03137118}</ProjectGuid>
6-
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
6+
<NoWarn>$(NoWarn);0618</NoWarn>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
99
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
@@ -12,17 +12,7 @@
1212
<ItemGroup>
1313
<Compile Include="System.Data.Common.cs" />
1414
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
16-
<Compile Include="System.Data.Common.netcoreapp.cs"/>
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
19-
<Reference Include="mscorlib" />
20-
<Reference Include="System" />
21-
<Reference Include="System.Data" />
22-
<Reference Include="System.Transactions" />
23-
<Reference Include="System.Xml" />
24-
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
15+
<ItemGroup>
2616
<ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" />
2717
<ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" />
2818
<ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" />

src/System.Data.Common/ref/System.Data.Common.netcoreapp.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/System.Data.Common/src/MatchingRefApiCompatBaseline.uap.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
Compat issues with assembly System.Data.Common:
22
TypesMustExist : Type 'System.Data.DataCommonEventSource' does not exist in the implementation but it does exist in the contract.
3-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.GetProviderInvariantNames()' does not exist in the implementation but it does exist in the contract.
4-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.RegisterFactory(System.String, System.Data.Common.DbProviderFactory)' does not exist in the implementation but it does exist in the contract.
5-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.RegisterFactory(System.String, System.String)' does not exist in the implementation but it does exist in the contract.
6-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.RegisterFactory(System.String, System.Type)' does not exist in the implementation but it does exist in the contract.
7-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.TryGetFactory(System.String, System.Data.Common.DbProviderFactory)' does not exist in the implementation but it does exist in the contract.
8-
MembersMustExist : Member 'System.Data.Common.DbProviderFactories.UnregisterFactory(System.String)' does not exist in the implementation but it does exist in the contract.
9-
Total Issues: 7

src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.netcoreapp2.0.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.netcoreapp.txt renamed to src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt

File renamed without changes.

src/System.Data.SqlClient/src/MatchingRefApiCompatBaseline.netstandard.txt renamed to src/System.Data.SqlClient/src/MatchingRefApiCompatBaseline.txt

File renamed without changes.

0 commit comments

Comments
 (0)