Skip to content

Commit adce139

Browse files
benrr101benrr101
authored
Merge | Diagnostic Files (#3213)
* Move diagnostic files into common project in diagnostics folder * Add stubs for sqlcommand and sqlconnection (for sqldiagnostic work) * Splitting SqlClientDiagnostic.netcore.cs into one file per class * Put extension methods back in the listener class itself. * Decompose the extensions file into separate files for diagnostic scopes * Move remaining files to diagnostics namespace
1 parent f3ae72a commit adce139

27 files changed

+1810
-1506
lines changed

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

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,60 @@
176176
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
177177
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
178178
</Compile>
179+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.netcore.cs">
180+
<Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.netcore.cs</Link>
181+
</Compile>
182+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.netcore.cs">
183+
<Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.netcore.cs</Link>
184+
</Compile>
185+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.netcore.cs">
186+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.netcore.cs</Link>
187+
</Compile>
188+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.netcore.cs">
189+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.netcore.cs</Link>
190+
</Compile>
191+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.netcore.cs">
192+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.netcore.cs</Link>
193+
</Compile>
194+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.netcore.cs">
195+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.netcore.cs</Link>
196+
</Compile>
197+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.netcore.cs">
198+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.netcore.cs</Link>
199+
</Compile>
200+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.netcore.cs">
201+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.netcore.cs</Link>
202+
</Compile>
203+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.netcore.cs">
204+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.netcore.cs</Link>
205+
</Compile>
206+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.netcore.cs">
207+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.netcore.cs</Link>
208+
</Compile>
209+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.netcore.cs">
210+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.netcore.cs</Link>
211+
</Compile>
212+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.netcore.cs">
213+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.netcore.cs</Link>
214+
</Compile>
215+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.netcore.cs">
216+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.netcore.cs</Link>
217+
</Compile>
218+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.netcore.cs">
219+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.netcore.cs</Link>
220+
</Compile>
221+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.netcore.cs">
222+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.netcore.cs</Link>
223+
</Compile>
224+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.netcore.cs">
225+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.netcore.cs</Link>
226+
</Compile>
227+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.netcore.cs">
228+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.netcore.cs</Link>
229+
</Compile>
230+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.netcore.cs">
231+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.netcore.cs</Link>
232+
</Compile>
179233
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
180234
<Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
181235
</Compile>
@@ -662,16 +716,13 @@
662716
<Compile Include="Microsoft\Data\SqlClient\SNI\SSRP.cs" />
663717
<Compile Include="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />
664718
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
665-
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnostic.cs" />
666-
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
667719
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
668720
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
669721
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
670722
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
671723
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
672724
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
673725
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
674-
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.cs" />
675726
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
676727
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
677728
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />

0 commit comments

Comments
 (0)