From b9b8ee4f578430294f0cf452e6178172b399c45d Mon Sep 17 00:00:00 2001
From: iSazonov <darpa@yandex.ru>
Date: Fri, 2 Jun 2017 11:43:15 +0300
Subject: [PATCH 1/2] Add version to PowerShell banner

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

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
index f7a0688199d..ee8e9e5c082 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
@@ -114,9 +114,10 @@ public int Start(string consoleFilePath, string[] args)
 #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 4ae453d4936..d584523dda8 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -119,11 +119,13 @@
   </resheader>
   <data name="ShellBanner" xml:space="preserve">
     <value>Windows PowerShell 
-Copyright (C) Microsoft Corporation. All rights reserved.</value>
+Copyright (C) Microsoft Corporation. All rights reserved.
+Version: {0}</value>
   </data>
   <data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
     <value>PowerShell 
-Copyright (C) Microsoft Corporation. All rights reserved.</value>
+Copyright (C) Microsoft Corporation. All rights reserved.
+Version: {0}</value>
   </data>
   <data name="ShellHelp" xml:space="preserve">
     <value>PowerShell[.exe] [-PSConsoleFile &lt;file&gt; | -Version &lt;version&gt;]

From b477f49ae52bd835c6f4d05c5d1a2b42ac0fe0cd Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Sat, 3 Jun 2017 11:20:03 +0500
Subject: [PATCH 2/2] Change banner

---
 .../resources/ManagedEntranceStrings.resx              | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index d584523dda8..00aed63ccee 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -118,14 +118,12 @@
     <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 
-Copyright (C) Microsoft Corporation. All rights reserved.
-Version: {0}</value>
+    <value>Windows PowerShell {0}
+Copyright (C) Microsoft Corporation. All rights reserved.</value>
   </data>
   <data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
-    <value>PowerShell 
-Copyright (C) Microsoft Corporation. All rights reserved.
-Version: {0}</value>
+    <value>PowerShell {0}
+Copyright (C) Microsoft Corporation. All rights reserved.</value>
   </data>
   <data name="ShellHelp" xml:space="preserve">
     <value>PowerShell[.exe] [-PSConsoleFile &lt;file&gt; | -Version &lt;version&gt;]