Merge pull request #5685 from MicrosoftDocs/master637323537533082900

ghogen · web-flow · commit 0129c3330a72 · 2020-08-06T16:36:20.000-07:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -1,153 +1,153 @@
-{
-  "build_entry_point": "docs",
-  "docsets_to_publish": [
-    {
-      "docset_name": "Docker",
-      "build_source_folder": "docker",
-      "build_output_subfolder": "Docker",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "docs",
-      "build_source_folder": "docs",
-      "build_output_subfolder": "vsdocsdocs",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [
-        "vs-2015",
-        ">= vs-2017"
-      ],
-      "xref_query_tags": [
-        "/dotnet",
-        "/uwp/api"
-      ],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content",
-        "LandingData": "Content",
-        "ContextObject": "Toc",
-        "APIConnector": "Content"
-      },
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "gamedev",
-      "build_source_folder": "visualstudio/gamedev",
-      "build_output_subfolder": "gamedev",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "mac",
-      "build_source_folder": "mac",
-      "build_output_subfolder": "mac",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [
-        "vsmac-2017",
-        "vsmac-2019"
-      ],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content",
-        "ContextObject": "Toc"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "scripting-docs",
-      "build_source_folder": "scripting-docs",
-      "build_output_subfolder": "scripting-docs",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "subscriptions",
-      "build_source_folder": "subscriptions",
-      "build_output_subfolder": "subscriptions",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    }
-  ],
-  "notification_subscribers": [],
-  "sync_notification_subscribers": [
-    "ghogen@microsoft.com"
-  ],
-  "branches_to_filter": [],
-  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/visualstudio-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
-  "skip_source_output_uploading": false,
-  "need_preview_pull_request": true,
-  "need_pr_comments": true,
-  "contribution_branch_mappings": {},
-  "dependent_repositories": [
-    {
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "_themes.pdf",
-      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
-      "branch_mapping": {}
-    }
-  ],
-  "branch_target_mapping": {
-    "live": [
-      "Publish",
-      "Pdf"
-    ]
-  },
-  "need_generate_pdf_url_template": true,
-  "targets": {
-    "Pdf": {
-      "template_folder": "_themes.pdf"
-    }
-  },
-  "docs_build_engine": {
-    "name": "docfx_v3"
-  },
-  "need_generate_pdf": false,
-  "need_generate_intellisense": false,
-  "enable_branch_build_custom_validation": true,
-  "enable_pull_request_custom_validation": true
+{
+  "build_entry_point": "docs",
+  "docsets_to_publish": [
+    {
+      "docset_name": "Docker",
+      "build_source_folder": "docker",
+      "build_output_subfolder": "Docker",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "docs",
+      "build_source_folder": "docs",
+      "build_output_subfolder": "vsdocsdocs",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [
+        "vs-2015",
+        ">= vs-2017"
+      ],
+      "xref_query_tags": [
+        "/dotnet",
+        "/uwp/api"
+      ],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content",
+        "LandingData": "Content",
+        "ContextObject": "Toc",
+        "APIConnector": "Content"
+      },
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "gamedev",
+      "build_source_folder": "visualstudio/gamedev",
+      "build_output_subfolder": "gamedev",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "mac",
+      "build_source_folder": "mac",
+      "build_output_subfolder": "mac",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [
+        "vsmac-2017",
+        "vsmac-2019"
+      ],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content",
+        "ContextObject": "Toc"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "scripting-docs",
+      "build_source_folder": "scripting-docs",
+      "build_output_subfolder": "scripting-docs",
+      "locale": "en-us",
+      "monikers": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "subscriptions",
+      "build_source_folder": "subscriptions",
+      "build_output_subfolder": "subscriptions",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    }
+  ],
+  "notification_subscribers": [],
+  "sync_notification_subscribers": [
+    "ghogen@microsoft.com"
+  ],
+  "branches_to_filter": [],
+  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/visualstudio-docs",
+  "git_repository_branch_open_to_public_contributors": "master",
+  "skip_source_output_uploading": false,
+  "need_preview_pull_request": true,
+  "need_pr_comments": true,
+  "contribution_branch_mappings": {},
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "master",
+      "branch_mapping": {}
+    }
+  ],
+  "branch_target_mapping": {
+    "live": [
+      "Publish",
+      "Pdf"
+    ]
+  },
+  "need_generate_pdf_url_template": true,
+  "targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  },
+  "need_generate_pdf": false,
+  "need_generate_intellisense": false,
+  "enable_branch_build_custom_validation": true,
+  "enable_pull_request_custom_validation": true
 }
diff --git a/docs/containers/local-process-kubernetes.md b/docs/containers/local-process-kubernetes.md
@@ -141,7 +141,7 @@ Local Process with Kubernetes can handle routing traffic and replicating environ
 
 ## Using logging and diagnostics
 
-You can find the diagnostic logs in `Azure Dev Spaces` directory in your [development computer's *TEMP* directory][azds-tmp-dir].
+You can find the diagnostic logs in `Local Process with Kubernetes` directory in your development computer's *TEMP* directory. 
 
 ## Remove the sample application from your cluster
 
@@ -159,7 +159,6 @@ Learn how Local Process Kubernetes works.
 > [How Local Process with Kubernetes works](overview-local-process-kubernetes.md)
 
 [azds-cli]: /azure/dev-spaces/how-to/install-dev-spaces#install-the-client-side-tools
-[azds-tmp-dir]: /azure/dev-spaces/troubleshooting#before-you-begin
 [azds-vs-code]: https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds
 [azure-cli]: /cli/azure/install-azure-cli?view=azure-cli-lates
 [azure-cloud-shell]: /azure/cloud-shell/w.md
diff --git a/docs/containers/overview-local-process-kubernetes.md b/docs/containers/overview-local-process-kubernetes.md
@@ -43,6 +43,9 @@ After you establish a connection to your cluster, you can run and debug code nat
 
 In addition, Local Process with Kubernetes provides a way to replicate environment variables and mounted files available to pods in your cluster on your development computer through the `KubernetesLocalProcessConfig.yaml` file. You can also use this file to create new environment variables and volume mounts.
 
+> [!NOTE]
+> For the duration of the connection to the cluster (plus an additional 15 minutes), Local Process with Kubernetes runs a process called *EndpointManager* with admin permissions on your local computer.
+
 ## Additional configuration with KubernetesLocalProcessConfig.yaml
 
 The `KubernetesLocalProcessConfig.yaml` file allows you to replicate environment variables and mounted files available to your pods in your cluster. For more information on the additional configuration options, see [Configure Local Process with Kubernetes][using-config-yaml].
@@ -88,7 +91,7 @@ When you disconnect from your cluster, by default, Local Process with Kubernetes
 
 ## Diagnostics and logging
 
-When using Local Process with Kubernetes to connect to your cluster, diagnostic logs from your cluster are logged to your development computer's [temporary directory][azds-tmp-dir].
+When using Local Process with Kubernetes to connect to your cluster, diagnostic logs from your cluster are logged to your development computer's *TEMP* directory in the *Local Process with Kubernetes* folder.
 
 ## Limitations
 
diff --git a/docs/containers/tutorial-kubernetes-tools.md b/docs/containers/tutorial-kubernetes-tools.md
@@ -119,7 +119,7 @@ The added files are:
 
 - *azds.yaml*. This contains settings for Azure Dev Spaces, which provides a rapid, iterative debugging experience in Azure Kubernetes Service. For more information, see [the Azure Dev Spaces documentation](/azure/dev-spaces/azure-dev-spaces).
 
-::: moniker range="vs-2017"
+:::moniker range="vs-2017"
 
 ## Publish to Azure Kubernetes Service (AKS)
 
@@ -163,6 +163,16 @@ To do this, you first need to double-check that you've installed everything as d
 
 Congratulations! You can now use the full power of Visual Studio for all your Kubernetes app development.
 
+## Remove Kubernetes support
+
+1. In **Solution Explorer**, under **Properties**, open *launchSettings.json*.
+
+1. Delete the section **Container in Kubernetes**.
+
+1. If you're switching back to Docker compose, select that project in **Solution Explorer**, right-click and choose **Set as Startup Project**.
+
+1. (Optional) You can also delete other artifacts listed as mentioned earlier in the article, such as the **charts** folder and *azds.yaml*.
+
 ## Next steps
 
 Learn more about Kubernetes development on Azure by reading the [AKS documentation](/azure/aks).
diff --git a/docs/msbuild/toc.yml b/docs/msbuild/toc.yml
@@ -443,6 +443,8 @@
       href: common-msbuild-project-properties.md
     - name: Common MSBuild project items
       href: common-msbuild-project-items.md
+    - name: Common MSBuild item metadata
+      href: common-msbuild-item-metadata.md
     - name: MSBuild command-line reference
       href: msbuild-command-line-reference.md
     - name: MSBuild .targets files
