Skip to content

Commit 6c8cfa9

Browse files
committed
Merge common code base for SqlUtil.cs.
1 parent 9a71c94 commit 6c8cfa9

File tree

4 files changed

+516
-2717
lines changed

4 files changed

+516
-2717
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
</Compile>
9595
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
9696
<Link>Microsoft\Data\Common\NameValuePair.cs</Link>
97+
</Compile>
98+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\SqlUtil.cs">
99+
<Link>Microsoft\Data\Common\SqlUtil.cs.cs</Link>
97100
</Compile>
98101
<Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
99102
<Link>Microsoft\Data\DataException.cs</Link>
@@ -550,7 +553,7 @@
550553
</Compile>
551554
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
552555
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
553-
</Compile>
556+
</Compile>
554557
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.Common.cs">
555558
<Link>Microsoft\Data\SqlClient\SqlTransaction.Common.cs</Link>
556559
</Compile>
@@ -662,7 +665,6 @@
662665
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.cs" />
663666
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
664667
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
665-
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
666668
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
667669
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetCoreApp.cs" />
668670
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@
120120
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
121121
<Link>Microsoft\Data\Common\NameValuePair.cs</Link>
122122
</Compile>
123+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\SqlUtil.cs">
124+
<Link>Microsoft\Data\Common\SqlUtil.cs.cs</Link>
125+
</Compile>
123126
<Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
124127
<Link>Microsoft\Data\DataException.cs</Link>
125128
</Compile>
@@ -581,7 +584,7 @@
581584
</Compile>
582585
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
583586
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
584-
</Compile>
587+
</Compile>
585588
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsEnums.cs">
586589
<Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
587590
</Compile>
@@ -689,7 +692,6 @@
689692
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
690693
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
691694
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
692-
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
693695
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
694696
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
695697
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />

0 commit comments

Comments
 (0)