Merge pull request MicrosoftDocs#973 from MicrosoftDocs/master636918977757152273

Fix git push error for protected CLA branch

Author: Colin Robertson

docs/cppcx/wrl/walkthrough-creating-a-windows-store-app-using-wrl-and-media-foundation.md

@@ -1,12 +1,15 @@
 ---
 title: "Walkthrough: Creating a UWP app using WRL and Media Foundation"
-ms.date: "09/17/2018"
+ms.date: "04/23/2019"
 ms.topic: "reference"
 ms.assetid: 0336c550-fbeb-4dc4-aa9b-660f9fc45382
 ---
 # Walkthrough: Creating a UWP app using WRL and Media Foundation
 
-Learn how to use the Windows Runtime C++ Template Library (WRL) to create a Universal Windows Platform (UWP) app that uses [Microsoft Media Foundation](/windows/desktop/medfound/microsoft-media-foundation-sdk).
+> [!NOTE]
+> For new UWP apps and components, we recommend that you use [C++/WinRT](/windows/uwp/cpp-and-winrt-apis/), a new standard C++17 language projection for Windows Runtime APIs. C++/WinRT is available in the Windows 10 SDK from version 1803 onward. C++/WinRT is implemented entirely in header files, and is designed to provide you with first-class access to the modern Windows API.
+
+In this tutorial, you will learn how to use the Windows Runtime C++ Template Library (WRL) to create a Universal Windows Platform (UWP) app that uses [Microsoft Media Foundation](/windows/desktop/medfound/microsoft-media-foundation-sdk).
 
 This example creates a custom Media Foundation transform that applies a grayscale effect to images that are captured from a webcam. The app uses C++ to define the custom transform and C# to use the component to transform the captured images.
 
@@ -20,6 +23,8 @@ In most cases, you can use C++/CX to create Windows Runtime. However, sometimes
 
 ## Prerequisites
 
+- In Visual Studio 2017 and later, UWP support is an optional component. To install it, open the Visual Studio Installer from the Windows Start menu and find your version of Visual Studio. Choose **Modify** and then make sure the **Universal Windows Platform Development** tile is checked. Under **Optional Components** check **C++ Tools for UWP (v141)** for Visual Studio 2017, or **C++ Tools for UWP (v142)** for Visual Studio 2019. Then check the version of the Windows SDK that you want to use. 
+
 - Experience with the [Windows Runtime](https://msdn.microsoft.com/library/windows/apps/br211377.aspx).
 
 - Experience with COM.

docs/dotnet/walkthrough-compiling-a-cpp-program-that-targets-the-clr-in-visual-studio.md

@@ -6,28 +6,60 @@ ms.assetid: 339f89df-a5d2-4040-831a-ddbe25b5dce4
 ---
 # Walkthrough: Compile a C++/CLI Program that Targets the CLR in Visual Studio
 
-By using C++/CLI language extensions you can create C++ programs that use .NET classes and compile them by using the Visual Studio Development Environment.
+By using C++/CLI you can create C++ programs that use .NET classes as well as native C++ types. C++/CLI is intended for use in console applications and in DLLs that wrap native C++ code and make it accessible from .NET programs. To create a Windows user interface based on .NET, use C# or Visual Basic. 
 
 For this procedure, you can type your own C++ program or use one of the sample programs. The sample program that we use in this procedure creates a text file named textfile.txt, and saves it to the project directory.
 
 ## Prerequisites
 
-These topics assume that you understand the fundamentals of the C++ language.
+- An understanding of the fundamentals of the C++ language.
+- In Visual Studio 2017 and later, C++/CLI support is an optional component. To install it, open the **Visual Studio Installer** from the Windows Start menu. Make sure that the **Desktop development with C++** tile is checked, and in the **Optional** components section, also check **C++/CLI Support**.
 
-### To create a new project in Visual Studio and add a new source file
+## Create a new project
+
+The following steps vary depending on which version of Visual Studio you are using. Make sure the version selector in the upper left of this page is set correctly.
+
+::: moniker range="vs-2019"
+
+### To create a C++/CLI project in Visual Studio 2019
+
+1. In **Solution Explorer**, right-click on the top  to open the **Create a New Project** dialog box.
+
+1. At the top of the dialog, type **CLR** in the search box and then choose **CLR Empty Project** from the results list. 
+
+1. Choose the **Create** button to create the project.
+
+::: moniker-end
+
+::: moniker range="vs-2017"
+
+### To create a C++/CLI project in Visual Studio 2017
 
 1. Create a new project. On the **File** menu, point to **New**, and then click **Project**.
 
 1. From the Visual C++ project types, click **CLR**, and then click **CLR Empty Project**.
 
-   > [!NOTE]
-   > If the **CLR Empty Project** type is missing (Visual Studio 2017 only), select **Open Visual Studio Installer** in the left pane of the **New Project** dialog box. Install the option located under **Desktop development with C++** in the **Optional** components section, named **C++/CLI Support**.<br/>
+1. Type a project name. By default, the solution that contains the project has the same name as the new project, but you can enter a different name. You can enter a different location for the project if you want.
+
+1. Click **OK** to create the new project.
+
+::: moniker-end
+
+::: moniker range="vs-2015"
+
+### To create a C++/CLI project in Visual Studio 2015
+
+1. Create a new project. On the **File** menu, point to **New**, and then click **Project**.
+
+1. From the Visual C++ project types, click **CLR**, and then click **CLR Empty Project**.
+
+1. Type a project name. By default, the solution that contains the project has the same name as the new project, but you can enter a different name. You can enter a different location for the project if you want.
 
-1. Type a project name.
+1. Click **OK** to create the new project.
 
-   By default, the solution that contains the project has the same name as the new project, but you can enter a different name. You can enter a different location for the project if you want.
+::: moniker-end
 
-   Click **OK** to create the new project.
+## Add a source file
 
 1. If **Solution Explorer** isn't visible, click **Solution Explorer** on the **View** menu.
 
@@ -47,7 +79,7 @@ These topics assume that you understand the fundamentals of the C++ language.
 
    `StreamWriter^ sw = gcnew StreamWriter(fileName);`
 
-   For more information on the new Visual C++ syntax, see [Component Extensions for Runtime Platforms](../extensions/component-extensions-for-runtime-platforms.md).
+   For more information on C++/CLI syntax, see [Component Extensions for Runtime Platforms](../extensions/component-extensions-for-runtime-platforms.md).
 
 1. On the **Build** menu, click **Build Solution**.
 

docs/mfc/walkthrough-adding-a-ctaskdialog-to-an-application.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Adding a CTaskDialog to an Application"
-ms.date: "09/19/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["CTaskDialog, adding", "walkthroughs [MFC], dialogs"]
 ms.assetid: 3a62abb8-2d86-4bec-bdb8-5784d5f9a9f8
 ---
@@ -29,7 +29,9 @@ The following procedure demonstrates the most basic use of the `CTaskDialog`, wh
 
 ### To Replace a Windows Message Box with a CTaskDialog
 
-1. Create a new MFC Application project with the default settings. Call it *MyProject*.
+1. Use the **MFC Application Wizard** to create an MFC application with all the default settings. See [Walkthrough: Using the New MFC Shell Controls](walkthrough-using-the-new-mfc-shell-controls.md) for instructions on how to open the wizard for your version of Visual Studio.
+
+1. Call it *MyProject*. 
 
 1. Use the **Solution Explorer** to open the file MyProject.cpp.
 

docs/mfc/walkthrough-adding-a-d2d-object-to-an-mfc-project.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Adding a D2D Object to an MFC Project"
-ms.date: "09/20/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["MFC, D2D", "D2D [MFC]"]
 ms.assetid: dda36c33-c231-4da6-a62f-72d69a12b6dd
 ---
@@ -28,9 +28,9 @@ To complete this walkthrough, you must have Visual Studio installed with the **D
 
 ## To create an MFC application
 
-1. On the **File** menu, point to **New** and then choose **Project**.
+1. Use the **MFC Application Wizard** to create an MFC application. See [Walkthrough: Using the New MFC Shell Controls](walkthrough-using-the-new-mfc-shell-controls.md) for instructions on how to open the wizard for your version of Visual Studio.
 
-1. In the **New Project** dialog box, in the left pane under **Installed Templates**, expand **Visual C++** and then select **MFC**. In the middle pane, select **MFC Application**. In the **Name** box, type *MFCD2DWalkthrough*. Choose **OK**.
+1. In the **Name** box, type *MFCD2DWalkthrough*. Choose **OK**.
 
 1. In the **MFC Application Wizard**, choose **Finish** without changing any settings.
 

docs/mfc/walkthrough-adding-animation-to-an-mfc-project.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Adding Animation to an MFC Project"
-ms.date: "09/20/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["animation [MFC]", "MFC, animation"]
 ms.assetid: 004f832c-9fd5-4f88-9ca9-ae65dececdc2
 ---
@@ -30,9 +30,9 @@ To complete this walkthrough, you must have Visual Studio.
 
 ### To create an MFC application
 
-1. On the **File** menu, point to **New** and then click **Project**.
+1. Use the **MFC Application Wizard** to create an MFC application. See [Walkthrough: Using the New MFC Shell Controls](walkthrough-using-the-new-mfc-shell-controls.md) for instructions on how to open the wizard for your version of Visual Studio.
 
-1. In the **New Project** dialog box, in the left pane under **Installed Templates**, expand **Visual C++** and then select **MFC**. In the middle pane, select **MFC Application**. In the **Name** box, type *MFCAnimationWalkthrough*. Click **OK**.
+1. In the **Name** box, type *MFCAnimationWalkthrough*. Click **OK**.
 
 1. In the **MFC Application Wizard** dialog box, verify that **Application Type** is **Multiple Documents**, **Project Style** is **Visual Studio**, and the **Document/View architecture support** option is selected. Click **Finish**.
 

docs/mfc/walkthrough-creating-a-ribbon-application-by-using-mfc.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Creating a Ribbon Application By Using MFC"
-ms.date: "11/04/2016"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["ribbon application, creating (MFC)", "creating a ribbon aplication (MFC)"]
 ms.assetid: e61393e2-1d6b-4594-a7ce-157d3d1b0d9f
 ---
@@ -14,9 +14,7 @@ This walkthrough assumes that you have set Visual Studio to use **General Develo
 
 ### To create an MFC application that has a ribbon
 
-1. Use the **MFC Application Wizard** to create an MFC application that has a ribbon. To run the wizard, on the **File** menu, point to **New**, and then click **Project**.
-
-1. In the **New Project** dialog box, expand the **Visual C++** node under **Installed Templates**, select **MFC**, and then select **MFC Application**. Type a name for the project, for example, *MFCRibbonApp*, and then click **OK**.
+1. Use the **MFC Application Wizard** to create an MFC application that has a ribbon. See [Walkthrough: Using the New MFC Shell Controls](walkthrough-using-the-new-mfc-shell-controls.md) for instructions on how to open the wizard for your version of Visual Studio.
 
 1. Set the following options in the **MFC Application Wizard**:
 
@@ -26,7 +24,7 @@ This walkthrough assumes that you have set Visual Studio to use **General Develo
 
     1. In the **Document Template Properties** section, in the **File extension** box, type a file name extension for documents that this application creates, for example, *mfcrbnapp*.
 
-    1. In the **Database Support** section, make sure that **None** is selected.
+    1. In the **Database Support** section (Visual Studio 2015 only), make sure that **None** is selected.
 
     1. In the **User Interface Features** section, make sure that **Use a ribbon** is selected.
 

docs/mfc/walkthrough-putting-controls-on-toolbars.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Putting Controls On Toolbars"
-ms.date: "09/20/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["Customize dialog box, adding controls", "toolbars [MFC], adding controls"]
 ms.assetid: 8fc94bdf-0da7-45d9-8bc4-52b7b1edf205
 ---

docs/mfc/walkthrough-updating-the-mfc-scribble-application-part-1.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Updating the MFC Scribble Application (Part 1)"
-ms.date: "09/20/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["examples [MFC], update existing application", "ribbon UI, porting to", "Office Fluent UI, porting to", "samples [MFC], update existing application", "MFC Feature Pack, update existing application", "walkthroughs [MFC], update existing application"]
 ms.assetid: aa6330d3-6cfc-4c79-8fcb-0282263025f7
 ---
@@ -12,7 +12,7 @@ This walkthrough modifies the classic Scribble 1.0 MFC sample that lets you use
 
 ## Prerequisites
 
-The [Scribble 1.0 MFC sample](http://download.microsoft.com/download/4/0/9/40946FEC-EE5C-48C2-8750-B0F8DA1C99A8/MFC/general/Scribble.zip.exe). For help on converting to Visual Studio 2017, see [Porting Guide: MFC Scribble](../porting/porting-guide-mfc-scribble.md).
+The [Scribble 1.0 MFC sample](http://download.microsoft.com/download/4/0/9/40946FEC-EE5C-48C2-8750-B0F8DA1C99A8/MFC/general/Scribble.zip.exe). For help on converting to Visual Studio 2017 or later, see [Porting Guide: MFC Scribble](../porting/porting-guide-mfc-scribble.md).
 
 ##  <a name="top"></a> Sections
 

docs/mfc/walkthrough-updating-the-mfc-scribble-application-part-2.md

@@ -1,6 +1,6 @@
 ---
 title: "Walkthrough: Updating the MFC Scribble Application (Part 2)"
-ms.date: "09/20/2018"
+ms.date: "04/25/2019"
 helpviewer_keywords: ["walkthroughs [MFC]"]
 ms.assetid: 602df5c2-17d4-4cd9-8cf6-dff652c4cae5
 ---