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

Move to Shared SqlSequentialTextReader #1343

Merged
merged 15 commits into from
Apr 6, 2022
Merged

Move to Shared SqlSequentialTextReader #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
91c0848
Move to Shared SqlSeuentialTextReader
Kaur-Parminder Oct 13, 2021
f794388
Merge branch 'dotnet:main' into CodeMergeSqlSequentialTextReader
Kaur-Parminder Oct 13, 2021
c0de355
resolve conflicts
Kaur-Parminder Feb 3, 2022
71894f7
review comments
Kaur-Parminder Feb 3, 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
fa1a16c
Merge branch 'dotnet:main' into main
Kaur-Parminder Mar 10, 2022
d82be37
Merge branch 'dotnet:main' into main
Kaur-Parminder Mar 14, 2022
d0d0eb3
Merge branch 'dotnet:main' into main
Kaur-Parminder Mar 28, 2022
c49997a
Merge branch 'dotnet:main' into main
Kaur-Parminder Mar 28, 2022
3580f8e
Merge branch 'dotnet:main' into main
Kaur-Parminder Apr 4, 2022
c585b1c
review comments
Kaur-Parminder Apr 5, 2022
2483c0a
resolve conflicts
Kaur-Parminder Apr 5, 2022
b2624a0
removing duplicate file
Kaur-Parminder Apr 5, 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 @@ -171,6 +171,9 @@
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
<Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
<Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
<Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
Expand Down Expand Up @@ -633,7 +636,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsEnums.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 @@ -515,6 +515,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
<Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
<Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
</Compile>
Expand Down Expand Up @@ -616,7 +619,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
Expand Down
Loading