Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Move to Shared for SqlDependency.cs #1299

Merged
merged 10 commits into from
Oct 15, 2021
Merged

Move to Shared for SqlDependency.cs #1299

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f040b9
Merge changes from netfx to netcore version of SqlDependency.cs
lcheunglci Sep 28, 2021
5dddc04
Merge missed ObtainProcessDispatcher method for netfx and fix compile…
lcheunglci Sep 28, 2021
e9c0afd
Move the netcore SqlDependency.cs to shared src and update references…
lcheunglci Sep 28, 2021
005915c
Fix the compiler error due to relative path changes to the documentation
lcheunglci Sep 28, 2021
948c8a0
Update the file to conform with coding style cleaning up IDE0044 and …
lcheunglci Sep 28, 2021
91a4f06
Merge branch 'dotnet:main' into MergeShared-SqlDependency
lcheunglci Sep 29, 2021
d5fd349
Remove the ifdefs for netfx only TraceEvent logs and clean up the usi…
lcheunglci Oct 1, 2021
1931e1f
Resolve merge conflict with the csprojs
lcheunglci Oct 8, 2021
a71c5a7
Add body expressions to some methods
lcheunglci Oct 13, 2021
5f51abd
Resolve merge conflict due to csproj
lcheunglci Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDataAdapter.cs">
<Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
Expand Down Expand Up @@ -519,7 +522,6 @@
<Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependency.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs" />
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDataAdapter.cs">
<Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
<Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
</Compile>
Expand Down Expand Up @@ -495,7 +498,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDataReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependency.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlEnums.cs" />
Expand Down
Loading