Merge pull request #1722 from MicrosoftDocs/master

Taojunshen · web-flow · commit 2cd04315455c · 2018-04-02T11:09:26.000-07:00
4/2 AM Publish
diff --git a/connected-environment/TOC.md b/connected-environment/TOC.md
@@ -30,6 +30,7 @@
 
 # How to
 ##[Share a development environment](how-to/share-dev-environment.md)
+##[Use a custom NuGet feed](how-to/use-a-custom-nuget-feed.md)
 ##[Use kubectl with Visual Studio Connected Environment](how-to/use-kubectl-with-vsce.md)
 
 # [Troubleshoot](troubleshooting.md)
diff --git a/connected-environment/how-to/use-a-custom-nuget-feed.md b/connected-environment/how-to/use-a-custom-nuget-feed.md
@@ -0,0 +1,58 @@
+---
+title: "How to use a custom NuGet feed in a connected environment| Microsoft Docs"
+author: "johnsta"
+ms.author: "johnsta"
+ms.date: "03/27/2018"
+ms.topic: "article"
+description: "Use a custom NuGet feed to access and use NuGet packages in a connected environment."
+keywords: "Docker, Kubernetes, Azure, AKS, Azure Container Service, containers"
+manager: "ghogen"
+---
+#  Use a custom NuGet feed in a connected environment
+
+A NuGet feed provides a convenient way to include package sources in a project. Connected Environment will need to be able to access this feed in order for dependencies to be properly installed in the Docker container.
+
+To set up a NuGet feed:
+1. Add a [package reference](https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files) in the `*.csproj` file under the `PackageReference` node.
+
+   ```xml
+   <ItemGroup>
+       <!-- ... -->
+       <PackageReference Include="Contoso.Utility.UsefulStuff" Version="3.6.0" />
+       <!-- ... -->
+   </ItemGroup>
+   ```
+
+2. Create a [NuGet.Config](https://docs.microsoft.com/en-us/nuget/reference/nuget-config-file) file in the project folder.
+     * Use the `packageSources` section to reference your NuGet feed location. Important: The NuGet feed must be publicly accessible.
+     * Use the `packageSourceCredentials` section to configure username and password credentials. 
+
+   ```xml
+   <packageSources>
+       <add key="Contoso" value="https://contoso.com/packages/" />
+   </packageSources>
+
+   <packageSourceCredentials>
+       <Contoso>
+           <add key="Username" value="user@contoso.com" />
+           <add key="ClearTextPassword" value="33f!!lloppa" />
+       </Contoso>
+   </packageSourceCredentials>
+   ```
+
+3. If you're using source code control:
+    - Reference `NuGet.Config` in your `.gitignore` file so you don't accidentally commit credentials to your source repository.
+    - Open the `vsce.yaml` file in your project, and locate the `build` section, and insert the following snippet to ensure that the `NuGet.Config` file will be synced to Azure so that it used during the container image build process. (By default, Connected Environment does not synchronize files that match `.gitignore` and `.dockerignore` rules.)
+
+        ```yaml
+        build:
+        useGitIgnore: true
+        ignore:
+        - “!NuGet.Config”
+        ```
+
+
+## Next steps
+
+Once you have completed the above steps, the next time you run `vsce up` (or hit `F5` in VSCode or Visual Studio), Connected Environment will synchronize the `NuGet.Config` file to Azure, which is then utilized by `dotnet restore` to install package dependencies in the container.
+
diff --git a/docs/cross-platform/visual-studio-emulator-for-android.md b/docs/cross-platform/visual-studio-emulator-for-android.md
@@ -17,15 +17,15 @@ ms.workload:
 ---
 # Visual Studio Emulator for Android
 The Visual Studio Emulator for Android is a desktop application that emulates an Android device. It provides a virtualized environment in which you can debug and test Android apps without a physical device. It also provides an isolated environment for your application prototypes.  
+
+> [!IMPORTANT]
+> In most scenarios, the Google Android emulator is recommended for use instead of the Visual Studio Emulator for Android:
+> - When you are in need of emulator images containing Android 7.0 or later, because there are no plans to publish Android images past version 6.0 for use in the Visual Studio Emulator for Android.
+> - When using Visual Studio Tools for Apache Cordova. For more information, see [Run your Apache Cordova app on Android](/visualstudio/cross-platform/tools-for-cordova/run-your-app/run-app-android#a-idgoogle-android-emulatora-run-on-the-google-android-emulator).
   
  The Visual Studio Emulator for Android is designed to provide comparable performance to an actual device. Before you publish your app, however, we recommend that you test your app on a physical device.  
   
  You can test your app on a unique device profile for each of the Android platforms, screen resolutions, and other hardware properties supported by Visual Studio Emulator for Android.
-
-> [!NOTE]
-> The Google Android emulator is recommended for use in the following cases:
-> - When using Visual Studio Tools for Apache Cordova. For more information, see [Run your Apache Cordova app on Android](/visualstudio/cross-platform/tools-for-cordova/run-your-app/run-app-android#a-idgoogle-android-emulatora-run-on-the-google-android-emulator).
-> - When in need of emulator images containing Android 7.0 or later as there are no plans to publish Android images past version 6.0 for use in Visual Studio Emulator for Android.
   
 ##  <a name="Installing"></a> Installing and uninstalling  
  Installing  
diff --git a/docs/debugger/includes/remote-debugger-download.md b/docs/debugger/includes/remote-debugger-download.md
@@ -18,7 +18,7 @@ translation.priority.ht:
 
     |Version|Link|Notes|
     |-|-|-|
-    |Visual Studio 2017 (latest version)|[Remote tools](https://www.visualstudio.com/downloads/#remote-tools-for-visual-studio-2017)|Always download the version matching your device operating system (x86 or x64). If enhanced security mode is enabled (Windows Server), you must add new trusted sites if prompted.|
+    |Visual Studio 2017 (latest version)|[Remote tools](https://www.visualstudio.com/downloads/?q=remote+tools#remote-tools-for-visual-studio-2017)|Always download the version matching your device operating system (x86 or x64). If enhanced security mode is enabled (Windows Server), you must add new trusted sites if prompted.|
     |Visual Studio 2017 (older)|[Remote tools](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202017)|Remote tools for earlier releases of Visual Studio 2017 are available from My.VisualStudio.com. If prompted, join the free Visual Studio Dev Essentials group, or sign in with your Visual Studio subscription ID. If enhanced security mode is enabled (Windows Server), you must add new trusted sites if prompted.|
     |Visual Studio 2015 Update 3|[Remote tools](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202015)|If prompted, join the free Visual Studio Dev Essentials group, or sign in with your Visual Studio subscription ID. If enhanced security mode is enabled (Windows Server), you must add new trusted sites if prompted.|
     |Visual Studio 2015 (older)|[Remote tools](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202015)|If prompted, join the free Visual Studio Dev Essentials group, or sign in with your Visual Studio subscription ID. If enhanced security mode is enabled (Windows Server), you must add new trusted sites if prompted.|
diff --git a/docs/deployment/deploying-applications-services-and-components.md b/docs/deployment/deploying-applications-services-and-components.md
@@ -1,5 +1,6 @@
 ---
 title: "Deployment Overview - Visual Studio | Microsoft Docs"
+description: "Learn about your options for deploying apps from Visual Studio."
 ms.custom: "mvc"
 ms.date: 11/26/2017
 ms.reviewer: ""
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -35,7 +35,7 @@
       "feedback_system": "GitHub",
       "feedback_github_repo": "MicrosoftDocs/visualstudio-docs",
       "feedback_product_url": "https://developercommunity.visualstudio.com/",
-      "breadcrumb_path": "~/_breadcrumb/toc.yml",
+      "breadcrumb_path": "/visualstudio/_breadcrumb/toc.json",
       "ROBOTS": "INDEX,FOLLOW",
       "author": "",
       "ms.author": "",
diff --git a/docs/ide/visual-studio-2017-for-dotnet-developers.md b/docs/ide/visual-studio-2017-for-dotnet-developers.md
@@ -27,12 +27,7 @@ If you are coming from another IDE or coding environment, you may find installin
 - [HotKeys for Visual Studio (ReSharper/IntelliJ)](https://marketplace.visualstudio.com/items?itemName=JustinClareburtMSFT.HotKeys)
 - [VSVim](https://marketplace.visualstudio.com/items?itemName=JaredParMSFT.VsVim)
 
-![The Visual Studio Extension Gallery](../ide/media/VSIDE_Productivity_Extensibility.png)
-
-The following are popular Visual Studio shortcuts. 
-
-> [!NOTE]
-> Some extensions unbind default Visual Studio keybindings so you must restore them to use the following commands. Restore your keybindings to Visual Studio's defaults by going to: **Tools > Import and Export Settings... > Reset all settings** or **Tools > Options > Keyboard > Reset**.
+The following are popular Visual Studio shortcuts: 
 
 | Shortcut (All Profiles) | Command | Description |
 |-|-|-|
@@ -49,6 +44,9 @@ The following are popular Visual Studio shortcuts.
 | **Ctrl+K,D** (Default Profile) or **Ctrl+E,D** (C# Profile) | Format Document | Cleans up formatting violations in your file based on your newline, spacing, and indentation settings |
 | **Ctrl+\\,E** (Default Profile) or **Ctrl+W,E** (C# Profile) | View Error List | See all errors in your document, project, or solution |
 
+> [!NOTE]
+> Some extensions unbind the default Visual Studio keybindings. To use the following commands, restore your keybindings to Visual Studio's defaults by going to **Tools > Import and Export Settings... > Reset all settings** or **Tools > Options > Keyboard > Reset**.
+
 ## I need a way to quickly navigate to files or types.
 Visual Studio 2017 has a feature called _Go To All_ (**Ctrl+T**). Go To All enables you to quickly jump to any file, type, member, or symbol declaration.
 - Change the location of this search bar or turn off the 'live navigation preview' with the **gear** icon
diff --git a/docs/msbuild/getassemblyidentity-task.md b/docs/msbuild/getassemblyidentity-task.md
@@ -50,15 +50,13 @@ Retrieves the assembly identities from the specified files and outputs the ident
     <ItemGroup>  
         <MyAssemblies Include="File1.dll;File2.dll" />  
     </ItemGroup>  
-  
-    <Target Name="RetrieveIdentities>  
+    <Target Name="RetrieveIdentities">  
         <GetAssemblyIdentity  
             AssemblyFiles="@(MyAssemblies)"  
             <Output  
                 TaskParameter="Assemblies"  
                 ItemName="MyAssemblyIdentities"  
     </Target>  
-  
 </Project>  
 ```  
   
diff --git a/docs/msbuild/target-build-order.md b/docs/msbuild/target-build-order.md
@@ -108,7 +108,7 @@ Targets must be ordered if the input to one target depends on the output of anot
   
 2.  Targets specified on the command line by the **/target** switch are run. If you specify no targets on the command line, then the `DefaultTargets` targets are run. If neither is present, then the first target encountered is run.  
   
-3.  The `Condition` attribute of the target is evaluated. If the `Condition` attribute is present and evaluates to `false`, the target isn't executed and has no further effect on the build.  
+3.  The `Condition` attribute of the target is evaluated. If the `Condition` attribute is present and evaluates to `false`, the target isn't executed and has no further effect on the build.
   
 4.  Before a target is executed, its `DependsOnTargets` targets are run.  
   
diff --git a/docs/nodejs/tutorial-nodejs-with-react-and-jsx.md b/docs/nodejs/tutorial-nodejs-with-react-and-jsx.md
@@ -6,7 +6,7 @@ ms.date: "02/19/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: 
-  - "vs-nodejs"
+  - "vs-ide-general"
 ms.tgt_pltfrm: ""
 ms.topic: "tutorial"
 ms.devlang: javascript
diff --git a/docs/nodejs/tutorial-nodejs.md b/docs/nodejs/tutorial-nodejs.md
@@ -6,7 +6,7 @@ ms.date: "03/13/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: 
-  - "vs-nodejs"
+  - "vs-ide-general"
 ms.tgt_pltfrm: ""
 ms.topic: "tutorial"
 ms.devlang: javascript
diff --git a/docs/python/default.yml b/docs/python/default.yml
@@ -1,3 +1,3 @@
 ### YamlMime:ContextObject
-breadcrumb_path: breadcrumb/toc.json
+breadcrumb_path: ~/breadcrumb/toc.json
 toc_rel: ./toc.yml
diff --git a/scripting-docs/javascript/variables-javascript.md b/scripting-docs/javascript/variables-javascript.md
@@ -44,7 +44,7 @@ var count = 0, amount = 100;
 ## Naming Variables  
  [!INCLUDE[javascript](../javascript/includes/javascript-md.md)] is a case-sensitive language. This means that a variable name such as **myCounter** is different from the variable name **MYCounter**. Variable names can be of any length. The rules for creating legal variable names are as follows:  
   
--   The first character must be an ASCII letter (either uppercase or lowercase), or an underscore (_) character. Note that a number cannot be used as the first character.  
+-   The first character must be an ASCII letter (either uppercase or lowercase), a letter that complies with Unicode variable naming conventions, or an underscore (_) character. Note that a number cannot be used as the first character.  
   
 -   Subsequent characters must be letters, numbers, or underscores (_).  
   
