From 916d17e95832dd7d3a97ce2bb345262d1d8beaa7 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 30 Jun 2016 16:42:58 -0700
Subject: [PATCH] Fix Microsoft.PowerShell.ConsoleHost/map.json

---
 build.psm1                                    | 11 ++++++++++-
 src/Microsoft.PowerShell.ConsoleHost/map.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 9c359fb1d6..6120e73095 100644
--- a/build.psm1
+++ b/build.psm1
@@ -841,7 +841,16 @@ function Get-Mappings
     {
         $map = @{}
         $mapFiles | % {
-            $rawHashtable = $_ | Get-Content -Raw | ConvertFrom-Json | Convert-PSObjectToHashtable
+            $file = $_
+            try
+            {
+                $rawHashtable = $_ | Get-Content -Raw | ConvertFrom-Json | Convert-PSObjectToHashtable
+            }
+            catch
+            {
+                Write-Error "Exception, when processing $($file.FullName): $_"
+            }
+
             $mapRoot = Split-Path $_.FullName
             if ($KeepRelativePaths) 
             {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/map.json b/src/Microsoft.PowerShell.ConsoleHost/map.json
index 293e288dbb..472b2f6e6b 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/map.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/map.json
@@ -30,5 +30,5 @@
     "monad/src/host/msh/resources/ManagedEntranceStrings.resx":  "resources/ManagedEntranceStrings.resx",
     "monad/src/singleshell/installer/EngineInstaller.cs":  "singleshell/installer/EngineInstaller.cs",
     "monad/src/host/msh/ConsoleHostRawUserInterface.cs":  "host/msh/ConsoleHostRawUserInterface.cs",
-    "monad/src/host/msh/ConsoleHost.cs":  "host/msh/ConsoleHost.cs",
+    "monad/src/host/msh/ConsoleHost.cs":  "host/msh/ConsoleHost.cs"
 }