Skip to content

Move into Shared SqlDependencyListener.cs #1308

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

Merged
merged 12 commits into from
Oct 18, 2021
Merged

Move into Shared SqlDependencyListener.cs #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c5790a
Merge the netfx to netcore for SqlDependencyListener.cs
lcheunglci Oct 4, 2021
28fc16c
Move the netcore version of SqlDependencyListener.cs to shared src an…
lcheunglci Oct 4, 2021
02615a3
Update the link reference in the netfx proj
lcheunglci Oct 4, 2021
060e79c
Update file to conform to coding style cleaning up IDE0044, IDE0090, …
lcheunglci Oct 4, 2021
c41a6e2
Apply suggestions from code review
lcheunglci Oct 5, 2021
0b62f8a
Resolve merge conflict with csprojs
lcheunglci Oct 8, 2021
4c9ccbf
Replace TryTraceEvent with TryNotificationTraceEvent from netfx
lcheunglci Oct 8, 2021
91e47e4
Merge branch 'main' into MergeShared-SqlDependencyListener
lcheunglci Oct 13, 2021
07730ee
Add a few 'new' expression simplification to address coding style
lcheunglci Oct 13, 2021
f99a83c
Resolve merge conflict due to the csproj
lcheunglci Oct 14, 2021
b2d21e2
Resolve merge conflict with csprojs
lcheunglci Oct 16, 2021
a21542f
Fix compiler error in netfx proj due to SingletonProcessDispatcher be…
lcheunglci Oct 16, 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 @@ -268,6 +268,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependencyListener.cs">
<Link>Microsoft\Data\SqlClient\SqlDependencyListener.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnums.cs">
<Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
</Compile>
Expand Down Expand Up @@ -554,7 +557,6 @@
<Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.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 @@ -351,6 +351,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependencyListener.cs">
<Link>Microsoft\Data\SqlClient\SqlDependencyListener.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 @@ -548,7 +551,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\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlError.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs" />
Expand Down
Loading