From 10fb87c2f168a64a3333a3feb3eec890c2c96a28 Mon Sep 17 00:00:00 2001 From: Nicholas Willard Date: Sat, 25 Feb 2017 22:47:11 -0600 Subject: [PATCH 1/3] Add dynamic year for managed entrance message. This change is to fix Issue #3148 - Update copywrite notices. --- .../host/msh/ManagedEntrance.cs | 5 +++-- .../resources/ManagedEntranceStrings.resx | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs index 17b896acd6b..ab6faf0abe1 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs @@ -106,12 +106,13 @@ public int Start(string consoleFilePath, string[] args) RunspaceConfigForSingleShell.Create(consoleFilePath, out warning); } int exitCode = 0; + string systemYear = DateTime.Now.Year.ToString(); try { #if CORECLR - var banner = ManagedEntranceStrings.ShellBannerNonWindowsPowerShell; + var banner = string.Format(ManagedEntranceStrings.ShellBannerNonWindowsPowerShell, systemYear); #else - var banner = ManagedEntranceStrings.ShellBanner; + var banner = string.Format(ManagedEntranceStrings.ShellBanner, systemYear); #endif exitCode = Microsoft.PowerShell.ConsoleShell.Start( configuration, diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx index 553a45a5a43..31e454d2078 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx +++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx @@ -119,11 +119,11 @@ Windows PowerShell -Copyright (C) 2016 Microsoft Corporation. All rights reserved. +Copyright (C) {0} Microsoft Corporation. All rights reserved. PowerShell -Copyright (C) 2016 Microsoft Corporation. All rights reserved. +Copyright (C) {0} Microsoft Corporation. All rights reserved. PowerShell[.exe] [-PSConsoleFile <file> | -Version <version>] From 4c188316572c8fccd4a083a89bbb9c39b6688fae Mon Sep 17 00:00:00 2001 From: Nicholas Willard Date: Sat, 4 Mar 2017 09:36:41 -0600 Subject: [PATCH 2/3] Update Copyright notices to not have a Date. Fixes Issue #3148 --- .../host/msh/ManagedEntrance.cs | 8 +++++--- .../resources/ManagedEntranceStrings.resx | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs index ab6faf0abe1..43384a9d43b 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs @@ -3,12 +3,15 @@ --********************************************************************/ using System; +using System.Diagnostics; using System.Reflection; using System.Management.Automation; using System.Management.Automation.Internal; using System.Management.Automation.Runspaces; using System.Management.Automation.Tracing; using System.Globalization; +using System.IO; + #if CORECLR using System.Runtime.InteropServices; #endif @@ -106,13 +109,12 @@ public int Start(string consoleFilePath, string[] args) RunspaceConfigForSingleShell.Create(consoleFilePath, out warning); } int exitCode = 0; - string systemYear = DateTime.Now.Year.ToString(); try { #if CORECLR - var banner = string.Format(ManagedEntranceStrings.ShellBannerNonWindowsPowerShell, systemYear); + var banner = string.Format(ManagedEntranceStrings.ShellBannerNonWindowsPowerShell); #else - var banner = string.Format(ManagedEntranceStrings.ShellBanner, systemYear); + var banner = string.Format(ManagedEntranceStrings.ShellBanner); #endif exitCode = Microsoft.PowerShell.ConsoleShell.Start( configuration, diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx index 31e454d2078..1d06e01d399 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx +++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx @@ -119,11 +119,11 @@ Windows PowerShell -Copyright (C) {0} Microsoft Corporation. All rights reserved. +Copyright (C) Microsoft Corporation. All rights reserved. PowerShell -Copyright (C) {0} Microsoft Corporation. All rights reserved. +Copyright (C) Microsoft Corporation. All rights reserved. PowerShell[.exe] [-PSConsoleFile <file> | -Version <version>] From 93ecd7075a7a8ef466fb2efc9f1f932e53280682 Mon Sep 17 00:00:00 2001 From: Nicholas Willard Date: Sat, 4 Mar 2017 11:14:34 -0600 Subject: [PATCH 3/3] Remove unnecessary string.Formats in the ManagedStrings.cs --- .../host/msh/ManagedEntrance.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs index 43384a9d43b..f7a0688199d 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs @@ -3,14 +3,12 @@ --********************************************************************/ using System; -using System.Diagnostics; using System.Reflection; using System.Management.Automation; using System.Management.Automation.Internal; using System.Management.Automation.Runspaces; using System.Management.Automation.Tracing; using System.Globalization; -using System.IO; #if CORECLR using System.Runtime.InteropServices; @@ -112,9 +110,9 @@ public int Start(string consoleFilePath, string[] args) try { #if CORECLR - var banner = string.Format(ManagedEntranceStrings.ShellBannerNonWindowsPowerShell); + var banner = ManagedEntranceStrings.ShellBannerNonWindowsPowerShell; #else - var banner = string.Format(ManagedEntranceStrings.ShellBanner); + var banner = ManagedEntranceStrings.ShellBanner; #endif exitCode = Microsoft.PowerShell.ConsoleShell.Start( configuration,