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 for TdsEnums.cs #1483

Merged
merged 29 commits into from
Apr 6, 2022
Merged

Move to Shared for TdsEnums.cs #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b1d3720
Add test coverage to SqlCollation for FirstSupportedCollationVersion …
lcheunglci Oct 25, 2021
92897eb
Merge branch 'main' into Test-CodeCoverage
lcheunglci Oct 25, 2021
02a65c6
Add tests to SqlConnectionStringBuilder to all properties that throws…
lcheunglci Oct 26, 2021
16c0a64
Add a test cases for SqlClientLogger for code coverage
lcheunglci Oct 26, 2021
60172e4
Add code coverage for SqlClientFactory covering CreateDataSourceEnume…
lcheunglci Oct 26, 2021
296049b
Add tests to SqlParameterCollection for code coverage
lcheunglci Oct 27, 2021
2d57ffe
Add missing code coverage to SqlCommandSet
lcheunglci Oct 29, 2021
dfd6457
Merge branch 'main' into Test-CodeCoverage-part1
lcheunglci Nov 1, 2021
8b5ee21
remove unnecessary asserts
Nov 17, 2021
b0ba491
Update Microsoft.Data.SqlClient.csproj
Nov 17, 2021
7bce454
Merge remote-tracking branch 'upstream/main'
Nov 18, 2021
cd4aea7
Merge remote-tracking branch 'upstream/main'
Nov 23, 2021
2c09672
Merge remote-tracking branch 'upstream/main'
Nov 24, 2021
965ce94
Merge remote-tracking branch 'upstream/main'
Nov 24, 2021
7179deb
Merge remote-tracking branch 'upstream/main'
Nov 25, 2021
e67ad3f
Merge remote-tracking branch 'upstream/main'
Jan 4, 2022
b435719
Merge remote-tracking branch 'upstream/main'
Jan 17, 2022
ec1b93e
Merge remote-tracking branch 'upstream/main'
Jan 20, 2022
7230951
Merge netfx into netcore for TdsEnums.cs
lcheunglci Oct 21, 2021
11ae6b4
Move TdsEnums.cs from netcore to shared src and update references in …
lcheunglci Oct 21, 2021
7fd2b1f
Fix compiler error due to updated relative path to the documentation …
lcheunglci Oct 21, 2021
10b4e18
Update file to conform to coding style cleaning up IDE0090
lcheunglci Oct 21, 2021
68610dd
case typo in variable name
Jan 20, 2022
fc5f0b8
test new CI
Feb 16, 2022
847f669
Merge remote-tracking branch 'upstream/main' into merge-tdsenums
Feb 16, 2022
f8e6f2e
Update TdsEnums.cs
Feb 16, 2022
1a503a5
Revert "test new CI"
Feb 17, 2022
4db3f97
Merge remote-tracking branch 'upstream/main'
Mar 18, 2022
1d4a9ca
Merge branch 'main' into merge-tdsenums
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 @@ -457,6 +457,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUtil.cs">
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsEnums.cs">
<Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsParameterSetter.cs">
<Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
</Compile>
Expand Down Expand Up @@ -636,7 +639,6 @@
<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" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3596,7 +3596,7 @@ private bool TryProcessLoginAck(TdsParserStateObject stateObj, out SqlLoginAck s
}
_is2008 = true;
break;
case TdsEnums.SQl2012_MAJOR << 24 | TdsEnums.SQL2012_MINOR:
case TdsEnums.SQL2012_MAJOR << 24 | TdsEnums.SQL2012_MINOR:
if (increment != TdsEnums.SQL2012_INCREMENT)
{
throw SQL.InvalidTDSVersion();
Expand Down Expand Up @@ -8076,7 +8076,7 @@ internal void TdsLogin(SqlLogin rec, TdsEnums.FeatureExtension requestedFeatures
WriteInt(length, _physicalStateObj);
if (recoverySessionData == null)
{
WriteInt((TdsEnums.SQl2012_MAJOR << 24) | (TdsEnums.SQL2012_INCREMENT << 16) | TdsEnums.SQL2012_MINOR, _physicalStateObj);
WriteInt((TdsEnums.SQL2012_MAJOR << 24) | (TdsEnums.SQL2012_INCREMENT << 16) | TdsEnums.SQL2012_MINOR, _physicalStateObj);
}
else
{
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 @@ -524,6 +524,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUtil.cs">
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsEnums.cs">
<Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsParameterSetter.cs">
<Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
</Compile>
Expand Down Expand Up @@ -620,7 +623,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsEnums.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserSafeHandles.cs" />
Expand Down
Loading