diff --git a/build.ps1 b/build.ps1
index 82f1241ad6..b9982b5beb 100644
--- a/build.ps1
+++ b/build.ps1
@@ -231,9 +231,9 @@ elseif ($Projects) {
     $MSBuildArguments += "/p:Projects=$Projects"
 }
 else {
-    # When adding new sub-group build flags, add them to this check
+    # When adding new sub-group build flags, add them to this check.
     if((-not $Native) -and (-not $Managed) -and (-not $NodeJS)) {
-        Write-Warning "No default group of projects was specified, so building the 'managed' and 'native' subset of projects. Run ``build.cmd -help`` for more details."
+        Write-Warning "No default group of projects was specified, so building the 'managed' subset of projects. Run ``build.cmd -help`` for more details."
 
         # This goal of this is to pick a sensible default for `build.cmd` with zero arguments.
         # We believe the most common thing our contributors will work on is C#, so if no other build group was picked, build the C# projects.
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index 128f8d4c95..c13d20ec92 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -17,6 +17,9 @@ Building ASP.NET Core on Windows requires:
 * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies)
 * Visual Studio 2017. <https://visualstudio.com>
     * To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1). This will use VS2017.
+        ```ps1
+        PS> ./eng/scripts/InstallVisualStudio.ps1 -Edition Community
+        ```
 * Git. <https://git-scm.org>
 * (Optional) some optional components, like the SignalR Java client, may require
     * NodeJS. LTS version of 10.14.2 or newer recommended <https://nodejs.org>
diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1
index 918292cef2..d0c26472f6 100644
--- a/eng/scripts/InstallVisualStudio.ps1
+++ b/eng/scripts/InstallVisualStudio.ps1
@@ -1,66 +1,81 @@
 <#
 .SYNOPSIS
-    Installs or updates Visual Studio on a local developer machine
-.PARAMETER Update
-    Update VS to latest version instead of modifying the installation to include new workloads.
-.PARAMETER Quiet
-    Whether to run installer in the background
+    Installs or updates Visual Studio on a local developer machine.
+.DESCRIPTION
+    This installs Visual Studio along with all the workloads required to contribute to this repository.
+.PARAMETER Edition
+    Must be one of these values:
+
+        Community
+        Professional
+        Enterprise
+
+    Selects which 'offering' of Visual Studio to install.
+
+.PARAMETER InstallPath
+    The location of Visual Studio
+.PARAMETER Passive
+    Run the installer without requiring interaction.
+.LINK
+    https://visualstudio.com
+    https://github.com/aspnet/AspNetCore/blob/master/docs/BuildFromSource.md
+.EXAMPLE
+    To install VS 2017 Community, run
+
+        InstallVisualStudio.ps1 -Edition Community
 #>
 [CmdletBinding(DefaultParameterSetName = 'Default')]
 param(
-    [switch]$Update,
-    [switch]$Quiet
+    [ValidateSet('Community', 'Professional', 'Enterprise')]
+    [string]$Edition,
+    [string]$InstallPath,
+    [switch]$Passive
 )
 
+if (-not $Edition) {
+    Write-Host "You must specify a value for the -Edition parameter which selects the kind of Visual Studio to install." -f Red
+    Write-Host "Run ``Get-Help $PSCommandPath`` for more details." -f Red
+    Write-Host ""
+    Write-Host "Example:  ./InstallVisualStudio -Edition Community" -f Red
+    Write-Host ""
+    exit 1
+}
+
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 1
 
 $intermedateDir = "$PSScriptRoot\obj"
 mkdir $intermedateDir -ErrorAction Ignore | Out-Null
 
-$bootstrapper = "$intermedateDir\vs_enterprise1.exe"
-Invoke-WebRequest -Uri 'https://aka.ms/vs/15/release/vs_enterprise.exe' -OutFile $bootstrapper
+$bootstrapper = "$intermedateDir\vsinstaller.exe"
+Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_$($Edition.ToLowerInvariant()).exe" -OutFile $bootstrapper
+
+if (-not $InstallPath) {
+    $InstallPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\$Edition"
+}
 
-$vsJson = "$PSScriptRoot\vs.json"
 # no backslashes - this breaks the installer
-$vsInstallPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Enterprise"
-$arguments = @(
-    '--installPath', "`"$vsInstallPath`"",
-    '--in', $vsJson,
-    '--wait',
-    '--norestart')
+$InstallPath = $InstallPath.TrimEnd('\')
 
-if ($Update) {
-    $arguments = ,'update' + $arguments
-}
-else {
-    $arguments = ,'modify' + $arguments
+[string[]] $arguments = @()
+
+if (Test-path $InstallPath) {
+    $arguments += 'modify'
 }
 
-if ($Quiet) {
-    $arguments += '--quiet'
+$arguments += `
+    '--productId', "Microsoft.VisualStudio.Product.$Edition", `
+    '--installPath', "`"$InstallPath`"", `
+    '--in', "$PSScriptRoot\vs.json", `
+    '--norestart'
+
+if ($Passive) {
+    $arguments += '--passive'
 }
 
-Write-Host "Running '$bootstrapper $arguments' on $(hostname)"
-$process = Start-Process -FilePath $bootstrapper `
-    -ArgumentList $arguments `
-    -Verb runas `
-    -PassThru `
-    -ErrorAction Stop
-Write-Host "pid = $($process.Id)"
-Wait-Process -InputObject $process
-Write-Host "exit code = $($process.ExitCode)"
+Write-Host ""
+Write-Host "Installing Visual Studio 2017 $Edition" -f Magenta
+Write-Host ""
+Write-Host "Running '$bootstrapper $arguments'"
 
-# https://docs.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio#error-codes
-if ($process.ExitCode -eq 3010) {
-    Write-Warning "Agent $(hostname) requires restart to finish the VS update"
-}
-elseif ($process.ExitCode -eq 5007) {
-    Write-Error "Operation was blocked - the computer does not meet the requirements"
-}
-elseif (($process.ExitCode -eq 5004) -or ($process.ExitCode -eq 1602)) {
-    Write-Error "Operation was canceled"
-}
-elseif ($process.ExitCode -ne 0) {
-    Write-Error "Installation failed on $(hostname) for unknown reason"
-}
+& $bootstrapper @arguments
\ No newline at end of file
diff --git a/eng/scripts/vs.json b/eng/scripts/vs.json
index f30994f9f5..af9903867a 100644
--- a/eng/scripts/vs.json
+++ b/eng/scripts/vs.json
@@ -1,7 +1,6 @@
 {
     "channelUri": "https://aka.ms/vs/15/release/channel",
     "channelId": "VisualStudio.15.Release",
-    "productId": "Microsoft.VisualStudio.Product.Enterprise",
     "includeRecommended": false,
     "addProductLang": [
         "en-US"