Merge from vscode 88ff4a7bdd9ad85ac8a44fafecdd9a103a6f8f28

[anthonydresser]

microsoft/vscode@88ff4a7 Fix microsoft/vscode#80525
microsoft/vscode@db358b5 Fixing a mismatch in default config for webviews
microsoft/vscode@5fc4fe2 Add resolveExternalUri embedder contribution point
microsoft/vscode@86baf83 Update distro
microsoft/vscode@7dd72f3 Merge pull request microsoft/vscode#81058 from microsoft/misolori/codicon-refs
microsoft/vscode@a62c6ee debt - add openExtensionDevelopmentHostWindow into IExtensionHostDebugService
microsoft/vscode@66a25a0 electron-main renames 💄
microsoft/vscode@945d678 uv_pipe_open error when starting code-insiders from WSL microsoft/vscode-remote-releasehttps://github.com/microsoft/vscode/issues/1420
microsoft/vscode@74bcfa3 🆙 distro
microsoft/vscode@99a7194 Remove svg reference
microsoft/vscode@7ecb582 debt - remove IWindowService#log in favor of a logger that can log to the main side
microsoft/vscode@36e6149 Merge pull request microsoft/vscode#81018 from microsoft/misolori/icon-font
microsoft/vscode@6fe6269 Keep better track of custom executions for reruns and depends
microsoft/vscode@e83d9d3 breakpoints: render candidates as decorations
microsoft/vscode@5cc2927 Introduce id and user data sync store registry
microsoft/vscode@50a0bd9 debug session: add breakpointLocations
microsoft/vscode@9e3d285 breakpoints: interaction on inline breakpoint decorations
microsoft/vscode@a8d5382 debt - more platform/electron-main cleanup
microsoft/vscode@19fed1d Include tooltip on custom tree item icon
microsoft/vscode@3e43911 debt - clean up platform/electron-main (part 1)
microsoft/vscode@96bf508 Move remote dialog local commands into remoteFileDialog.ts
microsoft/vscode@09daf88 Move remote file dialog local commands to electron browser
microsoft/vscode@f8c9cc7 Move TreeView message API to stable
microsoft/vscode@703480e breakpoints: introduce InlineBreakpointWidget
microsoft/vscode@2105bce debt - introduce electron service and adopt for showMessageBox
microsoft/vscode@4aa94e2 remove unused import
microsoft/vscode@227cebf fixes microsoft/vscode#80671
microsoft/vscode@136600a miss compilation
microsoft/vscode@d8d6c2d 🆙 chokidar@3 (microsoft/vscode#81028)
microsoft/vscode@c38aea3 remote invalid import
microsoft/vscode@b29d983 💄
microsoft/vscode@d3e1143 Move user data sync service to platform
microsoft/vscode@849034f electron - fix deprecation warning (accessibility)
microsoft/vscode@753de26 debt - remove some internal commands
microsoft/vscode@08a5964 web - change API to URI (from UriComponents)
microsoft/vscode@bdd1971 🆙 distro
microsoft/vscode@2320972 Revert "Move user data sync service to platform"
microsoft/vscode@a6c689d Revert ":lipstick:"
microsoft/vscode@d54dbd3 Add icon for image preview ext
microsoft/vscode@73fdbc9 Fix another bad import
microsoft/vscode@7eb3558 Address link protection feedbacks
microsoft/vscode@7a9dfd3 💄
microsoft/vscode@0772a8f Move user data sync service to platform
microsoft/vscode@e9e726f handle conflicts outside synchroniser
microsoft/vscode@2d6ab9c Fix-80080 Show more detailed error message for "Regex parse error" in search (microsoft/vscode#80495)
microsoft/vscode@50568aa Fix merge conflict
microsoft/vscode@8b22e02 move user data sync store service to platform
microsoft/vscode@1ee616d Don't duplicate external webview commit in so many places
microsoft/vscode@04da82c Let webview editors show in diff original view too
microsoft/vscode@1961739 adopt new terminal API
microsoft/vscode@44eb607 extract settings merge as a service
microsoft/vscode@4e0de7c web connection
microsoft/vscode@316fd80 remove docIndex in markdown language extension (microsoft/vscode#80933)
microsoft/vscode@5bca175 JSONEditingService: update multiple value
microsoft/vscode@8fbdeb7 move user data sync services to platform
microsoft/vscode@d26e39b 💄 tests
microsoft/vscode@4ace80e debug: move all breakpoint editor decoration to breakpointEditorContribution
microsoft/vscode@aa1e292 Prevent back/forward gestures on macos
microsoft/vscode@449b87d Fixes microsoft/vscode#80985: Language Pack import add ./build folder to internal LP structure.
microsoft/vscode@0070dab Update cpp grammar and add test
microsoft/vscode@8ac1c0b Support code-workspace files coming from a file system provider
microsoft/vscode@bc93368 Fixes microsoft/vscode#80826: Do not update the find widget's layout when it is off-DOM
microsoft/vscode@a63cf6c product - guard against bad usage
microsoft/vscode@8405574 🆙 distro
microsoft/vscode@ee78abc 🆙 distro
microsoft/vscode@8601a47 Update cpp grammar to handle macros (microsoft/vscode#80974)
microsoft/vscode@1c01ce8 Refactor extHostTask (microsoft/vscode#80970)
microsoft/vscode@dac9343 web - use product service for help actions
microsoft/vscode@41d8480 🆙 distro
microsoft/vscode@93bb67d debt - use common/product over node/product
microsoft/vscode@e433ca6 debt - browser/product => common/product
microsoft/vscode@fd32392 debt - common/product => common/productService
microsoft/vscode@8a992a2 web - export types from API
microsoft/vscode@b9bf66b web - limit workspace actions
microsoft/vscode@177b8b1 move registration of remote file commands to remote.contribution.ts
microsoft/vscode@5e1179f web - move help actions to browser
microsoft/vscode@1d072c6 web - move surveys to browser
microsoft/vscode@e81ee53 web - move welcome to browser
microsoft/vscode@cb4775a Fixes microsoft/vscode#80725: Fix renderFinalNewline for wrapped files
microsoft/vscode@b644486 debt - a bit more strict init
microsoft/vscode@d157c2e Fix cyclic deps
microsoft/vscode@f910a50 Fix linting error
microsoft/vscode@75631b1 Merge pull request microsoft/vscode#80951 from microsoft/pine/link-protection
microsoft/vscode@0994854 Merge pull request microsoft/vscode#80801 from orta/capital_S
microsoft/vscode@57f4855 Fix microsoft/vscode#80667
microsoft/vscode@d378003 Revert "Revert "Merge pull request microsoft/vscode#80657 from KapitanOczywisty/patch-1"" CLA signed, bring back PR
microsoft/vscode@0e8a10a Revert "Merge pull request microsoft/vscode#80657 from KapitanOczywisty/patch-1"
microsoft/vscode@ea10827 Merge pull request microsoft/vscode#80657 from KapitanOczywisty/patch-1
microsoft/vscode@9f2d08e update doc
microsoft/vscode@3fe9a42 show sync actions in a separate group above update
microsoft/vscode@317ed7e Merge branch 'master' into sandy081/userDataProvider
microsoft/vscode@4ffcfff prepare to merge to master
microsoft/vscode@b3771f1 Improve sync: - Push when there is a change - Pull at regular intervals (5s)
microsoft/vscode@2cc4781 Fix merging: Do not sync if there are no changes
microsoft/vscode@5d40163 Improve continuous sync
microsoft/vscode@3aba6f7 run sync every 500 ms
microsoft/vscode@0916449 remote async
microsoft/vscode@94a9d45 remove comments
microsoft/vscode@89281a0 💄
microsoft/vscode@67c2a32 simplify user data contributions
microsoft/vscode@7ba67ee rename setting to enableSync
microsoft/vscode@0843e1e simplify sync commands
microsoft/vscode@b59d0cf improvements to settings sync
microsoft/vscode@0ebe7ec start and stop sync commands
microsoft/vscode@0c23717 add todo
microsoft/vscode@328672c Merge always when remote has moved forward
microsoft/vscode@93aeba0 stop sync when turned off
microsoft/vscode@88bf57b Implement start and stop sync commands
microsoft/vscode@fcffaba add trailing comma to the remote change
microsoft/vscode@889c7a8 Accept and sync changes
microsoft/vscode@2b5da56 fix compilation
microsoft/vscode@c471430 error handling
microsoft/vscode@2253cbf Do not show settings preview in recently opened list
microsoft/vscode@cabde66 Use in memory fs provider to show conflicts
microsoft/vscode@88e5a18 Use ref instead of version
microsoft/vscode@eb55f59 fix conflict detection
microsoft/vscode@165f2b0 Add command to resolve conflicts
microsoft/vscode@cf0d5ff show merge syntax for conflicts
microsoft/vscode@e089dde improve settings preview result - settings preview mode - Check for local and remote changes
microsoft/vscode@c675e94 fix sync action ids
microsoft/vscode@7e961eb fix auto sync
microsoft/vscode@e3bfd2c set auto sync delay to 5 minutes
microsoft/vscode@978ce82 Add user configuration section to settings
microsoft/vscode@4eff9f9 reset status
microsoft/vscode@d34ea68 fix auto sync
microsoft/vscode@3d9d3fe - contribute sync actions to global activity - implement status in settings sync - Implement user data sync service
microsoft/vscode@65f1449 Merge branch 'master' into sandy081/userDataProvider
microsoft/vscode@6d16d7a remove reference to non existing file
microsoft/vscode@63e24dd Merge branch 'master' into sandy081/userDataProvider
microsoft/vscode@be01168 support user data error handling
microsoft/vscode@cc0f391 fix compilation
microsoft/vscode@cae7f1c Merge branch 'master' into sandy081/userDataProvider
microsoft/vscode@c26e198 settings sync using remote user data service
microsoft/vscode@6706c17 fix calling proposed api
microsoft/vscode@8bcdb8a auto sync only when there is user data
microsoft/vscode@bc7e628 add imports
microsoft/vscode@3dc748c Merge branch 'master' into sandy081/userDataProvider
microsoft/vscode@10ae4b5 remove imports
microsoft/vscode@42d1bb1 sync status
microsoft/vscode@2be6618 fix satus bar entry
microsoft/vscode@f2eb88a use user data instead of identity
microsoft/vscode@15a59c2 update status entry location
microsoft/vscode@bb1866a User data sync: Implement starting flow - user identity - user login provider - user data provider - activation event - status bar UI

[anthonydresser]

@kburtram I think we should hold off on a merge until tomorrow, the build error is from vscode (they didn't release a insiders build today). Presumably they will fix it over night, or tomorrow.