Skip to content

Commit 1594cc5

Browse files
author
Javad Rahnama
authored
Merge common code base for DBReferenceCollection (#2403)
1 parent 0d45564 commit 1594cc5

File tree

4 files changed

+68
-315
lines changed

4 files changed

+68
-315
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbReferenceCollection.cs

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

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,9 @@
519519
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
520520
<Link>Common\System\Diagnostics\CodeAnalysis.cs</Link>
521521
</Compile>
522+
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
523+
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
524+
</Compile>
522525
</ItemGroup>
523526
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp' OR '$(IsUAPAssembly)' == 'true'">
524527
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
@@ -616,9 +619,6 @@
616619
<Compile Include="$(CommonPath)\Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
617620
<Link>Common\Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
618621
</Compile>
619-
<Compile Include="$(CommonPath)\Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
620-
<Link>Common\Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
621-
</Compile>
622622
<Compile Include="$(CommonPath)\System\NotImplemented.cs" />
623623
<Compile Include="Interop\SNINativeMethodWrapper.Common.cs" />
624624
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,9 @@
609609
<Compile Include="$(CommonSourceRoot)Resources\ResDescriptionAttribute.cs">
610610
<Link>Resources\ResDescriptionAttribute.cs</Link>
611611
</Compile>
612+
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
613+
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
614+
</Compile>
612615
</ItemGroup>
613616
<ItemGroup>
614617
<Compile Include="Common\src\Microsoft\Data\Common\NameValuePermission.cs" />
@@ -630,7 +633,6 @@
630633
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.cs" />
631634
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolCounters.cs" />
632635
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
633-
<Compile Include="Microsoft\Data\ProviderBase\DbReferenceCollection.cs" />
634636
<Compile Include="Microsoft\Data\RelationshipConverter.cs" />
635637
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.Cng.cs" />
636638
<Compile Include="Microsoft\Data\SqlClient\assemblycache.cs" />

0 commit comments

Comments
 (0)