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

fix: electron update error #5573

Merged
merged 4 commits into from
Jan 22, 2021
Merged

fix: electron update error #5573

merged 4 commits into from
Jan 22, 2021

Conversation

zhixzhan
Copy link
Contributor

Description

We have a data race when user click "check for updates" with auto-update set to true, causing the updating fail (#5549).

This PR let manual-update can continue auto-update progress.

  1. if auto update is downloading, when click "check for updates" will show the progress.
  2. if auto update is downloaded, when click "check for updates" will show quit-and-start modal.

Task Item

close #5551

Screenshots

  1. When auto update is downloading.

3

  1. When auto update is downloaded.

1

@zhixzhan zhixzhan requested a review from tonyanziano January 21, 2021 03:08
@coveralls
Copy link

coveralls commented Jan 21, 2021 •
edited
Loading

Coverage Status

Coverage decreased (-0.0006%) to 55.085% when pulling c8fce0d on zhixzhan/electron-update into 1ed31e1 on main.

tonyanziano
tonyanziano suggested changes Jan 22, 2021
View reviewed changes
Copy link
Contributor

@tonyanziano tonyanziano left a comment

Choose a reason for hiding this comment

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

Aside from the visual bug in my comment, I think this looks good! Nice job

@zhixzhan zhixzhan requested a review from tonyanziano January 22, 2021 02:49
@zhixzhan zhixzhan merged commit d1269eb into main Jan 22, 2021
@zhixzhan zhixzhan deleted the zhixzhan/electron-update branch January 22, 2021 07:56
alanlong9278 added a commit that referenced this pull request Jan 25, 2021
@alanlong9278
Merge branch 'main' into julong/keyboard-err
40d4641 
* main:
  Update numberinput.dialog (#5575)
  fix hover display incorrect returntype (#5588)
  fix: Move persistence layer's delta computation into worker (#5563)
  fix: electron update error (#5573)
  fix: showing correct error message in local publish (#5509)
  feat: change source of packages from local feed to live npm/nuget feed (#5516)
  set max http header size to fix 431 (#5521)
  Updating to daily runtime for R12 development (#5529)
  fix: correctly generate l10n files when using zsh (#5555)
  chore: deprecate feature request issue template (#5378)
  fix: designPage navigation to settings Page url error (#5546)
  fix: luis\qna key missing in skill bot (#5545)
  delete trigger by projectId passed from projectTree (#5542)
This was referenced Mar 8, 2021
Closed
Closed
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@zhixzhan
fix: electron update error (microsoft#5573)
d438683 
* fix manual check update conflict with auto update

* pass version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonyanziano tonyanziano tonyanziano approved these changes

@a-b-r-o-w-n a-b-r-o-w-n Awaiting requested review from a-b-r-o-w-n

@beyackle beyackle Awaiting requested review from beyackle

@boydc2014 boydc2014 Awaiting requested review from boydc2014

@cwhitten cwhitten Awaiting requested review from cwhitten

@GeoffCoxMSFT GeoffCoxMSFT Awaiting requested review from GeoffCoxMSFT

@hatpick hatpick Awaiting requested review from hatpick

@srinaath srinaath Awaiting requested review from srinaath

Assignees

@tonyanziano tonyanziano

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Data race in auto updating vs manual updating
3 participants
@zhixzhan @coveralls @tonyanziano