Merge pull request #3223 from MicrosoftDocs/master636930202929251143

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: gewarren

.openpublishing.redirection.json

@@ -1890,6 +1890,11 @@
             "redirect_url": "/visualstudio/install/create-an-offline-installation-of-visual-studio",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/modeling/customizing-presentation-on-the-diagram.md",
+            "redirect_url": "/visualstudio/modeling/defining-shapes-and-connectors",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/modeling/deploy-a-layer-model-extension.md",
             "redirect_url": "/visualstudio/modeling/deploy-a-layer-model-extension?view=vs-2015",
@@ -2075,14 +2080,34 @@
             "redirect_url": "/visualstudio/modeling/create-uml-modeling-projects-and-diagrams",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/modeling/working-with-domain-specific-language-solutions.md",
+            "redirect_url": "/visualstudio/modeling/about-domain-specific-languages",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/modeling/deploying-domain-specific-language-solutions.md",
+            "redirect_url": "/visualstudio/modeling/msi-and-vsix-deployment-of-a-dsl",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/modeling/navigate-the-uml-model.md",
             "redirect_url": "/visualstudio/modeling/create-uml-modeling-projects-and-diagrams",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/modeling/writing-user-commands-and-actions.md",
+            "redirect_url": "/visualstudio/modeling/how-to-modify-a-standard-menu-command-in-a-domain-specific-language",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/modeling/nesting-shapes.md",
-            "redirect_url": "/visualstudio/modeling/customizing-presentation-on-the-diagram",
+            "redirect_url": "/visualstudio/modeling/defining-shapes-and-connectors",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/modeling/properties-of-model-elements.md",
+            "redirect_url": "/visualstudio/modeling/properties-of-a-dsl-definition",
             "redirect_document_id": false
         },
         {
@@ -3325,6 +3350,16 @@
             "redirect_url": "/visualstudio/ide/whats-new-visual-studio-2019",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/workflow-designer/workflow-designer-ui-help.md",
+            "redirect_url": "/visualstudio/workflow-designer/browse-and-select-a-dotnet-type-dialog-box",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/workflow-designer/using-the-activity-designers.md",
+            "redirect_url": "/visualstudio/workflow-designer/control-flow-activity-designers",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/workflow-designer/activity-views-legacy.md",
             "redirect_url": "/visualstudio/workflow-designer/developing-applications-with-the-workflow-designer",

docs/modeling/add-commands-and-gestures-to-layer-diagrams.md

@@ -22,7 +22,7 @@ You can define several command and gesture handlers in the same Visual Studio pr
 
 ## Requirements
 
-See [Requirements](../modeling/extend-layer-diagrams.md#prereqs).
+See [Requirements](../modeling/extend-layer-diagrams.md#requirements).
 
 ## Define a Command or Gesture in a New VSIX
 

docs/modeling/add-custom-architecture-validation-to-layer-diagrams.md

@@ -26,7 +26,7 @@ You can package your layer validation extension into a Visual Studio Integration
 
 ## Requirements
 
-See [Requirements](../modeling/extend-layer-diagrams.md#prereqs).
+See [Requirements](../modeling/extend-layer-diagrams.md#requirements).
 
 ## Defining a Layer Validator in a New VSIX
 

docs/modeling/analyze-and-model-your-architecture.md

@@ -3,28 +3,15 @@ title: Analyze and model your architecture
 ms.date: 11/04/2016
 ms.topic: conceptual
 helpviewer_keywords:
-  - "Visual Studio Ultimate, exploring code"
-  - "Visual Studio Ultimate, visualizing code"
   - "diagrams - modeling"
-  - "Visual Studio ALM, modeling"
-  - "application, design"
   - "architecture"
   - "code visualization"
   - "application design"
-  - "applications, architecture"
   - "code exploration"
-  - "Visual Studio ALM, exploring code"
   - "modeling"
   - "application architecture"
-  - "application, modeling"
-  - "applications, modeling"
   - "architecture [Visual Studio ALM], modeling"
   - "application modeling"
-  - "Visual Studio Ultimate, modeling"
-  - "architecture [Visual Studio Ultimate], modeling"
-  - "application, architecture"
-  - "Visual Studio ALM, visualizing code"
-  - "applications, designing"
 author: gewarren
 ms.author: gewarren
 manager: jillfra
@@ -43,22 +30,23 @@ Make sure your app meets architectural requirements by using Visual Studio archi
 
 See [Scenario: Change your design using visualization and modeling](../modeling/scenario-change-your-design-using-visualization-and-modeling.md).
 
-## To
+## Article reference
 
 |||
 |-|-|
-|**Visualize code**:<br /><br /> -   See the code's organization and relationships by creating code maps. Visualize dependencies between assemblies, namespaces, classes, methods, and so on.<br />-   See the class structure and members for a specific project by creating class diagrams from code.<br />-   Find conflicts between your code and its design by creating dependency diagrams to validate code.|-   [Visualize code](../modeling/visualize-code.md)<br />-   [Working with Classes and Other Types (Class Designer)](../ide/class-designer/designing-and-viewing-classes-and-types.md)<br />-   [Video: Understand design from code with Visual Studio 2015 code maps](https://channel9.msdn.com/Events/Visual-Studio/Connect-event-2015/502)<br />-   [Video: Validate your architecture dependencies in real time](https://sec.ch9.ms/sessions/69613110-c334-4f25-bb36-08e5a93456b5/170ValidateArchitectureDependenciesWithVisualStudio.mp4)|
-|**Define the architecture**:<br /><br /> -   Define and enforce constraints on dependencies between the components of your code by creating dependency diagrams.|-   [Video: Validate architecture dependencies with Visual Studio (Channel 9)](https://channel9.msdn.com/Events/Connect/2016/170)|
-|**Validate your system with the requirements and intended design:**<br /><br /> -   Validate code dependencies with dependency diagrams that describe the intended architecture and prevent changes that might conflict with the design.|-   [Video: Validate architecture dependencies with Visual Studio (Channel 9)](https://channel9.msdn.com/Events/Connect/2016/170)|
-|**Customize models and diagrams**:<br /><br /> -   Create your own domain-specific languages.|-   [Modeling SDK for Visual Studio - Domain-Specific Languages](../modeling/modeling-sdk-for-visual-studio-domain-specific-languages.md)|
-|**Generate text using T4 templates**:<br /><br /> -   Use text blocks and control logic inside templates to generate text-based files.<br /> - T4 template build with MSBuild included in Visual Studio|-   [Code Generation and T4 Text Templates](../modeling/code-generation-and-t4-text-templates.md)|
-|**Share models, diagrams, and code maps using Team Foundation version control**:<br /><br /> -   Put code maps, projects, and dependency diagrams under Team Foundation version control so you can share them.| |
+|**Visualize code**:<br /><br />- See the code's organization and relationships by creating code maps. Visualize dependencies between assemblies, namespaces, classes, methods, and so on.<br />- See the class structure and members for a specific project by creating class diagrams from code.<br />- Find conflicts between your code and its design by creating dependency diagrams to validate code.|- [Visualize code](../modeling/visualize-code.md)<br />- [Working with Classes and Other Types (Class Designer)](../ide/class-designer/designing-and-viewing-classes-and-types.md)<br />- [Video: Understand design from code with Visual Studio 2015 code maps](https://channel9.msdn.com/Events/Visual-Studio/Connect-event-2015/502)<br />- [Video: Validate your architecture dependencies in real time](https://sec.ch9.ms/sessions/69613110-c334-4f25-bb36-08e5a93456b5/170ValidateArchitectureDependenciesWithVisualStudio.mp4)|
+|**Define the architecture**:<br /><br />- Define and enforce constraints on dependencies between the components of your code by creating dependency diagrams.|- [Video: Validate architecture dependencies with Visual Studio (Channel 9)](https://channel9.msdn.com/Events/Connect/2016/170)|
+|**Validate your system with the requirements and intended design:**<br /><br />- Validate code dependencies with dependency diagrams that describe the intended architecture and prevent changes that might conflict with the design.|- [Video: Validate architecture dependencies with Visual Studio (Channel 9)](https://channel9.msdn.com/Events/Connect/2016/170)|
+|**Customize models and diagrams**:<br /><br />- Create your own domain-specific languages.|- [Modeling SDK for Visual Studio - Domain-Specific Languages](../modeling/modeling-sdk-for-visual-studio-domain-specific-languages.md)|
+|**Generate text using T4 templates**:<br /><br />- Use text blocks and control logic inside templates to generate text-based files.<br /> - T4 template build with MSBuild included in Visual Studio|- [Code Generation and T4 Text Templates](../modeling/code-generation-and-t4-text-templates.md)|
+|**Share models, diagrams, and code maps using Team Foundation version control**:<br /><br />- Put code maps, projects, and dependency diagrams under Team Foundation version control so you can share them.| |
 
 To see which editions of Visual Studio support each feature, see [Edition support for architecture and modeling tools](../modeling/what-s-new-for-design-in-visual-studio.md#VersionSupport)
 
 ## Types of models and typical uses
 
 ### Code maps
+
 Code maps help you see the organization and relationships in your code.
 
 **Typical uses:**
@@ -71,8 +59,9 @@ Code maps help you see the organization and relationships in your code.
 - [Use code maps to debug your applications](../modeling/use-code-maps-to-debug-your-applications.md)
 - [Find potential problems using code map analyzers](../modeling/find-potential-problems-using-code-map-analyzers.md)
 
-### Dependency diagram
-Dependency diagrams let you define the structure of an application as a set of layers or blocks with explicit dependencies. You can run validation to discover conflicts between dependencies in the code and dependencies described on a dependency diagram.
+### Dependency diagrams
+
+Dependency diagrams let you define the structure of an application as a set of layers or blocks with explicit dependencies. Live validation shows conflicts between dependencies in the code and dependencies described on a dependency diagram.
 
 **Typical uses:**
 
@@ -86,7 +75,8 @@ Dependency diagrams let you define the structure of an application as a set of l
 - [Validate code with dependency diagrams](../modeling/validate-code-with-layer-diagrams.md)
 
 ### Domain-specific language (DSL)
-A DSL is a notation that you design for a specific purpose. In Visual Studio, it is usually graphical.
+
+A DSL is a notation that you design for a specific purpose. In Visual Studio, it's usually graphical.
 
 **Typical uses:**
 
@@ -97,10 +87,6 @@ A DSL is a notation that you design for a specific purpose. In Visual Studio, it
 
 - [Modeling SDK for Visual Studio - Domain-Specific Languages](../modeling/modeling-sdk-for-visual-studio-domain-specific-languages.md)
 
-## Where can I get more information?
-
-[Visual Studio Visualization & Modeling Tools Forum](http://go.microsoft.com/fwlink/?LinkId=184720)
-
 ## See also
 
 - [What's new for modeling in Visual Studio 2017](../modeling/what-s-new-for-design-in-visual-studio.md)

docs/modeling/creating-custom-t4-text-template-directive-processors.md

@@ -10,7 +10,7 @@ manager: jillfra
 ms.workload:
   - "multiple"
 ---
-# Creating Custom T4 Text Template Directive Processors
+# Create Custom T4 Text Template Directive Processors
 
 The *text template transformation process* takes a *text template* file as the input and produces a text file as the output. The *text template transformation engine* controls the process, and the engine interacts with a text template transformation host and one or more text template *directive processors* to complete the process. For more information, see [The Text Template Transformation Process](../modeling/the-text-template-transformation-process.md).
 

docs/modeling/customizing-and-extending-a-domain-specific-language.md

@@ -10,31 +10,30 @@ manager: jillfra
 ms.workload:
   - "multiple"
 ---
-# Customizing and Extending a Domain-Specific Language
-Visual Studio Modeling and Visualization SDK (VMSDK) provides several levels at which you can define modeling tools:
+# Customize and extend a domain-specific language
 
-1. Define a domain-specific language (DSL) using the DSL Definition diagram. You can quickly create a DSL with a diagrammatic notation, a readable XML form, and the basic tools that are required to generate code and other artifacts.
+Visual Studio Modeling and Visualization SDK (VMSDK) provides several levels at which you can define modeling tools:
 
-     For more information, see [How to Define a Domain-Specific Language](../modeling/how-to-define-a-domain-specific-language.md).
+1. Define a domain-specific language (DSL) using the DSL Definition diagram. You can quickly create a DSL with a diagrammatic notation, a readable XML form, and the basic tools that are required to generate code and other artifacts. For more information, see [How to Define a Domain-Specific Language](../modeling/how-to-define-a-domain-specific-language.md).
 
 2. Fine-tune the DSL by using more advanced features of the DSL Definition. For example, you can make additional links appear when the user creates an element. These techniques are mostly achieved in the DSL Definition, and some require a few lines of program code.
 
-3. Extend your modeling tools by using program code. VMSDK is designed specifically to make it easy to integrate your extensions with the code that is generated from the DSL Definition.  For more information, see [Writing Code to Customize a Domain-Specific Language](../modeling/writing-code-to-customise-a-domain-specific-language.md).
+3. Extend your modeling tools by using program code. VMSDK is designed specifically to make it easy to integrate your extensions with the code that is generated from the DSL Definition. For more information, see [Writing Code to Customize a Domain-Specific Language](../modeling/writing-code-to-customise-a-domain-specific-language.md).
 
 > [!NOTE]
-> When you have updated the DSL Definitions file, do not forget to click **Transform All Templates** in the toolbar of Solution Explorer before rebuilding your solution.
+> When you have updated the DSL Definitions file, don't forget to click **Transform All Templates** in the toolbar of **Solution Explorer** before rebuilding your solution.
 
-## <a name="customShapes"></a> In this Section
+## Article reference
 
 |To achieve this effect|Refer to this topic|
 |-|-|
-|Allow the user to set the color and style properties of a shape.|Right-click the shape or connector class, point to **Add Exposed**, and click an item.<br /><br /> See [Customizing Presentation on the Diagram](../modeling/customizing-presentation-on-the-diagram.md).|
+|Allow the user to set the color and style properties of a shape.|Right-click the shape or connector class, point to **Add Exposed**, and click an item.|
 |Different classes of model element look similar on the diagram, sharing properties such as initial height and width, color, tooltips.|Use inheritance between shapes or connector classes. Mappings between derived shapes and derived domain classes inherit the mapping details of the parents.<br /><br /> Or, map different domain classes to the same shape class.|
 |A class of model element is displayed by different shapes contexts.|Map more than one shape class to the same domain class. When you build the solution, follow the error report and provide the requested code to decide what shape to use.|
 |Shape color or other features such as font indicate current state.|See [Updating Shapes and Connectors to Reflect the Model](../modeling/updating-shapes-and-connectors-to-reflect-the-model.md).<br /><br /> Create a rule that updates the exposed properties. See [Rules Propagate Changes Within the Model](../modeling/rules-propagate-changes-within-the-model.md).<br /><br /> Or, use OnAssociatedPropertyChanged() to update non-exposed features such as link arrows or font.|
 |Icon on shape changes to indicate state.|Set the visibility of the decorator mapping in the DSL Details window. Locate several image decorators on the same position. See  [Updating Shapes and Connectors to Reflect the Model](../modeling/updating-shapes-and-connectors-to-reflect-the-model.md).<br /><br /> Or, override `ImageField.GetDisplayImage()`. See example in <xref:Microsoft.VisualStudio.Modeling.Diagrams.ImageField>.|
-|Set a background image on any shape|Override InitializeInstanceResources() to add an anchored ImageField. See [Customizing Presentation on the Diagram](../modeling/customizing-presentation-on-the-diagram.md).|
-|Nest shapes to any depth|Set up a recursive embedding tree. Define BoundsRules to contain the shapes. See [Customizing Presentation on the Diagram](../modeling/customizing-presentation-on-the-diagram.md).|
+|Set a background image on any shape|Override InitializeInstanceResources() to add an anchored ImageField.|
+|Nest shapes to any depth|Set up a recursive embedding tree. Define BoundsRules to contain the shapes.|
 |Attach connectors at fixed points on an element's boundary.|Define embedded terminal elements, represented by small ports on the diagram. Use BoundsRules to fix the ports in place. See the Circuit Diagram sample at [Visualization and Modeling SDK](http://go.microsoft.com/fwlink/?LinkID=186128).|
 |Text field displays a value derived from other values.|Map the text decorator to a Calculated or Custom Storage domain property. For more information, see [Calculated and Custom Storage Properties](../modeling/calculated-and-custom-storage-properties.md).|
 |Propagate changes between model elements, or between shapes|See [Validation in a Domain-Specific Language](../modeling/validation-in-a-domain-specific-language.md).|