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

Merge common code bases for TdsParserStateObject.cs #1520

Merged
merged 20 commits into from
Nov 10, 2022
Merged

Merge common code bases for TdsParserStateObject.cs #1520

merged 20 commits into from
Nov 10, 2022

Commits on Feb 21, 2022

  1. Merging common fields, properties and types of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    22c25f5 View commit details
    Browse the repository at this point in the history

  2. Merging common type NullBitmap of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    4ec17f6 View commit details
    Browse the repository at this point in the history

  3. Merging a few methods of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    de83b8d View commit details
    Browse the repository at this point in the history

  4. Merging constructor of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    d15a7d3 View commit details
    Browse the repository at this point in the history

  5. Merging some methods of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    927e4a6 View commit details
    Browse the repository at this point in the history

  6. Merging ObjectID property of TdsParserStateObject.

    @panoskj
    panoskj committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    2c81d54 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Merge remote-tracking branch 'upstream/main' into MergeTdsParserState… 

    …Object

# Conflicts:
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
    @DavoudEshtehari
    DavoudEshtehari committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    72d8e54 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merging some methods of TdsParserStateObject (note: ports part of dot… 

    …net#1060 from netcore to common file).
    @panoskj
    panoskj committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    417a6da View commit details
    Browse the repository at this point in the history

  2. Merging some methods of TdsParserStateObject (note: uses some #if dir… 

    …ectives).
    @panoskj
    panoskj committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    b8eb31d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Merge branch 'main' into MergeTdsParserStateObject 

    # Conflicts:
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
    @panoskj
    panoskj committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    c145b8d View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge branch 'main' into MergeTdsParserStateObject 

    # Conflicts:
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    ed279eb View commit details
    Browse the repository at this point in the history

  2. TdsParserStateObject: Fixed naming rules violations.

    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    4e6ed9a View commit details
    Browse the repository at this point in the history

  3. TdsParserStateObject: Removed unnecessary assignments. Used discard t… 

    …o ignore out parameters, instead of an unused variable.
    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    315acb1 View commit details
    Browse the repository at this point in the history

  4. TdsParserStateObject: Simplified names.

    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    87f0cba View commit details
    Browse the repository at this point in the history

  5. TdsParserStateObject: Simplified default expression.

    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    d71028b View commit details
    Browse the repository at this point in the history

  6. TdsParserStateObject: Removed unnecessary casts.

    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    3e05aeb View commit details
    Browse the repository at this point in the history

  7. TdsParserStateObject: Replaced var usages with explicit types.

    @panoskj
    panoskj committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    58ae136 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Apply suggestions from code review 

    Co-authored-by: Lawrence Cheung <31262254+lcheunglci@users.noreply.github.com>
    @DavoudEshtehari @lcheunglci
    DavoudEshtehari and lcheunglci committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    5eb4a61 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into MergeTdsParserState… 

    …Object
    @DavoudEshtehari
    DavoudEshtehari committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    f75d911 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Address comments

    @DavoudEshtehari
    DavoudEshtehari committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    0b4c345 View commit details
    Browse the repository at this point in the history