From 0052ebb49a33f311eff4eb5475979e31e6b4e63b Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 8 Jun 2017 02:59:46 +0400
Subject: [PATCH] Add version to PowerShell banner (#3916)

Fixes #3895
---
 .../host/msh/ManagedEntrance.cs                               | 3 ++-
 .../resources/ManagedEntranceStrings.resx                     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
index e6365ae8c2..ba08d2c88e 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
@@ -115,9 +115,10 @@ namespace Microsoft.PowerShell
 #else
                 var banner = ManagedEntranceStrings.ShellBanner;
 #endif
+                var formattedBanner = string.Format(CultureInfo.InvariantCulture, banner, PSVersionInfo.GitCommitId);
                 exitCode = Microsoft.PowerShell.ConsoleShell.Start(
                     configuration,
-                    banner,
+                    formattedBanner,
                     ManagedEntranceStrings.ShellHelp,
                     warning == null ? null : warning.Message,
                     args);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 8db11ffc15..e8cfe094c5 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -118,11 +118,11 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ShellBanner" xml:space="preserve">
-    <value>Windows PowerShell 
+    <value>Windows PowerShell {0}
 Copyright (C) Microsoft Corporation. All rights reserved.</value>
   </data>
   <data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
-    <value>PowerShell 
+    <value>PowerShell {0}
 Copyright (C) Microsoft Corporation. All rights reserved.</value>
   </data>
   <data name="ShellHelp" xml:space="preserve">