Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Move to shared -SqlInternalTransaction #1346

Merged
merged 13 commits into from
Mar 9, 2022
Merged

Move to shared -SqlInternalTransaction #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e0ee6ea
Move to shared - SqlInternalTransaction
Kaur-Parminder Oct 13, 2021
1954d7d
Adding missed file update of netfx
Kaur-Parminder Oct 13, 2021
9d600dd
adding missing ;
Kaur-Parminder Oct 13, 2021
9d4f3f4
Merge branch 'dotnet:main' into CodeMergeSqlInternalTransaction
Kaur-Parminder Oct 13, 2021
aed5003
Addressed reviwer's comment
Kaur-Parminder Oct 18, 2021
f37391a
Resolving merge conflicts
Kaur-Parminder Oct 19, 2021
1a31178
Addressing Reviewer's comment
Kaur-Parminder Oct 19, 2021
ddd2689
merging from main
Kaur-Parminder Jan 13, 2022
0fc5bdf
review comments
Kaur-Parminder Jan 22, 2022
7aebf45
SNI Update
Kaur-Parminder Mar 7, 2022
e7931b5
Revert "SNI Update"
Kaur-Parminder Mar 7, 2022
855f69f
Merge branch 'dotnet:main' into main
Kaur-Parminder Mar 8, 2022
f9cb4e2
Merge branch 'main' into CodeMergeSqlInternalTransaction
Kaur-Parminder Mar 9, 2022
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 @@ -43,6 +43,9 @@
<Compile Include="..\..\src\Microsoft\Data\Sql\SqlNotificationRequest.cs">
<Link>Microsoft\Data\Sql\SqlNotificationRequest.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\Common\ActivityCorrelator.cs">
<Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
</Compile>
Expand Down Expand Up @@ -586,7 +589,6 @@
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.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 @@ -98,6 +98,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientLogger.cs">
<Link>Microsoft\Data\SqlClient\SqlClientLogger.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\Common\ActivityCorrelator.cs">
<Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
</Compile>
Expand Down Expand Up @@ -561,7 +564,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\sqlinternaltransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
Expand Down
Loading