Skip to content

Commit 2385ca7

Browse files
authored
Merge | DbConnectionOptions (The Rest Of It) (#3388)
* Lazily merge the platform specific code into DbConnectionOptions.cs * Addressing @edwardneal's comments
1 parent 4a7f50d commit 2385ca7

File tree

6 files changed

+205
-304
lines changed

6 files changed

+205
-304
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,6 @@
802802
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
803803
</Compile>
804804

805-
<Compile Include="Microsoft\Data\Common\ConnectionString\DbConnectionOptions.netcore.cs" />
806805
<Compile Include="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />
807806
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
808807
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.netcore.cs

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,6 @@
950950
</Compile>
951951
</ItemGroup>
952952
<ItemGroup>
953-
<Compile Include="Microsoft\Data\Common\ConnectionString\DbConnectionOptions.netfx.cs" />
954953
<Compile Include="Microsoft\Data\Common\DBConnectionString.cs" />
955954
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
956955
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.netfx.cs

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

0 commit comments

Comments
 (0)