Merge pull request #5572 from corob-msft/cr-cpp-mdd-updates

Make C++ Android docs version agnostic

Author: v-albemi

docs/cross-platform/build-an-opengl-es-application-on-android-and-ios.md

@@ -1,7 +1,7 @@
 ---
-title: "Build an OpenGL ES Application on Android and iOS | Microsoft Docs"
+title: "Build an OpenGL ES application on Android and iOS | Microsoft Docs"
 ms.custom: ""
-ms.date: "09/17/2019"
+ms.date: "10/09/2019"
 ms.technology: vs-ide-mobile
 ms.topic: "conceptual"
 dev_langs:
@@ -19,13 +19,13 @@ You can create Visual Studio solutions and projects for iOS apps and Android app
 
 ## Requirements
 
-Before you can create an OpenGL ES app for iOS and Android, make sure you've met all system requirements. If you haven't already, install the Mobile Development with C++ workload in the Visual Studio Installer. To build for iOS, include the optional C++ iOS development tools. To build for Android, install the C++ Android development tools and the required third-party tools: Android NDK, Apache Ant, and Google Android Emulator. For better emulator performance on Intel platforms, we recommend you also install the Intel Hardware Accelerated Execution Manager (HAXM). Next, configure Intel HAXM and the Android Emulator to run on your system. For more information and detailed instructions, see [Install Visual C++ for cross-platform mobile development](../cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md).
+Before you can create an OpenGL ES app for iOS and Android, make sure you've met all system requirements. If you haven't already, install the Mobile Development with C++ workload in the Visual Studio Installer. To get the OpenGL ES templates, and to build for iOS, include the optional C++ iOS development tools. To build for Android, install the C++ Android development tools and the required third-party tools: Android NDK, Apache Ant, and Google Android Emulator. For better emulator performance on Intel platforms, we recommend you also install the Intel Hardware Accelerated Execution Manager (HAXM). Next, configure Intel HAXM and the Android Emulator to run on your system. For more information and detailed instructions, see [Install cross-platform mobile development with C++](../cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md).
 
 To build and test the iOS app, you'll need a Mac computer, set up according to the installation instructions. For more information about how to set up for iOS development, see [Install and configure tools to build using iOS](../cross-platform/install-and-configure-tools-to-build-using-ios.md).
 
 ## Create a new OpenGLES Application project
 
-In this tutorial, you first create a new OpenGL ES Application project. and then build and run the default app in the Visual Studio Emulator for Android. Next you build the app for iOS and run the app on an iOS device.
+In this tutorial, you first create a new OpenGL ES Application project. and then build and run the default app in an Android emulator. Next you build the app for iOS and run the app on an iOS device.
 
 ::: moniker range="vs-2017"
 
@@ -69,7 +69,7 @@ The solution has two projects to build the apps for the Android and iOS platform
 
 - `MyOpenGLESApp.Android.Packaging` creates the *.apk* file for deployment on an Android device or emulator. This file contains the resources and AndroidManifest.xml file where you set manifest properties. It also contains the *build.xml* file that controls the Ant build process. It's set as the startup project by default, so that it can be deployed and run directly from Visual Studio.
 
-- **MyOpenGLESApp.iOS.Application** contains the resources and Objective-C glue code to create an iOS app that links to the C++ static library code in `MyOpenGLESApp.iOS.StaticLibrary`. This project creates a build package that is transferred to your Mac by Visual Studio and the remote agent. When you build this project, Visual Studio sends the files and commands to build and deploy your app on the Mac.
+- `MyOpenGLESApp.iOS.Application` contains the resources and Objective-C glue code to create an iOS app that links to the C++ static library code in `MyOpenGLESApp.iOS.StaticLibrary`. This project creates a build package that is transferred to your Mac by Visual Studio and the remote agent. When you build this project, Visual Studio sends the files and commands to build and deploy your app on the Mac.
 
 ## Build and run the Android app
 
@@ -97,7 +97,7 @@ The solution created by the template sets the Android app as the default project
 
    If you have installed other emulators or connected an Android device, you can choose them in the deployment target drop-down list. To run the app, the built Solution Platform must match the platform of the target device.
 
-1. Press F5 to start debugging, or Shift+F5 to start without debugging.
+1. Press **F5** to start debugging, or **Shift**+**F5** to start without debugging.
 
    Visual Studio starts the emulator, which takes several seconds to load and deploy your code. Here's how the app appears in the emulator:
 
@@ -121,7 +121,7 @@ To deploy an iOS app to an iOS device, you must also set up automatic signing on
 
 ### To set up automatic signing on Xcode
 
-1. If you haven't already, install [Xcode](https://developer.apple.com/xcode/downloads/) version 10.2.1 or later on your Mac.
+1. If you haven't already, install [Xcode](https://developer.apple.com/xcode/) on your Mac.
 
 1. Open the Xcode app on your Mac.
 

docs/cross-platform/create-an-android-native-activity-app.md

@@ -1,7 +1,7 @@
 ---
 title: "Create an Android Native Activity App | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/17/2019"
 ms.technology: vs-ide-mobile
 ms.topic: "conceptual"
 dev_langs:
@@ -15,37 +15,53 @@ ms.workload:
 ---
 # Create an Android Native Activity App
 
-When you install the Visual C++ for Cross-Platform Mobile Development option, Visual Studio 2015 can be used to create fully functional Android Native Activity apps. The Android Native Development Kit (NDK) is a toolset that allows you to implement the majority of your Android app using pure C/C++ code. Some Java JNI code acts as glue to allow your C/C++ code to interact with Android. The Android NDK introduced the ability to create Native Activity apps with Android API Level 9. Native Activity code is popular for creating gaming and graphic intensive apps that use Unreal Engine or OpenGL. This topic will guide you through creation of a simple Native Activity app that uses OpenGL. Additional topics walk through the developer lifecycle of editing, building, debugging and deploying Native Activity code.
+When you install the cross-platform **Mobile development with C++** workload, Visual Studio can be used to create fully functional Android Native Activity apps. The Android Native Development Kit (NDK) is a toolset that allows you to implement the majority of your Android app using pure C/C++ code. Some Java JNI code acts as glue to allow your C/C++ code to interact with Android. The Android NDK introduced the ability to create Native Activity apps with Android API Level 9. Native Activity code is popular for creating gaming and graphic intensive apps that use Unreal Engine or OpenGL. This topic will guide you through creation of a simple Native Activity app that uses OpenGL. Additional topics walk through the developer lifecycle of editing, building, debugging and deploying Native Activity code.
 
 ## Requirements
 
-Before you can create an Android Native Activity app, you must make sure you've met all system requirements, and installed the Visual C++ Mobile Development option in Visual Studio 2015. For more information, see [Install Visual C++ for Cross-Platform Mobile Development](../cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md). Make sure that the required third-party tools and SDKs are included in the installation, and that the Microsoft Visual Studio Emulator for Android is installed.
+Before you can create an Android Native Activity app, you must make sure you've met all system requirements, and installed the **Mobile development with C++** workload in Visual Studio. For more information, see [Install cross-platform mobile development with C++](../cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md). Make sure that the required third-party tools and SDKs are included in the installation, and that an Android emulator is installed.
 
 ## Create a new Native Activity project
 
-In this tutorial, you'll first create a new Android Native Activity project and then build and run the default app in the Visual Studio Emulator for Android.
+In this tutorial, you'll first create a new Android Native Activity project and then build and run the default app in an Android emulator.
+
+::: moniker range="vs-2017"
 
 1. In Visual Studio, choose **File** > **New** > **Project**.
 
-2. In the **New Project** dialog box, under **Templates**, choose **Visual C++** > **Cross Platform**, and then choose the **Native-Activity Application (Android)** template.
+1. In the **New Project** dialog box, under **Templates**, choose **Visual C++** > **Cross Platform**, and then choose the **Native-Activity Application (Android)** template.
+
+1. Give the app a name like *MyAndroidApp*, and then choose **OK**.
+
+   ![Create a Native Activity project](../cross-platform/media/cppmdd_newproject.PNG "CppMDD_NewProject")
+
+   Visual Studio creates the new solution and opens Solution Explorer.
+
+   ![Native Activity project in Solution Explorer](../cross-platform/media/cppmdd_rc_na_solutionexp.PNG "CPPMDD_RC_NA_SolutionExp")
+
+::: moniker-end
+
+::: moniker range=">=vs-2019"
+
+1. In Visual Studio, choose **File** > **New** > **Project**.
 
-3. Give the app a name like `MyAndroidApp`, and then choose **OK**.
+1. In the **Create a new project** dialog box, select the **Native-Activity Application (Android)** template, and then choose **Next**.
 
-    ![Create a Native Activity project](../cross-platform/media/cppmdd_newproject.PNG "CppMDD_NewProject")
+1. In the **Configure your new project** dialog box, enter a name like *MyAndroidApp* in **Project name**, and then choose **Create**.
 
-    Visual Studio creates the new solution and opens Solution Explorer.
+   Visual Studio creates the new solution and opens Solution Explorer.
 
-    ![Native Activity project in Solution Explorer](../cross-platform/media/cppmdd_rc_na_solutionexp.PNG "CPPMDD_RC_NA_SolutionExp")
+::: moniker-end
 
-   The new Android Native Activity app solution includes two projects:
+The new Android Native Activity app solution includes two projects:
 
 - `MyAndroidApp.NativeActivity` contains the references and glue code for your app to run as a Native Activity on Android. The implementation of the entry points from the glue code are in *main.cpp*. Precompiled headers are in *pch.h*. This Native Activity app project is compiled into a shared library *.so* file which is picked up by the Packaging project.
 
 - `MyAndroidApp.Packaging` creates the *.apk* file for deployment on an Android device or emulator. This contains the resources and *AndroidManifest.xml* file where you set manifest properties. It also contains the *build.xml* file that controls the Ant build process. It's set as the startup project by default, so that it can be deployed and run directly from Visual Studio.
 
 ## Build and run the default Android Native Activity app
 
-Build and run the app generated by the template to verify your installation and setup. For this initial test, run the app on one of the device profiles installed by the Visual Studio Emulator for Android. If you prefer to test your app on another target, you can load the target emulator or connect the device to your computer.
+Build and run the app generated by the template to verify your installation and setup. For this initial test, run the app on one of the device profiles installed by the Android emulator. If you prefer to test your app on another target, you can load the target emulator or connect the device to your computer.
 
 ## To build and run the default Native Activity app
 
@@ -55,22 +71,22 @@ Build and run the app generated by the template to verify your installation and
 
      If the **Solution Platforms** list isn't showing, choose **Solution Platforms** from the **Add/Remove Buttons** list, and then choose your platform.
 
-2. On the menu bar, choose **Build** > **Build Solution**.
+1. On the menu bar, choose **Build** > **Build Solution**.
 
      The Output window displays the output of the build process for the two projects in the solution.
 
-3. Choose one of the VS Emulator Android Phone (x86) profiles as your deployment target.
+1. Choose one of the Android emulator profiles as your deployment target.
 
      If you have installed other emulators or connected an Android device, you can choose them in the deployment target dropdown list.
 
-4. Press **F5** to start debugging, or Shift+F5 to start without debugging.
+1. Press **F5** to start debugging, or **Shift**+**F5** to start without debugging.
 
-     Here's what the default app looks like in the Visual Studio emulator for Android.
+   Here's what the default app looks like in an Android emulator.
 
-     ![The emulator running your app](../cross-platform/media/cppmdd_emulator_running_app.PNG "CppMDD_Emulator_Running_App")
+   ![The emulator running your app](../cross-platform/media/cppmdd_emulator_running_app.PNG "CppMDD_Emulator_Running_App")
 
-     Visual Studio starts the emulator, which takes a few seconds to load and deploy your code. Once your app has started, you can set breakpoints and use the debugger to step through code, examine locals, and watch values.
+   Visual Studio starts the emulator, which takes a few seconds to load and deploy your code. Once your app has started, you can set breakpoints and use the debugger to step through code, examine locals, and watch values.
 
-5. Press **Shift**+**F5** to stop debugging.
+1. Press **Shift**+**F5** to stop debugging.
 
-     The emulator is a separate process that continues to run. You can edit, compile, and deploy your code multiple times to the same emulator.
+   The emulator is a separate process that continues to run. You can edit, compile, and deploy your code multiple times to the same emulator.

docs/cross-platform/cross-platform-mobile-development-examples.md

@@ -1,7 +1,7 @@
 ---
-title: "Cross-Platform Mobile Development Examples | Microsoft Docs"
+title: "Cross-platform mobile development examples | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/17/2019"
 ms.technology: vs-ide-mobile
 ms.topic: "conceptual"
 dev_langs:
@@ -14,7 +14,8 @@ ms.workload:
   - "xplat-cplusplus"
 ---
 # Cross-platform mobile development examples
-Several of the templates installed by Visual C++ for Cross-Platform Mobile Development generate complete examples that you can use to learn from. Additionally, the Windows Dev Center has several example applications that you can download and try out in Visual Studio.
+
+Several of the templates installed by the **Mobile development with C++** workload generate complete examples that you can use to learn from. Additionally, the Windows Dev Center has several example applications that you can download and try out in Visual Studio.
 
 - [hello-jni Android Application Sample](https://code.msdn.microsoft.com/hello-jni-Android-790ab73d)
 
@@ -30,7 +31,7 @@ Several of the templates installed by Visual C++ for Cross-Platform Mobile Devel
 
 - [TwoLibs Android Library Sample](https://code.msdn.microsoft.com/TwoLibs-Android-Library-6396e5c4)
 
-   This sample is a port of the Android NDK TwoLibs sample. It uses both a dynamically loaded shared library, and a static C++ Android native library, that implements a method called from a Java Native Interface app. This sample is a good starting point for developers to understand how to use static/dynamic shared libraries to build an end-to-end JNI Android application with Visual Studio 2015.
+   This sample is a port of the Android NDK TwoLibs sample. It uses both a dynamically loaded shared library, and a static C++ Android native library, that implements a method called from a Java Native Interface app. This sample is a good starting point for developers to understand how to use static/dynamic shared libraries to build an end-to-end JNI Android application with Visual Studio.
 
 - [Tea Pot Android Application Sample](https://code.msdn.microsoft.com/Tea-Pot-Android-Application-e7c05d73)
 
@@ -42,7 +43,7 @@ Several of the templates installed by Visual C++ for Cross-Platform Mobile Devel
 
 - [test-libstdcpp Android Library Sample](https://code.msdn.microsoft.com/test-libstdcpp-Android-00b548f5)
 
-   This sample is a port of the Android NDK test-libstdc++ sample, specifically for use with Visual Studio 2015. This sample is a good starting point for developers to understand how to use the Standard Library.
+   This sample is a port of the Android NDK test-libstdc++ sample, specifically for use with Visual Studio. This sample is a good starting point for developers to understand how to use the Standard Library.
 
   To open one of the examples in Visual Studio, download the zip file and open the **Properties** page of the downloaded file in Explorer. Choose the **Unblock** button then choose **OK**. Extract the contents of the zip file to a convenient location, then open the C++ folder in the extracted sample and open the solution file.