Merge pull request #265448 from MichaelZp0/user/MichaelZp0/ARR_AddNewerUnityVersionsTo_UpdateDeployUnitySampleToDesktop

Added entries for Unity 2021+ menu layouts in ARR Quickstart sample

Author: ttorble

articles/remote-rendering/how-tos/media/wpr-hl.png renamed to articles/remote-rendering/how-tos/media/wpr-hololens.png

@@ -12,7 +12,7 @@ ms.custom: mode-other
 
 This quickstart covers how to deploy and run the quickstart sample app for Unity to a desktop PC.
 
-In this quickstart you learn how to:
+In this quickstart, you learn how to:
 
 > [!div class="checklist"]
 >
@@ -22,46 +22,80 @@ In this quickstart you learn how to:
 
 ## Prerequisites
 
-In this quickstart we deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
+In this quickstart, we deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
 
 Make sure your credentials are saved properly with the scene and you can connect to a session from within the Unity editor.
 
 ## Disable virtual reality support
 
 Only flat desktop apps are currently supported on desktop so VR support has to be disabled.
 
+# [Standalone](#tab/UnityStandalone)
+
+In the standalone build VR support is automatically disabled. No steps are needed here.
+
+# [Universal Windows Platform (UWP)](#tab/UnityUWP)
+
 1. Open *Edit > Project Settings...*
-1. Select **Player** on the left.
+1. Select **XR Plugin Management** in the menu to the left.
 1. Select the **Universal Windows Platform settings** tab.
-1. Expand the **XR Settings**.
-1. Disable **Virtual Reality Supported**.\
-    ![player settings](./media/unity-disable-xr.png)
-1. Above *XR Settings*, expand **Publishing Settings**.
-1. In **Supported Device Families**, make sure **Desktop** is checked.
+1. Disable **OpenXR**.\
+    ![A screenshot showing the Project Settings menu with a disabled "OpenXR" setting.](./media/unity-2020-disable-xr.png)
+
+---
 
 ## Build the sample project
 
+# [Standalone](#tab/UnityStandalone)
+
 1. Open *File > Build Settings*.
-1. Change *Platform* to **Universal Windows Platform** (**PC Standalone** is also supported but not used here).
-1. Set *Target Device* to **PC**.
-1. Set *Architecture* to **x86**.
-1. Set *Build Type* to **D3D Project**.\
-  ![Build settings](./media/unity-build-settings-pc.png)
-1. Select **Switch to Platform**.
-1. When pressing **Build** (or 'Build And Run'), you are asked to select some folder where the solution should be stored.
+1. Change *Platform* to **PC, Mac & Linux Standalone**.
+1. Set *Target Platform* to **Windows**.\
+  ![A screenshot showing the Build Menu with the settings set for a standalone build.](./media/unity-2021-build-settings-pc-standalone.png)
+1. Select **Switch Platform**.
+1. When pressing **Build** (or 'Build And Run'), you're asked to select some folder where the *.exe* should be stored.
+
+# [UWP](#tab/UnityUWP)
+
+1. Open *File > Build Settings*.
+1. Change *Platform* to **Universal Windows Platform**.\
+  ![A screenshot showing the Build Menu with the settings set for a UWP build.](./media/unity-2021-build-settings-pc.png)
+1. Select **Switch Platform**.
+1. When pressing **Build** (or 'Build And Run'), you're asked to select some folder where the solution should be stored.
+
+---
+
+## Build the Visual Studio solution
+
+# [Standalone](#tab/UnityStandalone)
+
+Building in standalone mode doesn't produce a Visual Studio solution, but instead a simple *.exe* file. No second building step is necessary here.
+
+# [UWP](#tab/UnityUWP)
+
 1. Open the generated **Quickstart.sln** with Visual Studio.
 1. Change the configuration to **Release** and **x86**.
 1. Switch the debugger mode to **Local Machine**.\
-  ![Solution configuration](./media/unity-deploy-config-pc.png)
+  ![A screenshot showing the Visual Studio configuration and debugger mode.](./media/unity-deploy-config-pc.png)
 1. Build the solution.
 
+---
+
 ## Launch the sample project
 
-Start the Debugger in Visual Studio (F5). It will automatically deploy the app to the PC.
+# [Standalone](#tab/UnityStandalone)
+
+Run the *.exe* file, which was produced in the build step.
+
+# [UWP](#tab/UnityUWP)
+
+Start the Debugger in Visual Studio (F5). It automatically deploys the app to the PC.
 
 The sample app should launch and then start a new session. After a while, the session is ready and the remotely rendered model will appear in front of you.
 If you want to launch the sample a second time later, you can also find it from the Start menu now.
 
+---
+
 ## Next steps
 
 In the next quickstart, we'll take a look at converting a custom model.

articles/remote-rendering/how-tos/performance-tracing.md

@@ -12,7 +12,7 @@ ms.custom: mode-other
 
 This quickstart covers how to deploy and run the quickstart sample app for Unity to a HoloLens 2.
 
-In this quickstart you'll learn how to:
+In this quickstart, you learn how to:
 
 > [!div class="checklist"]
 >
@@ -22,35 +22,49 @@ In this quickstart you'll learn how to:
 
 ## Prerequisites
 
-In this quickstart, we'll deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
+In this quickstart, we deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
 Make sure your credentials are saved properly with the scene and you can connect to a session from within the Unity editor.
 
 The HoloLens 2 must be in developer mode and paired with the desktop machine. Refer to [using the device portal](/windows/mixed-reality/develop/advanced-concepts/using-the-windows-device-portal#setting-up-hololens-to-use-windows-device-portal) for further instructions.
 
 ## Build the sample project
 
+# [Unity 2021+](#tab/Unity2021PlusBuild)
+
+1. Open *File > Build Settings*.
+1. Change *Platform* to **Universal Windows Platform**.\
+    ![A screenshot showing the Build Menu with the settings set for a UWP build in Unity 2021 or later.](./media/unity-2021-build-settings-hololens.png)
+1. Select **Switch Platform**.
+1. When pressing **Build** (or 'Build And Run'), you're asked to select some folder where the solution should be stored.
+
+# [Unity 2020](#tab/Unity2020Build)
+
 1. Open *File > Build Settings*.
-1. Change *Platform* to **Universal Windows Platform**
-1. Set *Target Device* to **HoloLens**
-1. Set *Architecture* to **ARM64**
-1. Set *Build Type* to **D3D Project**\
-    ![Build settings](./media/unity-build-settings.png)
-1. Select **Switch to Platform**
-1. When pressing **Build** (or 'Build And Run'), you'll be asked to select some folder where the solution should be stored
+1. Change *Platform* to **Universal Windows Platform**.\
+    ![A screenshot showing the Build Menu with the settings set for a UWP build in Unity 2020.](./media/unity-2020-build-settings-hololens.png)
+1. Select **Switch Platform**.
+1. When pressing **Build** (or 'Build And Run'), you're asked to select some folder where the solution should be stored.
+
+---
+
+## Build the Visual Studio solution
+
 1. Open the generated **Quickstart.sln** with Visual Studio
 1. Change the configuration to **Release** and **ARM64**
 1. Switch the debugger mode to **Remote Machine**\
-    ![Solution configuration](media/unity-deploy-config.png)
+    ![A screenshot showing the Visual Studio configuration and debugger mode.](media/unity-deploy-config.png)
 1. Build the solution
-1. For the project 'Quickstart', go to *Properties > Debugging*
-    1. Make sure the configuration *Release* is active
+1. In the Solution Explorer, select the 'Quickstart' project
+    1. Go to *Properties*
+    1. Make sure the configuration *Release* and platform *ARM64* are active
+    1. Go to Debugging
     1. Set *Debugger to Launch* to **Remote Machine**
     1. Change *Machine Name* to the **IP of your HoloLens**
 
 ## Launch the sample project
 
 1. Connect the HoloLens with a USB cable to your PC.
-1. Start the Debugger in Visual Studio (F5). It will automatically deploy the app to the device.
+1. Start the Debugger in Visual Studio (F5). It automatically deploys the app to the device.
 
 The sample app should launch and then start a new session. After a while, the session is ready and the remotely rendered model will appear in front of you.
 If you want to launch the sample a second time later, you can also find it from the HoloLens start menu now.

articles/remote-rendering/quickstarts/deploy-to-desktop.md

@@ -19,7 +19,7 @@ This quickstart covers how to deploy and run the quickstart sample app for Unity
 >
 > For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
 
-In this quickstart you'll learn how to:
+In this quickstart, you learn how to:
 
 > [!div class="checklist"]
 >
@@ -29,27 +29,27 @@ In this quickstart you'll learn how to:
 
 ## Prerequisites
 
-In this quickstart, we'll deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
+In this quickstart, we deploy the sample project from [Quickstart: Render a model with Unity](render-model.md).
 Make sure your credentials are saved properly with the scene and you can connect to a session from within the Unity editor.
 
-In Unity you need to have **Android Build Support** installed.
+In Unity, you need to have **Android Build Support** installed.
 
 Your Quest 2 / Quest Pro device must be set up for [Developer Mode](https://developer.oculus.com/documentation/native/android/mobile-device-setup/).
 
-You need to have the [Android SDK](https://developer.android.com/studio) installed, so that tools like the [Android Debug Bridge (ADB)](https://developer.android.com/tools/adb) are available. You should also make sure these are in your `PATH` environment variable.
+You need to have the [Android SDK](https://developer.android.com/studio) installed, so that tools like the [Android Debug Bridge (ADB)](https://developer.android.com/tools/adb) are available. You should also make sure the path to these binaries are in your `PATH` environment variable.
 
-Make sure your Quest device is connected to the PC and side-loading APKs via `adb` works.
+Make sure your Quest device is connected to the PC and side-loading Android Packages (APKs) via `adb` works.
 
 ## Build the sample project
 
 1. Open *File > Build Settings*.
-1. Change *Platform* to **Android**
+1. Change *Platform* to **Android**.
 1. If you want to be able to debug the APK, enable *Development Build*.
-1. Select **Switch to Platform**
-    ![Solution configuration](media/unity-deploy-config-android.png)
-1. When pressing **Build** (or 'Build And Run'), you'll be asked to select a folder where the APK should be stored.
+1. Select **Switch Platform**.
+    ![A screenshot showing the Build Menu with the settings set for an Android build.](media/unity-deploy-config-android.png)
+1. When pressing **Build** (or 'Build And Run'), you're asked to select a folder where the APK should be stored.
 1. Once the APK file is finished, it needs to be deployed to your device using `adb`.
-1. Open a command prompt, navigate to the APK file and run `adb install <YourFileName.apk>`
+1. Open a command prompt, navigate to the APK file, and run `adb install <YourFileName.apk>`.
 
 ## Launch the sample project