Skip to content

Merge | SqlTransaction #3231

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

Merged
merged 14 commits into from
Mar 24, 2025
Merged

Merge | SqlTransaction #3231

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cf100eb
Create merge file
benrr101 Mar 11, 2025
d04c7de
Merging Commit method
benrr101 Mar 13, 2025
14ef8c1
Merge Dispose method
benrr101 Mar 13, 2025
6527dc7
Merge Rollback method w/o transaction name
benrr101 Mar 13, 2025
904b6dd
Merge Rollback method w/transaction name
benrr101 Mar 13, 2025
de99c30
Merge Save method
benrr101 Mar 13, 2025
e9eff97
Final touchups of merge
benrr101 Mar 13, 2025
a973214
Deleting old SqlTransaction files, adding references to the common pr…
benrr101 Mar 13, 2025
d5a004d
Move code from SqlTransaction.Common into the class
benrr101 Mar 13, 2025
4ae3b4b
Remove SqlTransaction.Common.cs
benrr101 Mar 13, 2025
d97f12b
Cleanup the transaction after adding back the common partial.
benrr101 Mar 13, 2025
83c810d
Remove some <2005 condition that no longer applies
benrr101 Mar 19, 2025
37fcfd5
Make Save match exception handling pattern the others are using
benrr101 Mar 20, 2025
a693933
Merge branch 'main' into dev/russellben/merge/sqltransaction
benrr101 Mar 20, 2025
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
7 changes: 3 additions & 4 deletions 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 @@ -620,15 +620,15 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
<Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.Common.cs">
<Link>Microsoft\Data\SqlClient\SqlTransaction.Common.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
</Compile>
Expand Down Expand Up @@ -724,7 +724,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.netcore.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
Expand Down
304 changes: 0 additions & 304 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlTransaction.cs
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions 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 @@ -550,9 +550,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.Common.cs">
<Link>Microsoft\Data\SqlClient\SqlTransaction.Common.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
</Compile>
Expand Down Expand Up @@ -793,6 +790,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
<Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -890,7 +890,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.netfx.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />
Expand Down
Loading
Loading