Merge branch 'master' into tglee-solexp

Author: TerryGLee

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "docs/ide/default-keyboard-shortcuts-for-frequently-used-commands-in-visual-studio.md",
+      "redirect_url": "/visualstudio/ide/default-keyboard-shortcuts-in-visual-studio",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/data-tools/additional-resources-for-troubleshooting-data-access-errors.md",
+      "redirect_url": "/answers/products/?WT.mc_id=msdnredirect-web-msdn",
+      "redirect_document_id": false
+    },
     {
       "source_path": "scripting-docs/javascript/misc/access-is-denied.md",
       "redirect_url": "/archive/scripting-docs/javascript/misc/access-is-denied",
@@ -46225,6 +46235,21 @@
       "redirect_url": "/visualstudio/ide/globalizing-and-localizing-applications",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/ide/not-in-toc/default-f1-typescript.md",
+      "redirect_url": "/visualstudio/ide/not-in-toc/default",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/ide/not-in-toc/default-f1-javascript.md",
+      "redirect_url": "/visualstudio/ide/not-in-toc/default",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/ide/not-in-toc/default-f1-text-editor.md",
+      "redirect_url": "/visualstudio/ide/not-in-toc/default",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/ide/not-in-toc/intellicode-faq.md",
       "redirect_url": "/visualstudio/intellicode/faq",
@@ -57928,6 +57953,11 @@
       "source_path": "gamedev/unity/extensibility/share-the-unity-log-callback-with-vstu.md",
       "redirect_url": "/visualstudio/gamedev/unity/extensibility/programming-visual-studio-tools-for-unity",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/ide/whats-new-visual-studio-docs-history.md",
+      "redirect_url": "/visualstudio/ide/whats-new-visual-studio-docs",
+      "redirect_document_id": false
     }
   ]
 }

docker/tutorials/media/download-zip.png

@@ -43,14 +43,15 @@ To run your container to support a development workflow, you'll do the following
 
     ```bash
     docker run -dp 3000:3000 \
-        -w /app -v ${PWD}:/app \
+        -w /app \
+        -v "%cd%:/app" \
         node:12-alpine \
         sh -c "yarn install && yarn run dev"
     ```
 
     - `-dp 3000:3000` - same as before. Run in detached (background) mode and create a port mapping
     - `-w /app` - sets the "working directory" or the current directory that the command will run from
-    - `-v ${PWD}:/app` - bind mount the current directory from the host in the container into the `/app` directory
+    - `-v "%cd%:/app"` - bind mount the current directory from the host in the container into the `/app` directory
     - `node:12-alpine` - the image to use. Note that this is the base image for your app from the Dockerfile
     - `sh -c "yarn install && yarn run dev"` - the command. We're starting a shell using `sh` (alpine doesn't have `bash`) and running `yarn install` to install *all* dependencies and then running `yarn run dev`. If you look in the `package.json`, we'll see that the `dev` script is starting `nodemon`.
 

docker/tutorials/use-bind-mounts.md

@@ -24,7 +24,9 @@ Before you can run the application, you need to get the application source code
 
 1. Make sure that you have Docker for Windows or Docker Community Edition installed on the local machine. See [Docker for Windows installation documentation](https://docs.docker.com/docker-for-windows/install/). The install process makes the ZIP file containing the sample available at the localhost address.
 
-1. [Download the ZIP](https://github.com/docker/getting-started/tree/master/app). Open the ZIP file and make sure you extract the contents.
+1. Download the source for the app from the [Docker](https://github.com/docker/getting-started) repo. You can download the ZIP file for the repo. To download the ZIP file, use the green **Code** button and choose **Download ZIP**. Open the ZIP file and Extract All to extract the source of the app from the *app* folder to a folder on your hard drive.
+
+   ![Screenshot showing the green Code button and Download ZIP option](media/download-zip.png)
 
 1. Once extracted, use your favorite code editor to open the project. If you're in need of an editor, you can use [Visual Studio Code](https://code.visualstudio.com/). You should see the `package.json` and two subdirectories (`src` and `spec`).
 

docker/tutorials/your-application.md

@@ -107,6 +107,9 @@
       - name: VSTO
         tocHref: /visualstudio/vsto/
         topicHref: /visualstudio/vsto/create-vsto-add-ins-for-office-by-using-visual-studio
+    - name: Version Control
+      tocHref: /visualstudio/version-control
+      topicHref: /visualstudio/version-control/index
     - name: Azure Development
       tocHref: /visualstudio/azure
       topicHref: /visualstudio/azure/index

docs/_breadcrumb/toc.yml

@@ -11,7 +11,7 @@ monikerRange: ">= vs-2019"
 ---
 # Add a connection to Azure SQL Database
 
-With Visual Studio, you can connect any of the following to Azure SQL database by using the **Connected Services** feature:
+With Visual Studio, you can connect any of the following to Azure SQL Database by using the **Connected Services** feature:
 
 - .NET Framework console app
 - ASP.NET MVC (.NET Framework) 

docs/azure/azure-sql-database-add-connected-service.md

@@ -181,4 +181,4 @@ Visual Studio ASP.NET projects offer an option to create a handy virtual machine
 
 * Use **IntelliTrace** to collect a log of calls and events from a release server. See [Debugging a Published Cloud Service with IntelliTrace and Visual Studio](vs-azure-tools-IntelliTrace-debug-published-cloud-services.md).
 
-* Use **Azure Diagnostics** to log detailed information from code running within roles, whether the roles are running in the development environment or in Azure. See [Collecting logging data by using Azure Diagnostics](/azure/cloud-services/cloud-services-dotnet-diagnostics).
+* Use **Azure Diagnostics** to log detailed information from code running within roles, whether the roles are running in the development environment or in Azure. See [Collecting logging data by using Azure Diagnostics](/azure/cloud-services/cloud-services-dotnet-diagnostics).

docs/azure/vs-azure-tools-debug-cloud-services-virtual-machines.md

@@ -8,8 +8,23 @@ ms.topic: conceptual
 ms.date: 03/25/2017
 ms.author: ghogen
 ---
+
 # Manage the resources associated with your Azure accounts in Visual Studio Cloud Explorer
 
+::: moniker range=">=vs-2022"
+> [!Important]
+> Cloud Explorer has been retired in Visual Studio 2022. Instead, you can use the following alternatives:
+> - Use [Microsoft Azure Storage Explorer](/azure/vs-azure-tools-storage-manage-with-storage-explorer) is a free, standalone app from Microsoft. You can use it to work visually with Azure Storage data on Windows, macOS, and Linux.
+> - The [Kudu console](https://github.com/projectkudu/kudu/wiki/Kudu-console) gives you direct, elevated command-line access to the App Service server and its file system. This is both a valuable debugging tool and allows for CLI operations such as installing packages.
+>
+> If needed, you can use the Azure Portal or continue to use the Azure node of Server Explorer in previous versions of Visual Studio.
+>
+> For more information about Visual Studio 2022, see our [release notes](/visualstudio/releases/2022/release-notes-preview/).
+
+::: moniker-end
+
+::: moniker range="<=vs-2019"
+
 Cloud Explorer enables you to view your Azure resources and resource groups, inspect their properties, and perform key developer diagnostics actions from within Visual Studio.
 
 Like the [Azure portal](https://portal.azure.com), Cloud Explorer is built on the Azure Resource Manager stack. Therefore, Cloud Explorer understands resources such as Azure resource groups and Azure services such as Logic apps and API apps, and it supports [role-based access control](/azure/role-based-access-control/role-assignments-portal) (RBAC).
@@ -98,3 +113,5 @@ To locate resources with a specific name in your Azure account subscriptions, en
   ![Finding resources in Cloud Explorer](./media/vs-azure-tools-resources-managing-with-cloud-explorer/search-for-resources.png)
 
 As you enter characters in the **Search** box, only resources that match those characters appear in the resource tree.
+
+::: moniker-end

docs/azure/vs-azure-tools-resources-managing-with-cloud-explorer.md

@@ -8,8 +8,21 @@ ms.topic: conceptual
 ms.date: 8/31/2017
 ms.author: ghogen
 ---
+
 # Accessing Azure Virtual Machines from Server Explorer
 
+::: moniker range=">=vs-2022"
+> [!Important]
+> The Azure node of Server Explorer has been retired in Visual Studio 2022. You can use the Azure Portal or continue to use the Azure node of Server Explorer in previous versions of Visual Studio.
+>
+> Also, [Microsoft Azure Storage Explorer](/azure/vs-azure-tools-storage-manage-with-storage-explorer) is a free, standalone app from Microsoft. You can use it to work visually with Azure Storage data on Windows, macOS, and Linux.
+>
+> For more information about Visual Studio 2022, see our [release notes](/visualstudio/releases/2022/release-notes-preview/).
+
+::: moniker-end
+
+::: moniker range="<=vs-2019"
+
 If you have virtual machines hosted by Azure, you can access them in Server Explorer. You must first sign in to your Azure subscription to view your mobile services. To sign in, open the shortcut menu for the Azure node in Server Explorer, and choose **Connect to Microsoft Azure**.
 
 1. In Cloud Explorer, choose a virtual machine, and then choose the F4 key to show its properties window.
@@ -33,3 +46,5 @@ If you have virtual machines hosted by Azure, you can access them in Server Expl
    | Private Port |The port for network access internal to your application. |
    | Protocol |The protocol that the transport layer for this endpoint uses, either TCP or UDP. |
    | Public Port |The port that’s used for public access to your application. |
+
+::: moniker-end

docs/azure/vs-azure-tools-virtual-machines-access-from-server-explorer.md

@@ -1,26 +1,35 @@
 ---
-title: Use Bridge to Kubernetes with Visual Studio
-titleSuffix: ""
+title: "Tutorial: Connect development machines with Bridge to Kubernetes"
 ms.technology: vs-azure
 ms.date: 03/24/2021
-ms.topic: "quickstart"
-description: "Learn how to use Bridge to Kubernetes with Visual Studio to connect your development computer to a Kubernetes cluster"
+ms.topic: "tutorial"
+description: "Connect your development computer to a Kubernetes cluster with Bridge to Kubernetes with Visual Studio."
 keywords: "Bridge to Kubernetes, Azure Dev Spaces, Dev Spaces, Docker, Kubernetes, Azure, containers"
 monikerRange: ">=vs-2019"
 ms.author: ghogen
 author: ghogen
 manager: jmartens
 ---
 
-# Use Bridge to Kubernetes
+# Tutorial: Use Bridge to Kubernetes to connect your clusters and your development computers
 
-You can use Bridge to Kubernetes to redirect traffic between your Kubernetes cluster and code running on your development computer. This guide also provides a script for deploying a large sample application with multiple microservices on a Kubernetes cluster.
+In this tutorial, you'll learn how to use Bridge to Kubernetes to redirect traffic between your Kubernetes cluster and code running on your development computer. 
 
-## Before you begin
+This guide also provides a script for deploying a large sample application with multiple microservices on a Kubernetes cluster.
 
-This guide uses the [TODO App sample application][todo-app-github] to demonstrate connecting your development computer to a Kubernetes cluster. If you already have your own application running on a Kubernetes cluster, you can still follow the steps below and use the names of your own services.
+Learn more about Bridge to Kubernetes with the article, [How Bridge to Kubernetes works](overview-bridge-to-kubernetes.md).
 
-This sample illustrates how Bridge to Kubernetes can be used to develop a microservice version of a simple TODO application on any Kubernetes cluster. This sample, using Visual Studio, has been adapted from code provided by [TodoMVC](http://todomvc.com). These steps should work with any Kubernetes cluster.
+## Prerequisites
+
+- A Kubernetes cluster
+- [Visual Studio 2019][visual-studio] version 16.7 Preview 4 or greater running on Windows 10.
+- [Bridge to Kubernetes extension installed][btk-extension]
+
+## About the data
+
+This tutorial uses Bridge to Kubernetes to develop a microservice version of a simple TODO sample application on any Kubernetes cluster. This [TODO App sample application][todo-app-github], using Visual Studio, has been adapted from code provided by [TodoMVC](http://todomvc.com). 
+
+ These steps should work with any Kubernetes cluster. So, if you already have your own application running on a Kubernetes cluster, you can still follow the steps below and use the names of your own services.
 
 The TODO application sample is composed of a frontend and a backend that provides persistent storage. This extended sample adds a statistics component and breaks the application into a number of microservices, specifically:
 
@@ -32,15 +41,10 @@ The TODO application sample is composed of a frontend and a backend that provide
 
 In all, this extended TODO application is composed of six interrelated components.
 
-### Prerequisites
-
-- a Kubernetes cluster
-- [Visual Studio 2019][visual-studio] version 16.7 Preview 4 or greater running on Windows 10.
-- [Bridge to Kubernetes extension installed][btk-extension].
 
 ## Check the cluster
 
-Open a command prompt, and check that the kubectl is installed and on the path, the cluster you want to use is available and ready, and set the context to that cluster.
+Open a command prompt, and check that the `kubectl` is installed and on the path, the cluster you want to use is available and ready, and set the context to that cluster.
 
 ```cmd
 kubectl cluster-info
@@ -152,4 +156,4 @@ Learn how Bridge to Kubernetes works.
 [visual-studio]: https://www.visualstudio.com/vs/
 [btk-extension]: https://marketplace.visualstudio.com/items?itemName=ms-azuretools.mindaro
 [kubernetesLocalProcessConfig-yaml]: configure-bridge-to-kubernetes.md
-[btk-overview-routing]: overview-bridge-to-kubernetes.md#using-routing-capabilities-for-developing-in-isolation
+[btk-overview-routing]: overview-bridge-to-kubernetes.md#using-routing-capabilities-for-developing-in-isolation