Merge pull request #2529 from MicrosoftDocs/master

7/18 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -1594,6 +1594,16 @@
             "redirect_url": "/visualstudio/msbuild/msbuild-glossary",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/nodejs/tutorial-nodejs.md",
+            "redirect_url": "/visualstudio/javascript/tutorial-nodejs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/nodejs/tutorial-nodejs-with-react-and-jsx.md",
+            "redirect_url": "/visualstudio/javascript/tutorial-nodejs-with-react-and-jsx",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/profiling/profiling-tools.md",
             "redirect_url": "/visualstudio/profiling/profiling-feature-tour",

docs/code-quality/code-analysis-for-managed-code-overview.md

@@ -23,6 +23,9 @@ Code analysis for managed code analyzes managed assemblies and reports informati
 
 The analysis tool represents the checks it performs during an analysis as warning messages. Warning messages identify any relevant programming and design issues and, when it is possible, supply information about how to fix the problem.
 
+> [!NOTE]
+> Static code analysis is not supported for .NET Core and .NET Standard projects in Visual Studio. If you run code analysis on a .NET Core or .NET Standard project as part of msbuild, you'll see an error similar to **error : CA0055 : Could not identify platform for \<your.dll>**. To analyze code in .NET Core or .NET Standard projects, use [Roslyn analyzers](../code-quality/roslyn-analyzers-overview.md) instead.
+
 ## IDE (integrated development environment) integration
 
 You can run code analysis on your project manually or automatically.

docs/data-tools/bind-wpf-controls-to-a-dataset.md

@@ -234,7 +234,7 @@ Build and run the application. Verify that you can view and update product recor
 
 ## Next steps
 
-After completing this walkthrough, you you might try the following related tasks:
+After completing this walkthrough, you might try the following related tasks:
 
 - Learn how to use the **Data Sources** window in Visual Studio to bind WPF controls to other types of data sources. For more information, see [Bind WPF controls to a WCF data service](../data-tools/bind-wpf-controls-to-a-wcf-data-service.md).
 
@@ -244,4 +244,4 @@ After completing this walkthrough, you you might try the following related tasks
 
 - [Bind WPF controls to data in Visual Studio](../data-tools/bind-wpf-controls-to-data-in-visual-studio.md)
 - [Dataset tools in Visual Studio](../data-tools/dataset-tools-in-visual-studio.md)
-- [Data Binding Overview](/dotnet/framework/wpf/data/data-binding-overview)
+- [Data Binding Overview](/dotnet/framework/wpf/data/data-binding-overview)

docs/data-tools/fill-datasets-by-using-tableadapters.md

@@ -100,7 +100,7 @@ TableAdapters use data commands to read to and write from the database. Use the
 When you use a TableAdapter, it effectively performs the same operations with the commands that you would typically perform. For example, when you call the adapter's `Fill` method, the adapter runs the data command in its `SelectCommand` property and uses a data reader (for example, <xref:System.Data.SqlClient.SqlDataReader>) to load the result set into the data table. Similarly, when you call the adapter's `Update` method, it runs the appropriate command (in the `UpdateCommand`, `InsertCommand`, and `DeleteCommand` properties) for each changed record in the data table.
 
 > [!NOTE]
-> If there is enough information in the main query, the `InsertCommand`, `UpdateCommand`, and `DeleteCommand` commands are created by default when the the TableAdapter is generated. If the TableAdapter's main query is more than a single table `SELECT` statement, it's possible the designer won't be able to generate `InsertCommand`, `UpdateCommand`, and `DeleteCommand`. If these commands aren't generated, you might receive an error when running the `TableAdapter.Update` method.
+> If there is enough information in the main query, the `InsertCommand`, `UpdateCommand`, and `DeleteCommand` commands are created by default when the TableAdapter is generated. If the TableAdapter's main query is more than a single table `SELECT` statement, it's possible the designer won't be able to generate `InsertCommand`, `UpdateCommand`, and `DeleteCommand`. If these commands aren't generated, you might receive an error when running the `TableAdapter.Update` method.
 
 ## TableAdapter GenerateDbDirectMethods
 

docs/debugger/debugging-absolute-beginners.md

@@ -35,7 +35,7 @@ It helps to clarify the problem that you ran into before you try to fix it. We e
 
 ## Examine your assumptions
 
-Before you investigate a bug or an error, think of the assumptions that made you expect a certain result. Hidden or unknown assumptions can get in the way of identifying a problem even when you are looking right at the cause of the problem in a debugger. You may have a long list of possible assumptions! Here are are few questions to ask yourself to challenge your assumptions.
+Before you investigate a bug or an error, think of the assumptions that made you expect a certain result. Hidden or unknown assumptions can get in the way of identifying a problem even when you are looking right at the cause of the problem in a debugger. You may have a long list of possible assumptions! Here are a few questions to ask yourself to challenge your assumptions.
 
 * Are you using the right API (that is, the right object, function, method, or property)? An API that you're using might not do what you think it does. (After you examine the API call in the debugger, fixing it may require a trip to the documentation to help identify the correct API.)
 
@@ -316,7 +316,7 @@ When you find the region of code with the problem, use the debugger to investiga
 
 * [Inspect variables](../debugger/view-data-values-in-data-tips-in-the-code-editor.md) and check whether they contain the type of values that they should contain. If you find a bad value, find out where the bad value was set (to find where the value was set, you might need to either restart the debugger, look at the [call stack](../debugger/how-to-use-the-call-stack-window.md), or both).
 
-* Check whether your application is executing the code that you expect. (For example, in the sample application, we expected the code for the switch statement to set the galaxy type to Irregular, but the the app skipped the code due to the typo.)
+* Check whether your application is executing the code that you expect. (For example, in the sample application, we expected the code for the switch statement to set the galaxy type to Irregular, but the app skipped the code due to the typo.)
 
 > [!TIP]
 > You use a debugger to help you find bugs. A debugging tool can find bugs *for you* only if it knows the intent of your code. A tool can only know the intent of your code if you, the developer, express that intent. Writing [unit tests](../test/improve-code-quality.md) is how you do that.

docs/deployment/toc.yml

@@ -19,47 +19,47 @@
   - name: .NET
     items:
     - name: Deploy a .NET Core Application with the Publish tool
-      href: /dotnet/core/deploying/deploy-with-vs?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /dotnet/core/deploying/deploy-with-vs
     - name: Package a desktop app for Microsoft Store (Desktop Bridge)
-      href: /windows/uwp/porting/desktop-to-uwp-packaging-dot-net?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /windows/uwp/porting/desktop-to-uwp-packaging-dot-net
     - name: Deploy a desktop app using ClickOnce
       href: how-to-publish-a-clickonce-application-using-the-publish-wizard.md
     - name: Build ClickOnce Applications from the Command Line
       href: building-clickonce-applications-from-the-command-line.md
   - name: ASP.NET
     items:
     - name: Publish an ASP.NET Core app to Azure
-      href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs
+    - name: Deploy to IIS using Web Deploy
+      href: deploy-iis-with-web-deploy.md
     - name: Import publish settings and deploy to Azure
       href: tutorial-import-publish-settings-azure.md
     - name: Import publish settings and deploy to IIS
       href: tutorial-import-publish-settings-iis.md
-    - name: Deploy to IIS using Web Deploy
-      href: deploy-iis-with-web-deploy.md
     - name: Continuous deployment of ASP.NET Core to Azure with Git
-      href: /aspnet/core/publishing/azure-continuous-deployment?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /aspnet/core/publishing/azure-continuous-deployment
     - name: Publish to Kubernetes with Visual Studio Kubernetes tools
       href: tutorial-kubernetes-tools.md
   - name: Native
     items:
     - name: Deployment in Visual C++...
       href: /cpp/ide/deployment-in-visual-cpp
     - name: Package a desktop app for Microsoft Store (Desktop Bridge)
-      href: /windows/uwp/porting/desktop-to-uwp-packaging-dot-net?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /windows/uwp/porting/desktop-to-uwp-packaging-dot-net
     - name: Deploy a native app using ClickOnce...
       href: /cpp/ide/clickonce-deployment-for-visual-cpp-applications
   - name: UWP
     items:
     - name: Package a UWP app by using Visual Studio
-      href: /windows/uwp/packaging/packaging-uwp-apps?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /windows/uwp/packaging/packaging-uwp-apps
   - name: Node.js
     items:
-    - name: Publish to Azure Website using Web Deploy
-      href: https://github.com/Microsoft/nodejstools/wiki/Publish-to-Azure-Website-using-Web-Deploy?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+    - name: Publish to Linux App Service
+      href: /visualstudio/javascript/publish-nodejs-app-azure
   - name: Python
     items:
     - name: Publish to Azure App Service
-      href: /visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json
+      href: /visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio
 - name: How-to guides
   items:
   - name: ClickOnce Security and Deployment

docs/extensibility/walkthrough-displaying-light-bulb-suggestions.md

@@ -90,7 +90,7 @@ Light bulbs are icons used in the Visual Studio editor that expand to display a
     ```csharp  
     public ISuggestedActionsSource CreateSuggestedActionsSource(ITextView textView, ITextBuffer textBuffer)  
     {  
-        if (textBuffer == null && textView == null)  
+        if (textBuffer == null || textView == null)  
         {  
             return null;  
         }  
@@ -360,4 +360,4 @@ Light bulbs are icons used in the Visual Studio editor that expand to display a
      ![test light bulb, expanded](../extensibility/media/testlightbulbexpanded.gif "TestLIghtBulbExpanded")  
 
 6.  If you click the first action, all the text in the current word should be converted to upper case. If you click the second action, all the text should be converted to lower case.  
-  
+  

docs/ide/index.md

@@ -254,7 +254,7 @@ src="https://docs.microsoft.com/media/logos/logo_TS.svg"><span>TypeScript</span>
 
 <div class="ico48Link"><a href="/cpp/build/vscpp-step-0-installation"><img width="48" height="48" alt="C++ tutorial"
 src="https://docs.microsoft.com/media/logos/logo_Cplusplus.svg"><span>C++</span></a></div>
-<div class="ico48Link"><a href="/visualstudio/nodejs/tutorial-nodejs"><img width="48" height="48" alt="Node.js tutorial"
+<div class="ico48Link"><a href="/visualstudio/javascript/tutorial-nodejs"><img width="48" height="48" alt="Node.js tutorial"
 src="https://docs.microsoft.com/media/logos/logo_nodejs.svg"><span>Node.js</span></a></div>
 <div class="ico48Link"><a href="/visualstudio/python/tutorial-working-with-python-in-visual-studio-step-01-create-project"><img width="48" height="48" alt="Python tutorial"
 src="https://docs.microsoft.com/media/logos/logo_Python.svg"><span>Python</span></a></div>

docs/ide/quickstart-nodejs.md

@@ -84,7 +84,7 @@ Congratulations on completing this Quickstart in which you got started with the
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Deploy the app to Azure App Service](..//deployment/quickstart-deploy-to-azure.md)
+> [Deploy the app to Linux App Service](../javascript/publish-nodejs-app-azure.md)
 
-- [Tutorial for Node.js and Express](../nodejs/tutorial-nodejs.md)
-- [Tutorial for Node.js and React](../nodejs/tutorial-nodejs-with-react-and-jsx.md)
+- [Tutorial for Node.js and Express](../javascript/tutorial-nodejs.md)
+- [Tutorial for Node.js and React](../javascript/tutorial-nodejs-with-react-and-jsx.md)

docs/ide/quickstart-python.md

@@ -145,7 +145,7 @@ Congratulations on running your first Python app from Visual Studio, in which yo
 > [!div class="nextstepaction"]
 > [Deploy the app to Azure App Service](../python/publishing-python-web-applications-to-azure-from-visual-studio.md)
 
-Because the steps you followed in this Quickstart are fairly generic, you've probably guessed that they can and should be automated. Such automation is the role of Visual Studio project templates. Go through [Quickstart - Create a Python project using a template](../python/quickstart-02-python-in-visual-studio-project-from-template.md) for for a demonstration that creates a web app similar to the one you created in this article, but with fewer steps.
+Because the steps you followed in this Quickstart are fairly generic, you've probably guessed that they can and should be automated. Such automation is the role of Visual Studio project templates. Go through [Quickstart - Create a Python project using a template](../python/quickstart-02-python-in-visual-studio-project-from-template.md) for a demonstration that creates a web app similar to the one you created in this article, but with fewer steps.
 
 To continue with a fuller tutorial on Python in Visual Studio, including using the interactive window, debugging, data visualization, and working with Git, go through [Tutorial: Get started with Python in Visual Studio](../python/tutorial-working-with-python-in-visual-studio-step-01-create-project.md).
 

docs/javascript/TOC.yml

@@ -8,9 +8,9 @@
 - name: Tutorials
   items:
   - name: Create a Node.js app with Express
-    href: /visualstudio/nodejs/tutorial-nodejs?toc=/visualstudio/javascript/toc.json
+    href: tutorial-nodejs.md
   - name: Create a Node.js app with React
-    href: /visualstudio/nodejs/tutorial-nodejs-with-react-and-jsx?toc=/visualstudio/javascript/toc.json
+    href: tutorial-nodejs-with-react-and-jsx.md
   - name: Publish to Linux App Service
     href: publish-nodejs-app-azure.md
 - name: How-to Guides

docs/nodejs/media/tutorial-nodejs-deploy-target.png renamed to docs/javascript/media/tutorial-nodejs-deploy-target.png

@@ -103,4 +103,5 @@ Congratulations on completing this Quickstart! We hope you learned a little bit
 ## Next steps
 
 - Go through the [Tutorial for Node.js and Express](../nodejs/tutorial-nodejs.md)
-- Go through the [Tutorial for Node.js and React](../nodejs/tutorial-nodejs-with-react-and-jsx.md)
+- Go through the [Tutorial for Node.js and React](../nodejs/tutorial-nodejs-with-react-and-jsx.md)
+- [Deploy the app to Linux App Service](../javascript/publish-nodejs-app-azure.md)