From 99e4b87cc66424ba27242c66c181080797d2f34a Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Wed, 27 Jul 2016 10:48:36 -0700
Subject: [PATCH] Teach Start-DevPowerShell run CoreCLR version

---
 build.psm1                    | 7 ++++---
 docs/building/windows-full.md | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.psm1 b/build.psm1
index bf4eaf408..8941e2772 100644
--- a/build.psm1
+++ b/build.psm1
@@ -884,10 +884,11 @@ function Publish-NuGetFeed
 
 function Start-DevPowerShell {
     param(
+        [switch]$FullCLR,
         [switch]$ZapDisable,
         [string[]]$ArgumentList = '',
         [switch]$LoadProfile,
-        [string]$binDir = (Split-Path (New-PSOptions -FullCLR).Output),
+        [string]$binDir = (Split-Path (New-PSOptions -FullCLR:$FullCLR).Output),
         [switch]$NoNewWindow,
         [string]$Command,
         [switch]$KeepPSModulePath
@@ -918,7 +919,7 @@ function Start-DevPowerShell {
             $env:COMPLUS_ZapDisable = 1
         }
 
-        if (-not (Test-Path $binDir\powershell.exe.config)) {
+        if ($FullCLR -and (-not (Test-Path $binDir\powershell.exe.config))) {
             $configContents = @"
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
@@ -932,7 +933,7 @@ function Start-DevPowerShell {
 
         # splatting for the win
         $startProcessArgs = @{
-            FilePath = "$binDir\powershell.exe"
+            FilePath = "$binDir\powershell"
             ArgumentList = "$ArgumentList"
         }
 
diff --git a/docs/building/windows-full.md b/docs/building/windows-full.md
index f9c7e23fc..6a07e257e 100644
--- a/docs/building/windows-full.md
+++ b/docs/building/windows-full.md
@@ -92,20 +92,20 @@ Assembly Cache (GAC), not your output directory.
 Use `Start-DevPowerShell` helper funciton, to workaround it with `$env:DEVPATH`
 
 ```powershell
-Start-DevPowerShell
+Start-DevPowerShell -FullCLR
 ```
 
 This command has a reasonable default to run `powershell.exe` from the build output folder.
 If you are building an unusual configuration (i.e. not `Debug`), you can explicitly specify path to the bin directory
 
 ```powershell
-Start-DevPowerShell -binDir .\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451
+Start-DevPowerShell -FullCLR -binDir .\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451
 ```
 
 Or more programmatically:
 
 ```powershell
-Start-DevPowerShell -binDir (Split-Path -Parent (Get-PSOutput))
+Start-DevPowerShell -FullCLR -binDir (Split-Path -Parent (Get-PSOutput))
 ```
 
 The default for produced `powershell.exe` is x64.