PR fixes.

src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs

@@ -576,7 +576,7 @@ private EventLogSessionContext GetEventLogSessionContext(DataCollectionContext d
             eventLogContainerFound = ContextMap.TryGetValue(dataCollectionContext, out eventLogSessionContext);
         }
 
-        if (eventLogContainerFound == false)
+        if (!eventLogContainerFound)
         {
             string msg = string.Format(
                 CultureInfo.CurrentCulture,

src/Microsoft.TestPlatform.ObjectModel/TestCase.cs

@@ -262,13 +262,23 @@ protected override void ProtectedSetPropertyValue(TestProperty property, object?
                 return;
 
             case "TestCase.Id":
-                Id = value is Guid guid
-                    ? guid
+                if (value is Guid guid)
+                {
+                    Id = guid;
+                }
+                else if (value is string guidString)
+                {
 #if NET7_0_OR_GREATER
-                    : Guid.Parse((value as string)!, CultureInfo.InvariantCulture);
+                    Id = Guid.Parse(guidString, CultureInfo.InvariantCulture);
 #else
-                    : Guid.Parse((value as string)!);
+                    Id = Guid.Parse(guidString);
 #endif
+                }
+                else
+                {
+                    Id = Guid.Empty;
+                }
+
                 return;
 
             case "TestCase.LineNumber":

src/Microsoft.TestPlatform.Utilities/ClientUtilities.cs

@@ -54,11 +54,9 @@ public static void FixRelativePathsInRunSettings(XmlDocument xmlDocument, string
 
     private static void AddRunSettingsDirectoryNode(XmlDocument doc, string path)
     {
-        ValidateArg.NotNull(doc.DocumentElement, nameof(doc.DocumentElement));
-
         var node = doc.CreateNode(XmlNodeType.Element, RunsettingsDirectory, string.Empty);
         node.InnerXml = path;
-        doc.DocumentElement.AppendChild(node);
+        doc.DocumentElement!.AppendChild(node);
     }
 
     private static void FixNodeFilePath(XmlNode node, string root)

src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs

@@ -706,7 +706,7 @@ private static bool IsSettingIncompatible(Architecture sourcePlatform,
     private static bool IsPlatformIncompatible(Architecture sourcePlatform, Architecture targetPlatform)
     {
         return sourcePlatform is not Architecture.Default and not Architecture.AnyCPU
-&& (targetPlatform == Architecture.X64 && !Is64BitOperatingSystem() || sourcePlatform != targetPlatform);
+            && (targetPlatform == Architecture.X64 && !Is64BitOperatingSystem() || sourcePlatform != targetPlatform);
 
         static bool Is64BitOperatingSystem()
         {

src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs

@@ -63,7 +63,15 @@ internal static void AppendOrModifyChild(
         var secureInnerXml = SecurityElement.Escape(innerXml);
 #else
         // fixing manually as we currently target to netcore 1.1 and we don't have default implementation for Escape functionality
-        var secureInnerXml = (innerXml ?? string.Empty).Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("\"", "&quot;").Replace("'", "&apos;");
+        string secureInnerXml;
+        if (innerXml.IsNullOrEmpty())
+        {
+            secureInnerXml = string.Empty;
+        }
+        else
+        {
+            secureInnerXml = innerXml.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("\"", "&quot;").Replace("'", "&apos;");
+        }
 #endif
         if (childNode == null)
         {

src/SettingsMigrator/Migrator.cs

@@ -161,40 +161,40 @@ private static void MigrateTestSettingsNodesToRunSettings(string testSettingsPat
         }
 
         string? runTimeout = null;
-        if (testSettingsNodes.Timeout?.Attributes?[RunTimeoutAttributeName] != null)
+        if (testSettingsNodes?.Timeout?.Attributes?[RunTimeoutAttributeName] != null)
         {
             runTimeout = testSettingsNodes?.Timeout?.Attributes?[RunTimeoutAttributeName]?.Value;
         }
 
         string? parallelTestCount = null;
-        if (testSettingsNodes.Execution?.Attributes?[ParallelTestCountAttributeName] != null)
+        if (testSettingsNodes?.Execution?.Attributes?[ParallelTestCountAttributeName] != null)
         {
             parallelTestCount = testSettingsNodes?.Execution?.Attributes?[ParallelTestCountAttributeName]?.Value;
         }
 
         string? hostProcessPlatform = null;
-        if (testSettingsNodes.Execution?.Attributes?[HostProcessPlatformAttributeName] != null)
+        if (testSettingsNodes?.Execution?.Attributes?[HostProcessPlatformAttributeName] != null)
         {
             hostProcessPlatform = testSettingsNodes?.Execution?.Attributes?[HostProcessPlatformAttributeName]?.Value;
         }
 
         // WebTestRunConfiguration node.
-        if (testSettingsNodes.WebSettings != null)
+        if (testSettingsNodes?.WebSettings != null)
         {
             runSettingsXmlDoc?.DocumentElement?.AppendChild(runSettingsXmlDoc.ImportNode(testSettingsNodes.WebSettings, deep: true));
         }
 
         // LegacySettings node.
-        AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, hostProcessPlatform, runSettingsXmlDoc!);
+        AddLegacyNodes(testSettingsNodes!, testTimeout, parallelTestCount, hostProcessPlatform, runSettingsXmlDoc!);
 
         // TestSessionTimeout node.
         if (!runTimeout.IsNullOrEmpty())
         {
-            AddRunTimeoutNode(runTimeout, runSettingsXmlDoc);
+            AddRunTimeoutNode(runTimeout, runSettingsXmlDoc!);
         }
 
         // DataCollectors node.
-        if (testSettingsNodes.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
+        if (testSettingsNodes?.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
         {
             AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc!);
         }
@@ -229,7 +229,7 @@ private static TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
             }
         }
 
-        return testSettingsNodes;
+        return testSettingsNodes!;
     }
 
     /// <summary>

src/vstest.console/CommandLine/AssemblyMetadataProvider.cs

@@ -61,6 +61,8 @@ public Architecture GetArchitecture(string assemblyPath)
 
             var processorArchitecture =
 #if NET7_0_OR_GREATER
+                // AssemblyName doesn't include ProcessorArchitecture in net7.
+                // It will always be ProcessorArchitecture.None.
                 ProcessorArchitecture.None;
 #else
                 assemblyName.ProcessorArchitecture;