Skip to content

Commit f494982

Browse files
author
Greg Van Liew
authored
Merge pull request #267 from Microsoft/master
merge master to live
2 parents 6739b8b + 0da1101 commit f494982

32 files changed

+1409
-2824
lines changed

docs/extensibility/TOC.md

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# [How to: Migrate Extensibility Projects to Visual Studio 2017](how-to-migrate-extensibility-projects-to-visual-studio-2017.md)
1313
# [What's New in the Visual Studio 2015 SDK](what-s-new-in-the-visual-studio-2015-sdk.md)
1414
# [How to: Migrate Extensibility Projects to Visual Studio 2015](how-to-migrate-extensibility-projects-to-visual-studio-2015.md)
15-
# [FAQ: Converting Add-ins to VSPackage Extensions](faq-converting-add-ins-to-vspackage-extensions.md)
1615
# [Extending Menus and Commands](extending-menus-and-commands.md)
1716
## [Creating an Extension with a Menu Command](creating-an-extension-with-a-menu-command.md)
1817
## [Adding a Menu to the Visual Studio Menu Bar](adding-a-menu-to-the-visual-studio-menu-bar.md)
@@ -174,17 +173,16 @@
174173
# [Visual Studio User Experience Guidelines](ux-guidelines/TOC.md)
175174
# [Addressing DPI Issues](addressing-dpi-issues2.md)
176175
# [Image Service and Catalog](image-service-and-catalog.md)
177-
# [Managing Multiple Threads in Managed Code](managing-multiple-threads-in-managed-code.md)
178176
# [Using and Providing Services](using-and-providing-services.md)
179177
## [How to: Get a Service](how-to-get-a-service.md)
180178
## [How to: Provide a Service](how-to-provide-a-service.md)
181179
## [How to: Provide an Asynchronous Visual Studio Service](how-to-provide-an-asynchronous-visual-studio-service.md)
182180
## [How to: Troubleshoot Services](how-to-troubleshoot-services.md)
183-
# [Extending Connected Services](extending-connected-services.md)
184181
# [Managing VSPackages](managing-vspackages.md)
185182
## [The Experimental Instance](the-experimental-instance.md)
186183
## [Registering and Unregistering VSPackages](registering-and-unregistering-vspackages.md)
187184
## [Loading VSPackages](loading-vspackages.md)
185+
## [How to: Managing Multiple Threads in Managed Code](managing-multiple-threads-in-managed-code.md)
188186
## [How to: Use AsyncPackage to Load VSPackages in the Background](how-to-use-asyncpackage-to-load-vspackages-in-the-background.md)
189187
## [How to: Use Rule-based UI Context for Visual Studio Extensions](how-to-use-rule-based-ui-context-for-visual-studio-extensions.md)
190188
## [How to: Diagnose extension performance](how-to-diagnose-extension-performance.md)
@@ -236,54 +234,6 @@
236234
#### [Managing Side-by-Side File Associations](managing-side-by-side-file-associations.md)
237235
# [Inside the Visual Studio SDK](internals/TOC.md)
238236
# [Support for the Visual Studio SDK](support-for-the-visual-studio-sdk.md)
239-
# [Archive](archive.md)
240-
## [Legacy Interfaces in the Editor](legacy-interfaces-in-the-editor.md)
241-
### [Adapting Legacy Code to the Editor](adapting-legacy-code-to-the-editor.md)
242-
### [New or Changed Behavior with Editor Adapters](new-or-changed-behavior-with-editor-adapters.md)
243-
### [Inside the Core Editor](inside-the-core-editor.md)
244-
### [Instantiating the Core Editor By Using the Legacy API](instantiating-the-core-editor-by-using-the-legacy-api.md)
245-
### [Editor Factories](editor-factories.md)
246-
### [How to: Register Editor File Types](how-to-register-editor-file-types.md)
247-
### [Walkthrough: Creating a Core Editor and Registering an Editor File Type](walkthrough-creating-a-core-editor-and-registering-an-editor-file-type.md)
248-
### [How to: Provide Context for Editors](how-to-provide-context-for-editors.md)
249-
### [Language Services and the Core Editor](language-services-and-the-core-editor.md)
250-
#### [Providing a Language Service Context by Using the Legacy API](providing-a-language-service-context-by-using-the-legacy-api.md)
251-
#### [IntelliSense Hosting](intellisense-hosting.md)
252-
#### [Contained Languages](contained-languages.md)
253-
### [Accessing the Text Buffer by Using the Legacy API](accessing-the-text-buffer-by-using-the-legacy-api.md)
254-
#### [Text Buffer Events in the Legacy API](text-buffer-events-in-the-legacy-api.md)
255-
#### [How to: Register for Text Buffer Events with the Legacy API](how-to-register-for-text-buffer-events-with-the-legacy-api.md)
256-
### [Accessing theText View by Using the Legacy API](accessing-thetext-view-by-using-the-legacy-api.md)
257-
#### [Changing View Settings by Using the Legacy API](changing-view-settings-by-using-the-legacy-api.md)
258-
#### [Using the Text Manager to Monitor Global Settings](using-the-text-manager-to-monitor-global-settings.md)
259-
### [Customizing Code Windows by Using the Legacy API](customizing-code-windows-by-using-the-legacy-api.md)
260-
#### [How to: Host An Editor in Another Editor](how-to-host-an-editor-in-another-editor.md)
261-
#### [How to: Fire Events When the Editor Loses Focus](how-to-fire-events-when-the-editor-loses-focus.md)
262-
### [Accessing Text Layers by Using the Legacy API](accessing-text-layers-by-using-the-legacy-api.md)
263-
### [Using Text Markers with the Legacy API](using-text-markers-with-the-legacy-api.md)
264-
#### [How to: Add Standard Text Markers](how-to-add-standard-text-markers.md)
265-
#### [How to: Implement Error Markers](how-to-implement-error-markers.md)
266-
#### [How to: Create Custom Text Markers](how-to-create-custom-text-markers.md)
267-
#### [How to: Use Text Markers](how-to-use-text-markers.md)
268-
### [Customizing Editor Controls and Menus by Using the Legacy API](customizing-editor-controls-and-menus-by-using-the-legacy-api.md)
269-
#### [Drop-down Bar](drop-down-bar.md)
270-
#### [Command Handling](command-handling.md)
271-
#### [Context Menus](context-menus.md)
272-
#### [How to: Update the Status Bar](how-to-update-the-status-bar.md)
273-
### [Managing Undo and Redo by Using the Legacy API](managing-undo-and-redo-by-using-the-legacy-api.md)
274-
#### [How to: Implement Undo Management](how-to-implement-undo-management.md)
275-
#### [How to: Clear the Undo Stack](how-to-clear-the-undo-stack.md)
276-
#### [How to: Use Linked Undo Management](how-to-use-linked-undo-management.md)
277-
### [How to: Implement the Find and Replace Mechanism](how-to-implement-the-find-and-replace-mechanism.md)
278-
### [How to: Suppress File Change Notifications](how-to-suppress-file-change-notifications.md)
279-
### [Using Fonts and Colors](using-fonts-and-colors.md)
280-
#### [Font and Color Overview](font-and-color-overview.md)
281-
#### [Getting Font and Color Information for Text Colorization](getting-font-and-color-information-for-text-colorization.md)
282-
#### [Accessing Stored Font and Color Settings](accessing-stored-font-and-color-settings.md)
283-
#### [Implementing Custom Categories and Display Items](implementing-custom-categories-and-display-items.md)
284-
#### [How to: Access the Built-in Fonts and Color Scheme](how-to-access-the-built-in-fonts-and-color-scheme.md)
285-
## [Tool Windows in the Registry](tool-windows-in-the-registry.md)
286-
### [Tool Window Display Configuration](tool-window-display-configuration.md)
287237
# [Visual Studio SDK Reference](visual-studio-sdk-reference.md)
288238
## [IntelliSenseHostFlags](intellisensehostflags.md)
289239
## [VSCT XML Schema Reference](vsct-xml-schema-reference.md)
@@ -401,4 +351,3 @@
401351
# [.NET Compiler Platform ("Roslyn") Extensibility](dotnet-compiler-platform-roslyn-extensibility.md)
402352
## [Getting Started with Roslyn Analyzers](getting-started-with-roslyn-analyzers.md)
403353
## [Roslyn Analyzers and Code-aware Library for ImmutableArrays](roslyn-analyzers-and-code-aware-library-for-immutablearrays.md)
404-
# [Enabling the Azure SDK](enabling-the-azure-sdk.md)

docs/extensibility/enabling-the-azure-sdk.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

docs/extensibility/extending-connected-services.md

Lines changed: 0 additions & 31 deletions
This file was deleted.

docs/extensibility/extensibility-in-visual-studio.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,4 @@ Visual Studio gives you a lot of extensibility options. You can create your own
3535
Find out how to create, package, and deploy your own platform and extension SDKs: [Creating a Software Development Kit](../extensibility/creating-a-software-development-kit.md).
3636

3737
## Roslyn Extensibility
38-
Find out how to use Roslyn for extensibility: [.NET Compiler Platform ("Roslyn") Extensibility](../extensibility/dotnet-compiler-platform-roslyn-extensibility.md).
39-
40-
## Azure SDK
41-
Find out how to enable the Azure SDK: [Enabling the Azure SDK](../extensibility/enabling-the-azure-sdk.md).
38+
Find out how to use Roslyn for extensibility: [.NET Compiler Platform ("Roslyn") Extensibility](../extensibility/dotnet-compiler-platform-roslyn-extensibility.md).

docs/extensibility/managing-multiple-threads-in-managed-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Managing Multiple Threads in Managed Code | Microsoft Docs"
2+
title: "How to: Managing Multiple Threads in Managed Code | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
@@ -27,7 +27,7 @@ translation.priority.mt:
2727
- "zh-cn"
2828
- "zh-tw"
2929
---
30-
# Managing Multiple Threads in Managed Code
30+
# How to: Managing Multiple Threads in Managed Code
3131
If you have a managed VSPackage extension that calls asynchronous methods or has operations that execute on threads other than the Visual Studio UI thread, you should follow the guidelines given below. You can keep the UI thread responsive because it doesn’t need to wait for work on another thread to complete. You can make your code more efficient, because you don’t have extra threads that take up stack space, and you can make it more reliable and easier to debug because you avoid deadlocks and hangs.
3232

3333
In general, you can switch from the UI thread to a different thread, or vice versa. When the method returns, the current thread is the thread from which it was originally called.
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# [Visual Studio User Experience Guidelines](visual-studio-user-experience-guidelines.md)
2-
## [UX Essentials for Visual Studio](ux-essentials-for-visual-studio.md)
3-
## [Fonts and Formatting for Visual Studio](fonts-and-formatting-for-visual-studio.md)
4-
## [Colors and Styling for Visual Studio](colors-and-styling-for-visual-studio.md)
5-
### [Shared Colors for Visual Studio](shared-colors-for-visual-studio.md)
6-
## [Images and Icons for Visual Studio](images-and-icons-for-visual-studio.md)
7-
### [Visual Language Dictionary for Visual Studio](visual-language-dictionary-for-visual-studio.md)
8-
## [Menus and Commands for Visual Studio](menus-and-commands-for-visual-studio.md)
9-
## [Interaction Patterns for Visual Studio](interaction-patterns-for-visual-studio.md)
10-
### [Application Patterns for Visual Studio](application-patterns-for-visual-studio.md)
11-
### [Common Control Patterns for Visual Studio](common-control-patterns-for-visual-studio.md)
12-
### [Composite Patterns for Visual Studio](composite-patterns-for-visual-studio.md)
13-
## [UI Text and Help for Visual Studio](ui-text-and-help-for-visual-studio.md)
14-
## [Layout for Visual Studio](layout-for-visual-studio.md)
15-
## [Notifications and Progress for Visual Studio](notifications-and-progress-for-visual-studio.md)
16-
## [Animations for Visual Studio](animations-for-visual-studio.md)
17-
## [Evaluation Tools for Visual Studio](evaluation-tools-for-visual-studio.md)
2+
# [UX Essentials for Visual Studio](ux-essentials-for-visual-studio.md)
3+
# [Fonts and Formatting for Visual Studio](fonts-and-formatting-for-visual-studio.md)
4+
# [Colors and Styling for Visual Studio](colors-and-styling-for-visual-studio.md)
5+
## [Shared Colors for Visual Studio](shared-colors-for-visual-studio.md)
6+
# [Images and Icons for Visual Studio](images-and-icons-for-visual-studio.md)
7+
## [Visual Language Dictionary for Visual Studio](visual-language-dictionary-for-visual-studio.md)
8+
# [Menus and Commands for Visual Studio](menus-and-commands-for-visual-studio.md)
9+
# [Interaction Patterns for Visual Studio](interaction-patterns-for-visual-studio.md)
10+
## [Application Patterns for Visual Studio](application-patterns-for-visual-studio.md)
11+
## [Common Control Patterns for Visual Studio](common-control-patterns-for-visual-studio.md)
12+
## [Composite Patterns for Visual Studio](composite-patterns-for-visual-studio.md)
13+
# [UI Text and Help for Visual Studio](ui-text-and-help-for-visual-studio.md)
14+
# [Layout for Visual Studio](layout-for-visual-studio.md)
15+
# [Notifications and Progress for Visual Studio](notifications-and-progress-for-visual-studio.md)
16+
# [Animations for Visual Studio](animations-for-visual-studio.md)
17+
# [Evaluation Tools for Visual Studio](evaluation-tools-for-visual-studio.md)

docs/extensibility/visual-studio-sdk.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ The Visual Studio SDK helps you extend Visual Studio features or integrate new f
100100
[Extending Properties and the Property Window](../extensibility/extending-properties-and-the-property-window.md)
101101
[Extending Other Parts of Visual Studio](../extensibility/extending-other-parts-of-visual-studio.md)
102102
[Using and Providing Services](../extensibility/using-and-providing-services.md)
103-
[Extending Connected Services](../extensibility/extending-connected-services.md)
104103
[Managing VSPackages](../extensibility/managing-vspackages.md)
105104
[Visual Studio Isolated Shell](../extensibility/visual-studio-isolated-shell.md)
106105
[Shipping Visual Studio Extensions](../extensibility/shipping-visual-studio-extensions.md)

docs/install/use-command-line-parameters-to-install-visual-studio.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ If no command is specified, it will install the product.
6666
| ```--nickname <name>``` | Optional: This defines the nickname to assign to an installed product. The nickname cannot be longer than 10 characters. |
6767
| ```--help, --?, -h, -?``` | Display parameter usage. |
6868

69+
>Note: When specifying multiple workloads and components, you must repeat the `--add` or `--remove` command line switch for each item.
70+
6971
| **Advanced command-line option** | **Description** |
7072
| ----------------------- | --------------- |
7173
| ```--channelId <id>``` | Optional: The ID of the channel for the instance that will be installed. This is required for the install command, ignored for other commands if --installPath is specified. |

scripting-docs/TOC.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# [chakra-hosting](chakra-hosting\TOC.md)
2-
# [javascript](javascript\TOC.md)
3-
# [advanced](javascript\advanced\TOC.md)
4-
# [misc](javascript\misc\TOC.md)
5-
# [reference](javascript\reference\TOC.md)
6-
# [jswinrt](jswinrt\TOC.md)
7-
# [winscript](winscript\TOC.md)
8-
# [reference](winscript\reference\TOC.md)
1+
# [JavaScript](javascript\TOC.md)
2+
# [JavaScript and the Windows Runtime](jswinrt\TOC.md)
3+
# [JavaScript Runtime](chakra-hosting\TOC.md)
4+
# [Windows Script](winscript\TOC.md)

scripting-docs/_breadcrumb/toc.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
- name: Docs
2+
tocHref: /
3+
topicHref: /
4+
items:
5+
- name: Scripting
6+
tocHref: /script/
7+
topicHref: /script
8+
items:
9+
- name: JavaScript
10+
tocHref: /script/javascript
11+
topicHref: /script/javascript/javascript-language-reference
12+
items:
13+
- name: Advanced
14+
tocHref: /script/javascript/advanced/
15+
topicHref: /script/javascript/advanced/advanced-javascript
16+
- name: Reference
17+
tocHref: /script/javascript/reference/
18+
topicHref: /script/javascript/reference/javascript-reference
19+
- name: Windows Scripting Interfaces
20+
tocHref: /script/winscript/
21+
topicHref: /script/winscript/windows-scripting-interfaces
22+
items:
23+
- name: Reference
24+
tocHref: /script/winscript/reference
25+
topicHref: /script/winscript/reference/windows-script-interfaces-reference
26+
- name: JavaScript Runtime Hosting
27+
tocHref: /script/chakra-hosting/
28+
topicHref: /script/chakra-hosting/javascript-runtime-hosting
29+
- name: Windows Runtime
30+
tocHref: /script/jswinrt
31+
topicHref: /script/jswinrt/using-the-windows-runtime-in-javascript
32+

0 commit comments

Comments
 (0)