maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use CurrentCulture when handling conversions to DateTime in Add-History (#16005)

Browse source
This commit is contained in:
Joel Sallow (/u/ta11ow) 2021-08-27 00:41:01 -04:00 committed by GitHub
parent 02b532fb1d
commit fde119e28b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/System.Management.Automation/engine/hostifaces/History.cs
View file

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Management.Automation;
using System.Management.Automation.Host;
@ -1449,14 +1450,14 @@ namespace Microsoft.PowerShell.Commands
// Read StartExecutionTime property
object temp = GetPropertyValue(mshObject, "StartExecutionTime");
if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime startExecutionTime))
if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, CultureInfo.CurrentCulture, out DateTime startExecutionTime))
{
break;
}
// Read EndExecutionTime property
temp = GetPropertyValue(mshObject, "EndExecutionTime");
if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime endExecutionTime))
if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, CultureInfo.CurrentCulture, out DateTime endExecutionTime))
{
break;
}

52
test/powershell/Modules/Microsoft.PowerShell.Core/History.Tests.ps1
View file

@ -49,6 +49,58 @@ Describe "History cmdlet test cases" -Tags "CI" {
}
}
Context 'Conversions and Culture tests' {
BeforeAll {
$cultureTestCases = @(
@{
Culture = 'en-us'
StartTime = '08/18/2021 16:43:50'
EndTime = '08/18/2021 16:44:50'
}
@{
Culture = 'en-au'
StartTime = '18/08/2021 16:43:50'
EndTime = '18/08/2021 16:44:50'
}
)
$oldCulture = [cultureinfo]::CurrentCulture
}
AfterEach {
[cultureinfo]::CurrentCulture = $oldCulture
}
It "respects current culture settings when handling datetime conversions" -TestCases $cultureTestCases {
param($Culture, $StartTime, $EndTime)
[cultureinfo]::CurrentCulture = [cultureinfo]::GetCultureInfo($Culture)
$history = [PSCustomObject] @{
CommandLine = "test-command"
ExecutionStatus = [Management.Automation.Runspaces.PipelineState]::Completed
StartExecutionTime = $StartTime
EndExecutionTime = $EndTime
}
{ $history | Add-History -ErrorAction Stop } | Should -Not -Throw -Because 'the datetime should be converted according to the current culture'
}
It "throws an error when asked to convert a date format that doesn't match the current culture" {
[cultureinfo]::CurrentCulture = [cultureinfo]::GetCultureInfo('en-au')
$history = [PSCustomObject] @{
CommandLine = "test-command"
ExecutionStatus = [Management.Automation.Runspaces.PipelineState]::Completed
StartExecutionTime = '08/18/2021 16:43:50'
EndExecutionTime = '08/18/2021 16:44:50'
}
$errorMessage = 'Cannot add history because the input object has a format that is not valid.'
{ $history | Add-History -ErrorAction Stop } | Should -Throw -ExpectedMessage $errorMessage
}
}
It "Tests Invoke-History on a cmdlet that generates output on all streams" {
$streamSpammer = '
function StreamSpammer