From f96a928a4299cca6562544502d0711a66c942957 Mon Sep 17 00:00:00 2001 From: Ilya Date: Thu, 12 Apr 2018 09:33:52 +0400 Subject: [PATCH] Re-order UFormat options in Get-Date (#6627) Place in alphabetical order the options --- .../commands/utility/GetDateCommand.cs | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs index 7d188a2a1..bc52bd6e8 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs @@ -352,10 +352,6 @@ namespace Microsoft.PowerShell.Commands sb.Append("{0:MMM}"); break; - case 'h': - sb.Append("{0:MMM}"); - break; - case 'C': sb.Append(dateTime.Year / 100); break; @@ -376,10 +372,22 @@ namespace Microsoft.PowerShell.Commands sb.Append(StringUtil.Format("{0,2}", dateTime.Day)); break; + case 'G': + sb.Append("{0:yyyy}"); + break; + + case 'g': + sb.Append("{0:yy}"); + break; + case 'H': sb.Append("{0:HH}"); break; + case 'h': + sb.Append("{0:MMM}"); + break; + case 'I': sb.Append("{0:hh}"); break; @@ -432,22 +440,18 @@ namespace Microsoft.PowerShell.Commands sb.Append("{0:HH:mm:ss}"); break; - case 'X': - sb.Append("{0:HH:mm:ss}"); - break; - case 't': sb.Append("\t"); break; - case 'u': - sb.Append((int)dateTime.DayOfWeek); - break; - case 'U': sb.Append(dateTime.DayOfYear / 7); break; + case 'u': + sb.Append((int)dateTime.DayOfWeek); + break; + case 'V': // .Net Core doesn't implement ISO 8601. // So we use workaround from https://blogs.msdn.microsoft.com/shawnste/2006/01/24/iso-8601-week-of-year-format-in-microsoft-net/ @@ -479,14 +483,6 @@ namespace Microsoft.PowerShell.Commands DayOfWeek.Monday))); break; - case 'G': - sb.Append("{0:yyyy}"); - break; - - case 'g': - sb.Append("{0:yy}"); - break; - case 'W': sb.Append(dateTime.DayOfYear / 7); break; @@ -495,18 +491,22 @@ namespace Microsoft.PowerShell.Commands sb.Append((int)dateTime.DayOfWeek); break; + case 'X': + sb.Append("{0:HH:mm:ss}"); + break; + case 'x': sb.Append("{0:MM/dd/yy}"); break; - case 'y': - sb.Append("{0:yy}"); - break; - case 'Y': sb.Append("{0:yyyy}"); break; + case 'y': + sb.Append("{0:yy}"); + break; + case 'Z': sb.Append("{0:zz}"); break;