More culture and cleaning

microsoft · Jun 23, 2022 · ef0d664 · ef0d664
1 parent cef4125
commit ef0d664
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 19 deletions.
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs
@@ -74,7 +74,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 case "TestCase.CodeFilePath":
                     testCase.CodeFilePath = propertyData; break;
                 case "TestCase.LineNumber":
-                    testCase.LineNumber = int.Parse(propertyData!); break;
+                    testCase.LineNumber = int.Parse(propertyData!, CultureInfo.CurrentCulture); break;
                 default:
                     // No need to register member properties as they get registered as part of TestCaseProperties class.
                     testProperty = TestProperty.Register(testProperty.Id, testProperty.Label, testProperty.GetValueType(), testProperty.Attributes, typeof(TestObject));

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs
@@ -95,11 +95,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 case "TestResult.Outcome":
                     testResult.Outcome = (TestOutcome)Enum.Parse(typeof(TestOutcome), propertyData!); break;
                 case "TestResult.Duration":
-                    testResult.Duration = TimeSpan.Parse(propertyData!); break;
+                    testResult.Duration = TimeSpan.Parse(propertyData!, CultureInfo.CurrentCulture); break;
                 case "TestResult.StartTime":
-                    testResult.StartTime = DateTimeOffset.Parse(propertyData!); break;
+                    testResult.StartTime = DateTimeOffset.Parse(propertyData!, CultureInfo.CurrentCulture); break;
                 case "TestResult.EndTime":
-                    testResult.EndTime = DateTimeOffset.Parse(propertyData!); break;
+                    testResult.EndTime = DateTimeOffset.Parse(propertyData!, CultureInfo.CurrentCulture); break;
                 case "TestResult.ErrorMessage":
                     testResult.ErrorMessage = propertyData; break;
                 case "TestResult.ErrorStackTrace":

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
 

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs
@@ -678,7 +678,7 @@ private bool TryToRunInStaThread(Action action, bool waitForCompletion)
             EqtTrace.Warning("BaseRunTests.TryToRunInSTAThread: Failed to run in STA thread: {0}", ex);
             TestRunEventsHandler.HandleLogMessage(
                 TestMessageLevel.Warning,
-                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.ExecutionThreadApartmentStateNotSupportedForFramework, _runConfiguration.TargetFramework.ToString()));
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.ExecutionThreadApartmentStateNotSupportedForFramework, _runConfiguration.TargetFramework!.ToString()));
         }
 
         return success;

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Text;
 
@@ -674,7 +673,11 @@ private static void WarnAboutNotFoundRuntimeProvidersOrThrowWhenNoneAreFound(Lis
                     {
                         stringBuilder.Append(Resources.Resources.SkippingSource).Append(' ');
                     }
-                    stringBuilder.AppendLine($"{detail.Source} ({detail.Framework}, {detail.Architecture})");
+                    stringBuilder.AppendLine(
+#if NET6_0_OR_GREATER
+                        System.Globalization.CultureInfo.InvariantCulture,
+#endif
+                        $"{detail.Source} ({detail.Framework}, {detail.Architecture})");
                 });
             }
 

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 
 using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 using Microsoft.TestPlatform.Extensions.TrxLogger.XML;

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 
 using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;

diff --git a/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs b/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;

diff --git a/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs b/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 

diff --git a/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs b/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Globalization;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 

diff --git a/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs b/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Diagnostics.Contracts;
 using System.Globalization;
 using System.IO;
 using System.Security;

diff --git a/src/vstest.console/Processors/RunTestsArgumentProcessor.cs b/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Diagnostics.Contracts;
-using System.Globalization;
 using System.Linq;
 
 using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;

diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs
@@ -93,7 +93,7 @@ public void SetupChannelShouldCreateTimestampedLogFileForHost()
                     It.IsAny<IEnumerable<string>>(),
                     It.IsAny<Dictionary<string, string?>>(),
                     It.Is<TestRunnerConnectionInfo>(
-                        t => t.LogFile.Contains("log.host." + DateTime.Now.ToString("yy-MM-dd", CultureInfo.CurrentCulture))
+                        t => t.LogFile!.Contains("log.host." + DateTime.Now.ToString("yy-MM-dd", CultureInfo.CurrentCulture))
                              && t.LogFile.Contains("_" + Environment.CurrentManagedThreadId + ".txt"))));
 #if NETFRAMEWORK
         EqtTrace.TraceLevel = TraceLevel.Off;

diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Threading;