Skip to content

Move to shared-Sqlstream #1337

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 15 commits into from
Mar 9, 2022
Merged

Move to shared-Sqlstream #1337

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3bf2646
Move to shared-Sqlstream
Kaur-Parminder Oct 12, 2021
e8545bc
Addressing Reviewer's comment
Kaur-Parminder Oct 13, 2021
6d7fa59
Resolving conflicts
Kaur-Parminder Oct 13, 2021
368d60a
Updatig code to include adapterutil changes.
Kaur-Parminder Oct 13, 2021
af48d93
Merge branch 'dotnet:main' into CodeMergeSqlStream
Kaur-Parminder Oct 13, 2021
a569f05
Addressing reviewer's comment
Kaur-Parminder Oct 18, 2021
771a11f
resolving conflicts
Kaur-Parminder Oct 18, 2021
4e55c80
Merge branch 'dotnet:main' into CodeMergeSqlStream
Kaur-Parminder Jan 10, 2022
7c2838e
Merge branch 'dotnet:main' into CodeMergeSqlStream
Kaur-Parminder Jan 10, 2022
6d7181c
review comments
Kaur-Parminder Jan 10, 2022
1d18ece
resolve conflicts
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
a5d87ce
Merge branch 'main' into CodeMergeSqlStream
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 @@ -420,6 +420,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUtil.cs">
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStream.cs">
<Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\ResCategoryAttribute.cs">
<Link>Resources\ResCategoryAttribute.cs</Link>
</Compile>
Expand Down Expand Up @@ -583,7 +586,6 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUdtInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
Expand Down
25 changes: 17 additions & 8 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 @@ -234,6 +234,12 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStream.cs">
<Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
</Compile>
Expand All @@ -246,6 +252,15 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCredential.cs">
<Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUdtInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiEventSink.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink.cs</Link>
</Compile>
Expand Down Expand Up @@ -335,6 +350,7 @@
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
<SubType>Component</SubType>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
Expand Down Expand Up @@ -572,14 +588,7 @@
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUdtInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsEnums.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
Expand Down Expand Up @@ -699,4 +708,4 @@
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
</Project>
</Project>
Loading