The Wayback Machine - https://web.archive.org/web/20201215054040/https://github.com/github/VisualStudio/pull/992
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 2.2.0.11 into master #992

Merged
merged 13 commits into from May 24, 2017
Merged

Merge 2.2.0.11 into master #992

merged 13 commits into from May 24, 2017

Conversation

@paladique
Copy link
Collaborator

@paladique paladique commented May 12, 2017

2.2.0.11 was released earlier this week. These changes should be merged to master.

grokys and others added 12 commits Apr 26, 2017
Use Timer instead of DispatcherTimer in usage tracker. Because
`TimerTick` does IO, we should be running on a b/g thread.
We're getting a lot of reports of failed logins, and looking at the logs
it appears that using a token immediately after it's given out can fail.
Add a delay of 1s (I tried less but this seems to give the best results)
before reading `/user` after authorization.
Add a delay to the login process.
…o-only

Show docs in GitHub repo only
Use Timer in usage tracker.
Jasmine
@paladique paladique requested review from shana and grokys May 12, 2017
@shana
shana approved these changes May 24, 2017
Copy link
Collaborator

@shana shana left a comment

Looks good, just needed a minor tweak to the version, the merge duplicated attributes in the csproj (not uncommon on these types of merges)

@shana shana merged commit 293ddd5 into master May 24, 2017
3 of 5 checks passed
3 of 5 checks passed
continuous-integration/appveyor/branch Waiting for AppVeyor build to complete
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
GitHub CLA @paladique has accepted the GitHub Contributor License Agreement.
Details
VisualStudio Build #6744700 succeeded in 96s
Details
jenkins/build_log Jenkins Build Log
Details
@shana shana deleted the merge-2.2.0.11 branch May 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.