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.

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

Merge master #5

Merged
merged 71 commits into from
Feb 11, 2021
Merged

Merge master #5

merged 71 commits into from
Feb 11, 2021

Conversation

johnnypham
Copy link

No description provided.

live1206 and others added 30 commits August 31, 2020 08:53
Also removed tests that compared error messages not owned by SqlClient.
* Set up CI with Azure Pipelines

[skip ci]

* Delete azure-pipelines.yml

* Set up CI with Azure Pipelines

[skip ci]

* Delete azure-pipelines.yml

* release notes for 2.1.0-preview2

* typos

* Update 2.1.0-preview2.md

* add fix

* update date

* Update release-notes/2.1/2.1.0-preview2.md

Co-authored-by: David Engel <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Cheena Malhotra <[email protected]>

* Update release-notes/2.1/2.1.0-preview2.md

Co-authored-by: Cheena Malhotra <[email protected]>

* Update release-notes/2.1/2.1.0-preview2.md

Co-authored-by: Cheena Malhotra <[email protected]>

* Update release-notes/2.1/2.1.0-preview2.md

Co-authored-by: Cheena Malhotra <[email protected]>

* Update release-notes/2.1/2.1.md

Co-authored-by: Cheena Malhotra <[email protected]>

* Update release-notes/2.1/README.md

Co-authored-by: Cheena Malhotra <[email protected]>

* update version

* add pr773

Co-authored-by: David Engel <[email protected]>
Co-authored-by: Cheena Malhotra <[email protected]>
karinazhou and others added 26 commits December 1, 2020 15:51
* Add release notes for AKV v1.2.0

* Add release notes for AKV v1.1.1

* Minor fix

* Apply suggestions from code review

Co-authored-by: David Engel <[email protected]>

Co-authored-by: David Engel <[email protected]>
…otnet#829)

For some reason, userId is coming as empty in this block, as reported in issue 815
…art 4 (dotnet#840)

* Add samples
Related to the next part of porting documents from .NET Framework documents.
* Move obsolete properties out

*  Asynchronous Processing
*  Context Connection

* Update src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
+  SqlClientFactory
)

* Addressing string.format problem

* Rerun the tests

* fix underline

Co-authored-by: jJRahnama <[email protected]>
@@ -60,7 +61,7 @@
<SystemDataOdbcVersion21>4.5.0</SystemDataOdbcVersion21>
<SystemDataOdbcVersion>4.6.0</SystemDataOdbcVersion>
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
<SystemIdentityModelTokensJwtVersion>5.6.0</SystemIdentityModelTokensJwtVersion>
<SystemIdentityModelTokensJwtVersion>6.8.0</SystemIdentityModelTokensJwtVersion>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This had to be upgraded because starting from 2.1.0, we now use version 6.8.0 of Microsoft.IdentityModel.Protocols.OpenIdConnect, which uses version 6.8.0 of System.IdentityModel.Tokens.Jwt, resulting in a package downgrade error at build.

@cheenamalhotra cheenamalhotra merged commit fc20e0c into cheenamalhotra:akv-upgrade Feb 11, 2021
@johnnypham johnnypham deleted the akv-upgrade branch March 2, 2021 01:45
cheenamalhotra pushed a commit that referenced this pull request Mar 15, 2021
* Add event counters

* Add support netstandard 2.1 & fix the conflict in event source

* Support new event source types & add the test unit

* Remove supporting obsolete types

* fix unit test

* Add snippet sample code

* Address comments

* Fix minor typo (#3)

* Reformatting counter methods

* Fix minor typo

* Removed IsEnabled condition and reformatted counter methods

* Unit tests for Microsoft.Data.SqlClient.SqlClientEventSource (#2)

* Implemented tests for Microsoft.Data.SqlClient.SqlClientEventSource

* Updated the EventCounter test to reflect the recent changes in the code

* Working on EventCounter tests access event counters through reflection

* Updated the EventCounterTest to use reflection

* Fixing dangling SqlConnection's left in tests

* EventCountersTest now checks hard/soft connects/disconnects counters

* Reverted the DataTestUtility changes

* Reverted using statements to the old-style in tests

* Reverted the ConnectionPoolTest.ReclaimEmancipatedOnOpenTest()

* Reverted using statements to the old-style in tests

* Reverted using statements to the old-style in tests

* Rewrite the EventCounterTest assertions not to conflict with other tests

* Code review cleanup

* Add more tests (#5)

Added EventCounter_ReclaimedConnectionsCounter_Functional & EventCounter_ConnectionPoolGroupsCounter_Functional tests.

* Address comments

Co-authored-by: Davoud Eshtehari <[email protected]>
Co-authored-by: Davoud Eshtehari <[email protected]>
Co-authored-by: Karina Zhou <[email protected]>
Co-authored-by: Nikita Kobzev <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants