From f6d11dcab0d1c8f5f8796b673116b25a3db70f51 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Wed, 16 May 2018 16:11:51 +0530
Subject: [PATCH 01/21] Migrator

---
 scripts/build.ps1                             |   4 +
 src/SettingsMigrator/App.config               |   6 +
 src/SettingsMigrator/Migrator.cs              | 276 ++++++++++++++++++
 src/SettingsMigrator/Program.cs               |  49 ++++
 .../Properties/AssemblyInfo.cs                |  22 ++
 .../Resources/Resources.Designer.cs           |   1 +
 src/SettingsMigrator/Resources/Resources.resx | 123 ++++++++
 .../Resources/xlf/Resources.cs.xlf            |  30 ++
 .../Resources/xlf/Resources.de.xlf            |  30 ++
 .../Resources/xlf/Resources.es.xlf            |  30 ++
 .../Resources/xlf/Resources.fr.xlf            |  30 ++
 .../Resources/xlf/Resources.it.xlf            |  30 ++
 .../Resources/xlf/Resources.ja.xlf            |  30 ++
 .../Resources/xlf/Resources.ko.xlf            |  30 ++
 .../Resources/xlf/Resources.pl.xlf            |  30 ++
 .../Resources/xlf/Resources.pt-BR.xlf         |  30 ++
 .../Resources/xlf/Resources.ru.xlf            |  30 ++
 .../Resources/xlf/Resources.tr.xlf            |  30 ++
 .../Resources/xlf/Resources.xlf               |  12 +
 .../Resources/xlf/Resources.zh-Hans.xlf       |  30 ++
 .../Resources/xlf/Resources.zh-Hant.xlf       |  30 ++
 src/SettingsMigrator/SettingsMigrator.csproj  |  43 +++
 src/SettingsMigrator/app.manifest             |  27 ++
 .../nuspec/Microsoft.TestPlatform.nuspec      |  15 +
 .../MigratorUnitTests.cs                      | 157 ++++++++++
 .../SettingsMigrator.UnitTests.csproj         |  30 ++
 26 files changed, 1155 insertions(+)
 create mode 100644 src/SettingsMigrator/App.config
 create mode 100644 src/SettingsMigrator/Migrator.cs
 create mode 100644 src/SettingsMigrator/Program.cs
 create mode 100644 src/SettingsMigrator/Properties/AssemblyInfo.cs
 create mode 100644 src/SettingsMigrator/Resources/Resources.Designer.cs
 create mode 100644 src/SettingsMigrator/Resources/Resources.resx
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.de.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.es.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.it.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
 create mode 100644 src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
 create mode 100644 src/SettingsMigrator/SettingsMigrator.csproj
 create mode 100644 src/SettingsMigrator/app.manifest
 create mode 100644 test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
 create mode 100644 test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 4b69291f40..17114fe9c6 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -233,6 +233,7 @@ function Publish-Package
     $testhostCorePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore")
     $testhostNS1_4PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkNS1_4")
     $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj"
+    $settingsMigratorProject = Join-Path $env:TP_ROOT_DIR "src\SettingsMigrator\SettingsMigrator.csproj"
     $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj"
 
     Write-Log "Package: Publish src\package\package\package.csproj"
@@ -245,6 +246,9 @@ function Publish-Package
     Write-Log "Package: Publish src\vstest.console\vstest.console.csproj"
     Publish-PackageInternal $vstestConsoleProject $TPB_TargetFramework $fullCLRPackageDir
     Publish-PackageInternal $vstestConsoleProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir
+	
+    Write-Log "Package: Publish src\SettingsMigrator\SettingsMigrator.csproj"
+    Publish-PackageInternal $settingsMigratorProject $TPB_TargetFramework $fullCLRPackageDir
 
     Write-Log "Package: Publish src\datacollector\datacollector.csproj"
     Publish-PackageInternal $dataCollectorProject $TPB_TargetFramework $fullCLRPackageDir
diff --git a/src/SettingsMigrator/App.config b/src/SettingsMigrator/App.config
new file mode 100644
index 0000000000..731f6de6c2
--- /dev/null
+++ b/src/SettingsMigrator/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
new file mode 100644
index 0000000000..5343d7628b
--- /dev/null
+++ b/src/SettingsMigrator/Migrator.cs
@@ -0,0 +1,276 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+{
+    public class Migrator
+    {
+        /// <summary>
+        /// Given a runsettings with an embedded testsettings, converts it to runsettings.
+        /// </summary>
+        /// <param name="oldRunsettingsPath"></param>
+        /// <param name="newRunsettingsPath"></param>
+        public void MigrateRunsettings(string oldRunsettingsPath, string newRunsettingsPath)
+        {
+            string testsettingsPath = null;
+            using (XmlTextReader reader = new XmlTextReader(oldRunsettingsPath))
+            {
+                reader.Namespaces = false;
+
+                var document = new XmlDocument();
+                document.Load(reader);
+                var root = document.DocumentElement;
+
+                var testsettingsNode = root.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+
+                if (testsettingsNode != null)
+                {
+                    testsettingsPath = testsettingsNode.InnerText;
+                }
+                if (!string.IsNullOrWhiteSpace(testsettingsPath))
+                {
+                    // Expand path relative to runsettings location.
+                    if (!Path.IsPathRooted(testsettingsPath))
+                    {
+                        testsettingsPath = Path.Combine(oldRunsettingsPath, testsettingsPath);
+                    }
+
+                    MigrateTestsettings(testsettingsPath, newRunsettingsPath, File.ReadAllText(oldRunsettingsPath));
+                }
+                else
+                {
+                    Console.WriteLine("Runsettings does not contain an embedded testsettings, not migrating.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Given a testsettings, converts it to runsettings
+        /// </summary>
+        /// <param name="testsettingsPath"></param>
+        /// <param name="newRunsettingsPath"></param>
+        /// <param name="oldRunSettingsContent"></param>
+        public void MigrateTestsettings(string testsettingsPath, string newRunsettingsPath, string oldRunSettingsContent = null)
+        {
+            using (XmlTextReader reader = new XmlTextReader(testsettingsPath))
+            {
+                reader.Namespaces = false;
+
+                var document = new XmlDocument();
+                document.Load(reader);
+                var root = document.DocumentElement;
+
+                // Select the interesting nodes from the xml.
+                var deploymentNode = root.SelectSingleNode(@"/TestSettings/Deployment");
+                var scriptnode = root.SelectSingleNode(@"/TestSettings/Scripts");
+                var websettingsNode = root.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
+                var oldDatacollectorNodes = root.SelectNodes(@"/TestSettings/AgentRule/DataCollectors/DataCollector");
+                var timeoutNode = root.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
+                var assemblyresolutionNode = root.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
+                var hostsNode = root.SelectSingleNode(@"/TestSettings/Execution/Hosts");
+                var executionNode = root.SelectSingleNode(@"/TestSettings/Execution");
+
+                string testTimeout = null;
+                if (timeoutNode != null && timeoutNode.Attributes[TestTimeoutAttributeName] != null)
+                {
+                    testTimeout = timeoutNode.Attributes[TestTimeoutAttributeName].Value;
+                }
+
+                string runTimeout = null;
+                if (timeoutNode != null && timeoutNode.Attributes[RunTimeoutAttributeName] != null)
+                {
+                    runTimeout = timeoutNode.Attributes[RunTimeoutAttributeName].Value;
+                }
+
+                string parallelTestCount = null;
+                if (executionNode != null && executionNode.Attributes[ParallelTestCountAttributeName] != null)
+                {
+                    parallelTestCount = executionNode.Attributes[ParallelTestCountAttributeName].Value;
+                }
+
+                if(string.IsNullOrEmpty(oldRunSettingsContent))
+                {
+                    oldRunSettingsContent = sampleRunsettingsContent;
+                }
+                var newXmlDoc = new XmlDocument();
+                newXmlDoc.LoadXml(oldRunSettingsContent);
+
+                // Remove the embedded testsettings node if it exists.
+                RemoveEmbeddedTestsettings(newXmlDoc);
+
+                // WebTestRunConfiguration node.
+                if (websettingsNode != null)
+                {
+                    newXmlDoc.DocumentElement.AppendChild(newXmlDoc.ImportNode(websettingsNode, deep: true));
+                }
+
+                // LegacySettings node.
+                if (deploymentNode != null || scriptnode != null || assemblyresolutionNode != null ||
+                    !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || hostsNode != null)
+                {
+                    AddLegacyNodes(deploymentNode, scriptnode, testTimeout, assemblyresolutionNode, hostsNode, parallelTestCount, newXmlDoc);
+                }
+
+                // TestSessionTimeout node.
+                if (!string.IsNullOrEmpty(runTimeout))
+                {
+                    AddRunTimeoutNode(runTimeout, newXmlDoc);
+                }
+
+                // DataCollectors node.
+                if (oldDatacollectorNodes != null && oldDatacollectorNodes.Count > 0)
+                {
+                    AddDataCollectorNodes(oldDatacollectorNodes, newXmlDoc);
+                }
+
+                newXmlDoc.Save(newRunsettingsPath);
+            }
+        }
+
+        /// <summary>
+        /// Removes the embedded testsettings node if present.
+        /// </summary>
+        /// <param name="newXmlDoc"></param>
+        private void RemoveEmbeddedTestsettings(XmlDocument newXmlDoc)
+        {
+            var testsettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+            if (testsettingsNode != null)
+            {
+                testsettingsNode.ParentNode.RemoveChild(testsettingsNode);
+            }
+        }
+
+
+        /// <summary>
+        /// Adds the legacy nodes to runsettings xml.
+        /// </summary>
+        /// <param name="deploymentNode"></param>
+        /// <param name="scriptnode"></param>
+        /// <param name="testTimeout"></param>
+        /// <param name="assemblyresolutionNode"></param>
+        /// <param name="hostsNode"></param>
+        /// <param name="parallelTestCount"></param>
+        /// <param name="newXmlDoc"></param>
+        private void AddLegacyNodes(XmlNode deploymentNode, XmlNode scriptnode, string testTimeout, XmlNode assemblyresolutionNode, XmlNode hostsNode, string parallelTestCount, XmlDocument newXmlDoc)
+        {
+            //Remove if the legacy node already exists.
+            var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
+            if (legacyNode != null)
+            {
+                legacyNode.ParentNode.RemoveChild(legacyNode);
+            }
+
+            legacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, LegacySettingsNodeName, null);
+
+            if (deploymentNode != null)
+            {
+                legacyNode.AppendChild(newXmlDoc.ImportNode(deploymentNode, deep: true));
+            }
+            if (scriptnode != null)
+            {
+                legacyNode.AppendChild(newXmlDoc.ImportNode(scriptnode, deep: true));
+            }
+
+            // Execution node.
+            if (assemblyresolutionNode != null || !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || hostsNode != null)
+            {
+                var newExecutionNode = newXmlDoc.CreateNode(XmlNodeType.Element, ExecutionNodeName, null);
+
+                if (string.IsNullOrEmpty(parallelTestCount))
+                {
+                    var paralellAttribute = newXmlDoc.CreateAttribute(ParallelTestCountAttributeName);
+                    paralellAttribute.Value = parallelTestCount;
+                    newExecutionNode.Attributes.Append(paralellAttribute);
+                }
+                if (!string.IsNullOrEmpty(testTimeout))
+                {
+                    var newTimeoutsNode = newXmlDoc.CreateNode(XmlNodeType.Element, TimeoutsNodeName, null);
+                    var testtimeoutattribute = newXmlDoc.CreateAttribute(TestTimeoutAttributeName);
+                    testtimeoutattribute.Value = testTimeout;
+                    newTimeoutsNode.Attributes.Append(testtimeoutattribute);
+                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(newTimeoutsNode, deep: true));
+                }
+                if (hostsNode != null)
+                {
+                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(hostsNode, deep: true));
+                }
+                if (assemblyresolutionNode != null)
+                {
+                    var testTypeSpecificNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestTypeSpecificNodeName, null);
+                    testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(assemblyresolutionNode, deep: true));
+                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(testTypeSpecificNode, deep: true));
+                }
+                legacyNode.AppendChild(newXmlDoc.ImportNode(newExecutionNode, deep: true));
+            }
+            newXmlDoc.DocumentElement.AppendChild(legacyNode);
+        }
+
+
+        /// <summary>
+        /// Adds the datacollector nodes to the runsettings xml.
+        /// </summary>
+        /// <param name="oldDatacollectorNodes"></param>
+        /// <param name="newXmlDoc"></param>
+        private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocument newXmlDoc)
+        {
+            var dataCollectionRunSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings");
+            if (dataCollectionRunSettingsNode == null)
+            {
+                dataCollectionRunSettingsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectionRunSettingsNodeName, null);
+            }
+
+            var dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
+            if (dataCollectorsNode == null)
+            {
+                dataCollectorsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectorsNodeName, null);
+                dataCollectionRunSettingsNode.AppendChild(newXmlDoc.ImportNode(dataCollectorsNode, deep: true));
+                dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
+            }
+
+            foreach (XmlNode datacollector in oldDatacollectorNodes)
+            {
+                dataCollectorsNode.AppendChild(newXmlDoc.ImportNode(datacollector, deep: true));
+            }
+            newXmlDoc.DocumentElement.AppendChild(dataCollectionRunSettingsNode);
+        }
+
+        /// <summary>
+        /// Adds run session timeout node.
+        /// </summary>
+        /// <param name="runTimeout"></param>
+        /// <param name="newXmlDoc"></param>
+        private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
+        {
+            var runConfigurationNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/RunConfiguration");
+            if (runConfigurationNode == null)
+            {
+                runConfigurationNode = newXmlDoc.CreateNode(XmlNodeType.Element, RunConfigurationNodeName, null);
+            }
+
+            var testSessionTimeoutNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestSessionTimeoutNodeName, null);
+            testSessionTimeoutNode.InnerText = runTimeout;
+            runConfigurationNode.AppendChild(newXmlDoc.ImportNode(testSessionTimeoutNode, deep: true));
+
+            newXmlDoc.DocumentElement.AppendChild(runConfigurationNode);
+        }
+
+        const string TestTimeoutAttributeName = "testTimeout";
+        const string ParallelTestCountAttributeName = "testTimeout";
+        const string RunTimeoutAttributeName = "runTimeout";
+        const string LegacySettingsNodeName = "LegacySettings";
+        const string ExecutionNodeName = "Execution";
+        const string TimeoutsNodeName = "Timeouts";
+        const string TestTypeSpecificNodeName = "TestTypeSpecific";
+        const string RunConfigurationNodeName = "RunConfiguration";
+        const string TestSessionTimeoutNodeName = "TestSessionTimeout";
+        const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
+        const string DataCollectorsNodeName = "DataCollectors";
+        const string sampleRunsettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                                                "<RunSettings></RunSettings>";
+    }
+}
+
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
new file mode 100644
index 0000000000..69d23e8357
--- /dev/null
+++ b/src/SettingsMigrator/Program.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            if (args.Length != 2)
+            {
+                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                return;
+            }
+
+            string oldFilePath = args[0];
+            string newFilePath = args[1];
+
+            if (!Path.IsPathRooted(oldFilePath) || !Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunsettingsExtension))
+            {
+                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                return;
+            }
+
+            var migrator = new Migrator();
+
+            if (string.Equals(Path.GetExtension(oldFilePath), TestsettingsExtension))
+            {
+                migrator.MigrateTestsettings(oldFilePath, newFilePath);
+            }
+            else if (string.Equals(Path.GetExtension(oldFilePath), RunsettingsExtension))
+            {
+                migrator.MigrateRunsettings(oldFilePath, newFilePath);
+            }
+            else
+            {
+                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                return;
+            }
+        }
+
+        const string RunsettingsExtension = ".runsettings";
+        const string TestsettingsExtension = ".testsettings";
+    }
+}
+
diff --git a/src/SettingsMigrator/Properties/AssemblyInfo.cs b/src/SettingsMigrator/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..03f6bc2fbd
--- /dev/null
+++ b/src/SettingsMigrator/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SettingsMigrator")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8193192e-8ead-4871-b626-8b832f8fa654")]
diff --git a/src/SettingsMigrator/Resources/Resources.Designer.cs b/src/SettingsMigrator/Resources/Resources.Designer.cs
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/SettingsMigrator/Resources/Resources.Designer.cs
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/Resources.resx b/src/SettingsMigrator/Resources/Resources.resx
new file mode 100644
index 0000000000..9464b58fd3
--- /dev/null
+++ b/src/SettingsMigrator/Resources/Resources.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ValidUsage" xml:space="preserve">
+    <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
new file mode 100644
index 0000000000..87ee60c31a
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="cs" original="../Resources.resx" build-num="1553923937">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
new file mode 100644
index 0000000000..2bd4739a2a
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="de" original="../Resources.resx" build-num="1899456624">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
new file mode 100644
index 0000000000..aa2a558675
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="es" original="../Resources.resx" build-num="670957671">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
new file mode 100644
index 0000000000..5506da0d0f
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="fr" original="../Resources.resx" build-num="824728581">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
new file mode 100644
index 0000000000..f2c6c4ac53
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="it" original="../Resources.resx" build-num="-1294218164">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
new file mode 100644
index 0000000000..92644a4650
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ja" original="../Resources.resx" build-num="774927738">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
new file mode 100644
index 0000000000..a804409b81
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ko" original="../Resources.resx" build-num="-1764382987">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
new file mode 100644
index 0000000000..02e8d2fbfa
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pl" original="../Resources.resx" build-num="2026589901">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
new file mode 100644
index 0000000000..ab2206c4af
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pt-BR" original="../Resources.resx" build-num="-1581834744">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
new file mode 100644
index 0000000000..cb823c7d77
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ru" original="../Resources.resx" build-num="1010338294">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
new file mode 100644
index 0000000000..92e7e3cfa8
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="tr" original="../Resources.resx" build-num="2120988183">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.xlf b/src/SettingsMigrator/Resources/xlf/Resources.xlf
new file mode 100644
index 0000000000..0a59b0c85c
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx">
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
new file mode 100644
index 0000000000..375d9b98ab
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hans" original="../Resources.resx" build-num="-1834472646">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
new file mode 100644
index 0000000000..5d78eef487
--- /dev/null
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hant" original="../Resources.resx" build-num="1869685853">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">1766</count>
+        <count count-type="x-adjWordCount">1498.1</count>
+        <count count-type="x-curAdjWordCount">1498.1</count>
+        <count count-type="x-repeatAdjWordCount">1.25</count>
+        <count count-type="x-termWordCount">0</count>
+      </count-group>
+      <count-group name="BlackBox wordcount analysis">
+        <count count-type="x-match102%">0</count>
+        <count count-type="x-match101%">0</count>
+        <count count-type="x-match100%">0</count>
+        <count count-type="x-match99-90%">0</count>
+        <count count-type="x-match89-75%">0</count>
+        <count count-type="x-mt">1761</count>
+        <count count-type="repetition">5</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
new file mode 100644
index 0000000000..824453cf1a
--- /dev/null
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
+  </PropertyGroup>
+  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+  <PropertyGroup>
+    <AssemblyName>SettingsMigrator</AssemblyName>
+    <TargetFrameworks>net451</TargetFrameworks>
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <OutputType>Exe</OutputType>
+    <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
+    <Prefer32Bit Condition="'$(TargetFramework)' == 'net451'">true</Prefer32Bit>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.0'">
+    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Resources.resx" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System" />
+    <Reference Include="System.IO" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+</Project>
diff --git a/src/SettingsMigrator/app.manifest b/src/SettingsMigrator/app.manifest
new file mode 100644
index 0000000000..9952698906
--- /dev/null
+++ b/src/SettingsMigrator/app.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+    </application>
+  </compatibility>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
\ No newline at end of file
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index 150d15354f..8b20197e93 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -174,6 +174,8 @@
     <file src="net451\$Runtime$\ThirdPartyNotices.txt"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ThirdPartyNotices.txt" />
     <file src="net451\$Runtime$\vstest.console.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
     <file src="net451\$Runtime$\vstest.console.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
+    <file src="net451\$Runtime$\SettingsMigrator.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
+    <file src="net451\$Runtime$\SettingsMigrator.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe.config" />
     <file src="net451\$Runtime$\VsWebSite.Interop.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\VsWebSite.Interop.dll" />
     <file src="net451\$Runtime$\Webloadtest.testtype"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Webloadtest.testtype" />
     <file src="net451\$Runtime$\CoreCon\VisualStudioDatastoreConfigurationProvider.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CoreCon\VisualStudioDatastoreConfigurationProvider.dll" />
@@ -188,6 +190,7 @@
     <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\cs\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\cs\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -199,6 +202,7 @@
     <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\de\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\de\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -210,6 +214,7 @@
     <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\es\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\es\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
@@ -274,6 +279,7 @@
     <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\fr\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\fr\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -285,6 +291,7 @@
     <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\it\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\it\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -296,6 +303,7 @@
     <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\ja\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\ja\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -307,6 +315,7 @@
     <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\ko\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\ko\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -318,6 +327,7 @@
     <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\pl\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\pl\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -329,6 +339,7 @@
     <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\pt-BR\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -340,6 +351,7 @@
     <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\ru\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\ru\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -351,6 +363,7 @@
     <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\tr\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\tr\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\x64\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll" />
     <file src="net451\$Runtime$\x64\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
     <file src="net451\$Runtime$\x86\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
@@ -366,6 +379,7 @@
     <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\zh-Hans\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\zh-Hans\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\SettingsMigrator.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -377,6 +391,7 @@
     <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\vstest.console.resources.dll" />
+	<file src="net451\$Runtime$\zh-Hant\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\SettingsMigrator.resources.dll" />
     <file src="Intellitrace\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll" />
     <file src="Intellitrace\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" />
     <file src="Intellitrace\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
new file mode 100644
index 0000000000..3661f08a6e
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
+{
+    using System.IO;
+    using System.Xml;
+    using Microsoft.VisualStudio.TestPlatform.CommandLine;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class MigratorUnitTests
+    {
+        [TestMethod]
+        public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+            string oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
+            
+            File.WriteAllText(oldTestsettingsPath, oldtestsettings);
+            File.WriteAllText(newRunsettingsPath, "");
+
+            var doc = new XmlDocument();
+            doc.LoadXml(oldrunsettings);
+            var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+                settingsnode.InnerText = oldTestsettingsPath;
+            File.WriteAllText(oldRunsettingsPath, doc.InnerXml);
+
+            migrator.MigrateRunsettings(oldRunsettingsPath, newRunsettingsPath);
+
+            Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
+
+            using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
+            {
+                reader.Namespaces = false;
+
+                var document = new XmlDocument();
+                document.Load(reader);
+                var root = document.DocumentElement;
+
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/WebTestRunConfiguration/Browser/Headers/Header"), "There should be a WebTestRunConfiguration node");
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings"), "There should be a LegacySettings node");
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment/DeploymentItem"), "There should be a DeploymentItem node");
+
+                var scriptNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Scripts");
+                Assert.IsNotNull(scriptNode, "There should be a WebTestRunConfiguration node");
+                Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
+                Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
+
+                var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
+                Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
+                Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"].Value, "testTimeout value does not match.");
+
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution/TestDirectory"), "There should be a Assembly resolution node");
+
+                var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
+                Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
+                Assert.AreEqual(testSessionTimeoutNode.InnerText, "60000", "Timeout value does not match.");
+            }
+
+            File.Delete(oldRunsettingsPath);
+            File.Delete(newRunsettingsPath);
+            File.Delete(oldTestsettingsPath);
+        }
+
+
+        [TestMethod]
+        public void MigratorGeneratesCorrectRunsettingsForTestSettings()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+            //File.Create(oldTestsettingsPath);
+            //File.Create(newRunsettingsPath);
+            File.WriteAllText(oldTestsettingsPath, oldtestsettings);
+            File.WriteAllText(newRunsettingsPath, "");
+
+            migrator.MigrateTestsettings(oldTestsettingsPath, newRunsettingsPath);
+
+            Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
+
+            using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
+            {
+                reader.Namespaces = false;
+
+                var document = new XmlDocument();
+                document.Load(reader);
+                var root = document.DocumentElement;
+
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/WebTestRunConfiguration/Browser/Headers/Header"), "There should be a WebTestRunConfiguration node");
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings"), "There should be a LegacySettings node");
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment/DeploymentItem"), "There should be a DeploymentItem node");
+
+                var scriptNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Scripts");
+                Assert.IsNotNull(scriptNode, "There should be a WebTestRunConfiguration node");
+                Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
+                Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
+
+                var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
+                Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
+                Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"].Value, "testTimeout value does not match.");
+
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution/TestDirectory"), "There should be a Assembly resolution node");
+
+                var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
+                Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
+                Assert.AreEqual(testSessionTimeoutNode.InnerText, "60000", "Timeout value does not match.");
+            }
+
+            File.Delete(newRunsettingsPath);
+            File.Delete(oldTestsettingsPath);
+        }
+
+        const string oldrunsettings = "<RunSettings>" +
+                                      "<MSTest>" +
+                                      "<ForcedLegacyMode>true</ForcedLegacyMode>" +
+                                      "<SettingsFile ></SettingsFile>" +
+                                      "</MSTest>" +
+                                      "</RunSettings>";
+
+        const string oldtestsettings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                                    "<TestSettings name=\"TestSettings1\" id=\"cfb5c9a7-f57f-42db-8006-108cdf34bee1\" xmlns=\"http://microsoft.com/schemas/VisualStudio/TeamTest/2010\">" +
+                                    "<Description>These are default test settings for a local test run.</Description>" +
+                                    "<Deployment>" +
+                                    "<DeploymentItem filename=\".\test.txt\" />" +
+                                    "</Deployment>" +
+                                    "<Scripts setupScript=\".\\setup.bat\" cleanupScript=\".\\cleanup.bat\" />" +
+                                    "<Execution hostProcessPlatform=\"MSIL\">" +
+                                    "<Timeouts runTimeout=\"60000\" testTimeout=\"120000\" />" +
+                                    "<TestTypeSpecific>" +
+                                    "<UnitTestRunConfig testTypeId=\"13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b\">" +
+                                    "<AssemblyResolution>" +
+                                    "<TestDirectory useLoadContext=\"true\" />" +
+                                    "</AssemblyResolution>" +
+                                    "</UnitTestRunConfig>" +
+                                    "<WebTestRunConfiguration testTypeId=\"4e7599fa-5ecb-43e9-a887-cd63cf72d207\">" +
+                                    "<Browser name=\"Internet Explorer 9.0\" MaxConnections=\"6\">" +
+                                    "<Headers>" +
+                                    "<Header name=\"User-Agent\" value=\"Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)\"/>" +
+                                    "<Header name=\"Accept\" value=\"*/*\" />" +
+                                    "<Header name=\"Accept-Language\" value=\"{{$IEAcceptLanguage}}\" />" +
+                                    "<Header name=\"Accept-Encoding\" value=\"GZIP\" />" +
+                                    "</Headers>" +
+                                    "</Browser>" +
+                                    "</WebTestRunConfiguration>" +
+                                    "</TestTypeSpecific>" +
+                                    "<AgentRule name=\"LocalMachineDefaultRole\">" +
+                                    "</AgentRule>" +
+                                    "</Execution>" +
+                                    "<Properties/>" +
+                                    "</TestSettings>";
+    }
+
+    
+}
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
new file mode 100644
index 0000000000..7460da6c9f
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
+    <TestProject>true</TestProject>
+  </PropertyGroup>
+  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+  <PropertyGroup>
+    <OutputType Condition=" '$(TargetFramework)' != 'net451' ">Exe</OutputType>
+    <TargetFrameworks>net451</TargetFrameworks>
+    <AssemblyName>SettingsMigrator.UnitTests</AssemblyName>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SettingsMigrator\SettingsMigrator.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+    <Reference Include=" System.Runtime.Serialization" />
+  </ItemGroup>
+  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+</Project>

From 2188d5c89f60fbc45067dd05e80ddfb5881a3c70 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Wed, 16 May 2018 16:12:43 +0530
Subject: [PATCH 02/21] Adding project to sln

---
 TestPlatform.sln | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/TestPlatform.sln b/TestPlatform.sln
index 852d3c11e7..3849fef928 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -166,6 +166,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Trac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TraceDataCollector.UnitTests", "test\DataCollectors\TraceDataCollector.UnitTests\Microsoft.TestPlatform.TraceDataCollector.UnitTests.csproj", "{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator", "src\SettingsMigrator\SettingsMigrator.csproj", "{69F5FF81-5615-4F06-B83C-FCF979BB84CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator.UnitTests", "test\SettingsMigrator.UnitTests\SettingsMigrator.UnitTests.csproj", "{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -824,6 +828,30 @@ Global
 		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x64.Build.0 = Release|Any CPU
 		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x86.Build.0 = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.Build.0 = Debug|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.ActiveCfg = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.Build.0 = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.ActiveCfg = Release|Any CPU
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.Build.0 = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.Build.0 = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -895,6 +923,8 @@ Global
 		{24C7683D-2607-4901-B8EB-83A57E49E93D} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
 		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3} = {D9A30E32-D466-4EC5-B4F2-62E17562279B}
+		{69F5FF81-5615-4F06-B83C-FCF979BB84CA} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}

From 6922920b4aa2a4be6d30a2dd2ad1dee7dc6f6bf1 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Thu, 17 May 2018 10:23:56 +0530
Subject: [PATCH 03/21] Refactoring

---
 src/SettingsMigrator/Migrator.cs              | 215 +++++++++---------
 src/SettingsMigrator/Program.cs               |  22 +-
 .../Resources/Resources.Designer.cs           |  85 ++++++-
 src/SettingsMigrator/TestSettingsNodes.cs     |  21 ++
 .../MigratorUnitTests.cs                      |   4 +-
 5 files changed, 232 insertions(+), 115 deletions(-)
 create mode 100644 src/SettingsMigrator/TestSettingsNodes.cs

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index 5343d7628b..aac59aac4b 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -10,143 +10,155 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine
     public class Migrator
     {
         /// <summary>
-        /// Given a runsettings with an embedded testsettings, converts it to runsettings.
+        /// Given a runSettings with an embedded testSettings, converts it to runSettings.
         /// </summary>
-        /// <param name="oldRunsettingsPath"></param>
-        /// <param name="newRunsettingsPath"></param>
-        public void MigrateRunsettings(string oldRunsettingsPath, string newRunsettingsPath)
+        /// <param name="oldRunSettingsPath"></param>
+        /// <param name="newRunSettingsPath"></param>
+        public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
         {
-            string testsettingsPath = null;
-            using (XmlTextReader reader = new XmlTextReader(oldRunsettingsPath))
+            string testSettingsPath = null;
+            using (XmlTextReader reader = new XmlTextReader(oldRunSettingsPath))
             {
                 reader.Namespaces = false;
 
-                var document = new XmlDocument();
-                document.Load(reader);
-                var root = document.DocumentElement;
+                var runSettingsXmlDoc = new XmlDocument();
+                runSettingsXmlDoc.Load(reader);
+                var root = runSettingsXmlDoc.DocumentElement;
 
-                var testsettingsNode = root.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+                var testSettingsNode = root.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
 
-                if (testsettingsNode != null)
+                if (testSettingsNode != null)
                 {
-                    testsettingsPath = testsettingsNode.InnerText;
+                    testSettingsPath = testSettingsNode.InnerText;
                 }
-                if (!string.IsNullOrWhiteSpace(testsettingsPath))
+                if (!string.IsNullOrWhiteSpace(testSettingsPath))
                 {
-                    // Expand path relative to runsettings location.
-                    if (!Path.IsPathRooted(testsettingsPath))
+                    // Expand path relative to runSettings location.
+                    if (!Path.IsPathRooted(testSettingsPath))
                     {
-                        testsettingsPath = Path.Combine(oldRunsettingsPath, testsettingsPath);
+                        testSettingsPath = Path.Combine(oldRunSettingsPath, testSettingsPath);
                     }
 
-                    MigrateTestsettings(testsettingsPath, newRunsettingsPath, File.ReadAllText(oldRunsettingsPath));
+                    MigrateTestSettingsNodesToRunSettings(testSettingsPath, runSettingsXmlDoc);
+
+                    runSettingsXmlDoc.Save(newRunSettingsPath);
                 }
                 else
                 {
-                    Console.WriteLine("Runsettings does not contain an embedded testsettings, not migrating.");
+                    Console.WriteLine("RunSettings does not contain an embedded testSettings, not migrating.");
                 }
             }
         }
 
+
+        public void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
+        {
+            var runSettingsXmlDoc = new XmlDocument();
+            runSettingsXmlDoc.LoadXml(sampleRunSettingsContent);
+
+            MigrateTestSettingsNodesToRunSettings(oldTestSettingsPath, runSettingsXmlDoc);
+
+            runSettingsXmlDoc.Save(newRunSettingsPath);
+        }
+
         /// <summary>
-        /// Given a testsettings, converts it to runsettings
+        /// Given a testSettings, converts it to runSettings
         /// </summary>
-        /// <param name="testsettingsPath"></param>
-        /// <param name="newRunsettingsPath"></param>
+        /// <param name="testSettingsPath"></param>
+        /// <param name="newRunSettingsPath"></param>
         /// <param name="oldRunSettingsContent"></param>
-        public void MigrateTestsettings(string testsettingsPath, string newRunsettingsPath, string oldRunSettingsContent = null)
+        public void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
         {
-            using (XmlTextReader reader = new XmlTextReader(testsettingsPath))
+            var testSettingsNodes = ReadTestSettingsNodes(testSettingsPath);
+
+            string testTimeout = null;
+            if (testSettingsNodes.Timeout != null && testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null)
             {
-                reader.Namespaces = false;
+                testTimeout = testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName].Value;
+            }
 
-                var document = new XmlDocument();
-                document.Load(reader);
-                var root = document.DocumentElement;
+            string runTimeout = null;
+            if (testSettingsNodes.Timeout != null && testSettingsNodes.Timeout.Attributes[RunTimeoutAttributeName] != null)
+            {
+                runTimeout = testSettingsNodes.Timeout.Attributes[RunTimeoutAttributeName].Value;
+            }
 
-                // Select the interesting nodes from the xml.
-                var deploymentNode = root.SelectSingleNode(@"/TestSettings/Deployment");
-                var scriptnode = root.SelectSingleNode(@"/TestSettings/Scripts");
-                var websettingsNode = root.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
-                var oldDatacollectorNodes = root.SelectNodes(@"/TestSettings/AgentRule/DataCollectors/DataCollector");
-                var timeoutNode = root.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
-                var assemblyresolutionNode = root.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
-                var hostsNode = root.SelectSingleNode(@"/TestSettings/Execution/Hosts");
-                var executionNode = root.SelectSingleNode(@"/TestSettings/Execution");
-
-                string testTimeout = null;
-                if (timeoutNode != null && timeoutNode.Attributes[TestTimeoutAttributeName] != null)
-                {
-                    testTimeout = timeoutNode.Attributes[TestTimeoutAttributeName].Value;
-                }
+            string parallelTestCount = null;
+            if (testSettingsNodes.Execution != null && testSettingsNodes.Execution.Attributes[ParallelTestCountAttributeName] != null)
+            {
+                parallelTestCount = testSettingsNodes.Execution.Attributes[ParallelTestCountAttributeName].Value;
+            }
 
-                string runTimeout = null;
-                if (timeoutNode != null && timeoutNode.Attributes[RunTimeoutAttributeName] != null)
-                {
-                    runTimeout = timeoutNode.Attributes[RunTimeoutAttributeName].Value;
-                }
+            // Remove the embedded testSettings node if it exists.
+            RemoveEmbeddedTestSettings(runSettingsXmlDoc);
 
-                string parallelTestCount = null;
-                if (executionNode != null && executionNode.Attributes[ParallelTestCountAttributeName] != null)
-                {
-                    parallelTestCount = executionNode.Attributes[ParallelTestCountAttributeName].Value;
-                }
+            // WebTestRunConfiguration node.
+            if (testSettingsNodes.WebSettings != null)
+            {
+                runSettingsXmlDoc.DocumentElement.AppendChild(runSettingsXmlDoc.ImportNode(testSettingsNodes.WebSettings, deep: true));
+            }
 
-                if(string.IsNullOrEmpty(oldRunSettingsContent))
-                {
-                    oldRunSettingsContent = sampleRunsettingsContent;
-                }
-                var newXmlDoc = new XmlDocument();
-                newXmlDoc.LoadXml(oldRunSettingsContent);
+            // LegacySettings node.
+            if (testSettingsNodes.Deployment != null || testSettingsNodes.Script != null || testSettingsNodes.UnitTestConfig != null ||
+                !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || testSettingsNodes.Hosts != null)
+            {
+                AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, runSettingsXmlDoc);
+            }
 
-                // Remove the embedded testsettings node if it exists.
-                RemoveEmbeddedTestsettings(newXmlDoc);
+            // TestSessionTimeout node.
+            if (!string.IsNullOrEmpty(runTimeout))
+            {
+                AddRunTimeoutNode(runTimeout, runSettingsXmlDoc);
+            }
 
-                // WebTestRunConfiguration node.
-                if (websettingsNode != null)
-                {
-                    newXmlDoc.DocumentElement.AppendChild(newXmlDoc.ImportNode(websettingsNode, deep: true));
-                }
+            // DataCollectors node.
+            if (testSettingsNodes.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
+            {
+                AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc);
+            }
+        }
 
-                // LegacySettings node.
-                if (deploymentNode != null || scriptnode != null || assemblyresolutionNode != null ||
-                    !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || hostsNode != null)
-                {
-                    AddLegacyNodes(deploymentNode, scriptnode, testTimeout, assemblyresolutionNode, hostsNode, parallelTestCount, newXmlDoc);
-                }
+        private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
+        {
+            var testSettingsNodes = new TestSettingsNodes();
 
-                // TestSessionTimeout node.
-                if (!string.IsNullOrEmpty(runTimeout))
-                {
-                    AddRunTimeoutNode(runTimeout, newXmlDoc);
-                }
+            using (XmlTextReader reader = new XmlTextReader(testSettingsPath))
+            {
+                reader.Namespaces = false;
 
-                // DataCollectors node.
-                if (oldDatacollectorNodes != null && oldDatacollectorNodes.Count > 0)
-                {
-                    AddDataCollectorNodes(oldDatacollectorNodes, newXmlDoc);
-                }
+                var testSettingsXmlDoc = new XmlDocument();
+                testSettingsXmlDoc.Load(reader);
+                var testSettingsRoot = testSettingsXmlDoc.DocumentElement;
 
-                newXmlDoc.Save(newRunsettingsPath);
+                // Select the interesting nodes from the xml.
+                testSettingsNodes.Deployment = testSettingsRoot.SelectSingleNode(@"/TestSettings/Deployment");
+                testSettingsNodes.Script = testSettingsRoot.SelectSingleNode(@"/TestSettings/Scripts");
+                testSettingsNodes.WebSettings = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
+                testSettingsNodes.Datacollectors = testSettingsRoot.SelectNodes(@"/TestSettings/AgentRule/DataCollectors/DataCollector");
+                testSettingsNodes.Timeout = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
+                testSettingsNodes.UnitTestConfig = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
+                testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
+                testSettingsNodes.Execution = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution");
             }
+
+            return testSettingsNodes;
         }
 
         /// <summary>
-        /// Removes the embedded testsettings node if present.
+        /// Removes the embedded testSettings node if present.
         /// </summary>
         /// <param name="newXmlDoc"></param>
-        private void RemoveEmbeddedTestsettings(XmlDocument newXmlDoc)
+        private void RemoveEmbeddedTestSettings(XmlDocument newXmlDoc)
         {
-            var testsettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-            if (testsettingsNode != null)
+            var testSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+            if (testSettingsNode != null)
             {
-                testsettingsNode.ParentNode.RemoveChild(testsettingsNode);
+                testSettingsNode.ParentNode.RemoveChild(testSettingsNode);
             }
         }
 
-
         /// <summary>
-        /// Adds the legacy nodes to runsettings xml.
+        /// Adds the legacy nodes to runSettings xml.
         /// </summary>
         /// <param name="deploymentNode"></param>
         /// <param name="scriptnode"></param>
@@ -155,7 +167,7 @@ private void RemoveEmbeddedTestsettings(XmlDocument newXmlDoc)
         /// <param name="hostsNode"></param>
         /// <param name="parallelTestCount"></param>
         /// <param name="newXmlDoc"></param>
-        private void AddLegacyNodes(XmlNode deploymentNode, XmlNode scriptnode, string testTimeout, XmlNode assemblyresolutionNode, XmlNode hostsNode, string parallelTestCount, XmlDocument newXmlDoc)
+        private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTimeout, string parallelTestCount, XmlDocument newXmlDoc)
         {
             //Remove if the legacy node already exists.
             var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
@@ -166,17 +178,17 @@ private void AddLegacyNodes(XmlNode deploymentNode, XmlNode scriptnode, string t
 
             legacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, LegacySettingsNodeName, null);
 
-            if (deploymentNode != null)
+            if (testSettingsNodes.Deployment != null)
             {
-                legacyNode.AppendChild(newXmlDoc.ImportNode(deploymentNode, deep: true));
+                legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Deployment, deep: true));
             }
-            if (scriptnode != null)
+            if (testSettingsNodes.Script != null)
             {
-                legacyNode.AppendChild(newXmlDoc.ImportNode(scriptnode, deep: true));
+                legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Script, deep: true));
             }
 
             // Execution node.
-            if (assemblyresolutionNode != null || !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || hostsNode != null)
+            if (testSettingsNodes.UnitTestConfig != null || !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || testSettingsNodes.Hosts != null)
             {
                 var newExecutionNode = newXmlDoc.CreateNode(XmlNodeType.Element, ExecutionNodeName, null);
 
@@ -194,14 +206,14 @@ private void AddLegacyNodes(XmlNode deploymentNode, XmlNode scriptnode, string t
                     newTimeoutsNode.Attributes.Append(testtimeoutattribute);
                     newExecutionNode.AppendChild(newXmlDoc.ImportNode(newTimeoutsNode, deep: true));
                 }
-                if (hostsNode != null)
+                if (testSettingsNodes.Hosts != null)
                 {
-                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(hostsNode, deep: true));
+                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Hosts, deep: true));
                 }
-                if (assemblyresolutionNode != null)
+                if (testSettingsNodes.UnitTestConfig != null)
                 {
                     var testTypeSpecificNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestTypeSpecificNodeName, null);
-                    testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(assemblyresolutionNode, deep: true));
+                    testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.UnitTestConfig, deep: true));
                     newExecutionNode.AppendChild(newXmlDoc.ImportNode(testTypeSpecificNode, deep: true));
                 }
                 legacyNode.AppendChild(newXmlDoc.ImportNode(newExecutionNode, deep: true));
@@ -209,9 +221,8 @@ private void AddLegacyNodes(XmlNode deploymentNode, XmlNode scriptnode, string t
             newXmlDoc.DocumentElement.AppendChild(legacyNode);
         }
 
-
         /// <summary>
-        /// Adds the datacollector nodes to the runsettings xml.
+        /// Adds the datacollector nodes to the runSettings xml.
         /// </summary>
         /// <param name="oldDatacollectorNodes"></param>
         /// <param name="newXmlDoc"></param>
@@ -269,7 +280,7 @@ private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
         const string TestSessionTimeoutNodeName = "TestSessionTimeout";
         const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
         const string DataCollectorsNodeName = "DataCollectors";
-        const string sampleRunsettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+        const string sampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                                                 "<RunSettings></RunSettings>";
     }
 }
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
index 69d23e8357..426527500c 100644
--- a/src/SettingsMigrator/Program.cs
+++ b/src/SettingsMigrator/Program.cs
@@ -2,7 +2,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Globalization;
 using System.IO;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
 namespace Microsoft.VisualStudio.TestPlatform.CommandLine
 {
@@ -12,38 +14,38 @@ static void Main(string[] args)
         {
             if (args.Length != 2)
             {
-                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
                 return;
             }
 
             string oldFilePath = args[0];
             string newFilePath = args[1];
 
-            if (!Path.IsPathRooted(oldFilePath) || !Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunsettingsExtension))
+            if (!Path.IsPathRooted(oldFilePath) || !Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunSettingsExtension))
             {
-                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
                 return;
             }
 
             var migrator = new Migrator();
 
-            if (string.Equals(Path.GetExtension(oldFilePath), TestsettingsExtension))
+            if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension))
             {
-                migrator.MigrateTestsettings(oldFilePath, newFilePath);
+                migrator.MigrateTestSettings(oldFilePath, newFilePath);
             }
-            else if (string.Equals(Path.GetExtension(oldFilePath), RunsettingsExtension))
+            else if (string.Equals(Path.GetExtension(oldFilePath), RunSettingsExtension))
             {
-                migrator.MigrateRunsettings(oldFilePath, newFilePath);
+                migrator.MigrateRunSettings(oldFilePath, newFilePath);
             }
             else
             {
-                Console.WriteLine("Valid usage:\nSettingsMigrator.exe [Full path to testsettings file/runsettings file to be migrated] [Full path to new runsettings file]");
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
                 return;
             }
         }
 
-        const string RunsettingsExtension = ".runsettings";
-        const string TestsettingsExtension = ".testsettings";
+        const string RunSettingsExtension = ".runsettings";
+        const string TestSettingsExtension = ".testsettings";
     }
 }
 
diff --git a/src/SettingsMigrator/Resources/Resources.Designer.cs b/src/SettingsMigrator/Resources/Resources.Designer.cs
index 5f282702bb..5d67840b9f 100644
--- a/src/SettingsMigrator/Resources/Resources.Designer.cs
+++ b/src/SettingsMigrator/Resources/Resources.Designer.cs
@@ -1 +1,84 @@
-
\ No newline at end of file
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Resources
+{
+    using System;
+    using System.Reflection;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if (object.ReferenceEquals(resourceMan, null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SettingsMigrator.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Valid usage: SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to new runsettings file>
+        /// </summary>
+        public static string ValidUsage
+        {
+            get
+            {
+                return ResourceManager.GetString("ValidUsage", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/SettingsMigrator/TestSettingsNodes.cs b/src/SettingsMigrator/TestSettingsNodes.cs
new file mode 100644
index 0000000000..825b0eb8e2
--- /dev/null
+++ b/src/SettingsMigrator/TestSettingsNodes.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+{
+    public class TestSettingsNodes
+    {
+        public XmlNode Deployment { get; set; }
+        public XmlNode Script { get; set; }
+        public XmlNode WebSettings { get; set; }
+        public XmlNodeList Datacollectors { get; set; }
+        public XmlNode Timeout { get; set; }
+        public XmlNode UnitTestConfig { get; set; }
+        public XmlNode Hosts { get; set; }
+        public XmlNode Execution { get; set; }
+    }
+}
diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
index 3661f08a6e..97d3d706ef 100644
--- a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
@@ -28,7 +28,7 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
                 settingsnode.InnerText = oldTestsettingsPath;
             File.WriteAllText(oldRunsettingsPath, doc.InnerXml);
 
-            migrator.MigrateRunsettings(oldRunsettingsPath, newRunsettingsPath);
+            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
 
             Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
 
@@ -77,7 +77,7 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
             File.WriteAllText(oldTestsettingsPath, oldtestsettings);
             File.WriteAllText(newRunsettingsPath, "");
 
-            migrator.MigrateTestsettings(oldTestsettingsPath, newRunsettingsPath);
+            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
 
             Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
 

From dab18beaffe77ed2102d7ef9472f471eba154b61 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Thu, 17 May 2018 14:18:45 +0530
Subject: [PATCH 04/21] PR comments

---
 src/SettingsMigrator/Migrator.cs              | 31 +++++++++++++++----
 src/SettingsMigrator/Program.cs               | 17 +++++++---
 .../Resources/Resources.Designer.cs           | 22 +++++++++++++
 src/SettingsMigrator/Resources/Resources.resx |  6 ++++
 src/SettingsMigrator/TestSettingsNodes.cs     | 13 ++++----
 5 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index aac59aac4b..e189b22dea 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -1,12 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.IO;
-using System.Xml;
-
 namespace Microsoft.VisualStudio.TestPlatform.CommandLine
 {
+    using System;
+    using System.IO;
+    using System.Xml;
+    using System.Globalization;
+    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+    /// <summary>
+    /// Migrator used to migrate test settings and run settings with embedded testsettings to run settings.
+    /// </summary>
     public class Migrator
     {
         /// <summary>
@@ -50,7 +55,11 @@ public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsP
             }
         }
 
-
+        /// <summary>
+        /// Given a testSettings, converts it to runSettings.
+        /// </summary>
+        /// <param name="oldTestSettingsPath"></param>
+        /// <param name="newRunSettingsPath"></param>
         public void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
         {
             var runSettingsXmlDoc = new XmlDocument();
@@ -67,7 +76,7 @@ public void MigrateTestSettings(string oldTestSettingsPath, string newRunSetting
         /// <param name="testSettingsPath"></param>
         /// <param name="newRunSettingsPath"></param>
         /// <param name="oldRunSettingsContent"></param>
-        public void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
+        private void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
         {
             var testSettingsNodes = ReadTestSettingsNodes(testSettingsPath);
 
@@ -139,6 +148,12 @@ private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
                 testSettingsNodes.UnitTestConfig = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
                 testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
                 testSettingsNodes.Execution = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution");
+
+                if (testSettingsNodes.Timeout != null && (testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null ||
+                    testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null || testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null))
+                {
+                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
+                }
             }
 
             return testSettingsNodes;
@@ -173,6 +188,7 @@ private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTime
             var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
             if (legacyNode != null)
             {
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.IgnoringLegacySettings));
                 legacyNode.ParentNode.RemoveChild(legacyNode);
             }
 
@@ -282,6 +298,9 @@ private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
         const string DataCollectorsNodeName = "DataCollectors";
         const string sampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                                                 "<RunSettings></RunSettings>";
+        const string agentNotRespondingTimeout = "agentNotRespondingTimeout";
+        const string DeploymentTimeout = "deploymentTimeout";
+        const string ScriptTimeout = "scriptTimeout";
     }
 }
 
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
index 426527500c..daa8fbe9aa 100644
--- a/src/SettingsMigrator/Program.cs
+++ b/src/SettingsMigrator/Program.cs
@@ -1,15 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Globalization;
-using System.IO;
-using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
 namespace Microsoft.VisualStudio.TestPlatform.CommandLine
 {
+    using System;
+    using System.Globalization;
+    using System.IO;
+    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+    /// <summary>
+    /// Entry point for SettingsMigrator.
+    /// </summary>
     class Program
     {
+        /// <summary>
+        /// Main entry point. Hands off execution to Migrator.
+        /// </summary>
+        /// <param name="args">Arguments provided on the command line.</param>
         static void Main(string[] args)
         {
             if (args.Length != 2)
diff --git a/src/SettingsMigrator/Resources/Resources.Designer.cs b/src/SettingsMigrator/Resources/Resources.Designer.cs
index 5d67840b9f..3fc7ff5f6a 100644
--- a/src/SettingsMigrator/Resources/Resources.Designer.cs
+++ b/src/SettingsMigrator/Resources/Resources.Designer.cs
@@ -70,6 +70,17 @@ public Resources()
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Any LegacySettings node already present in the runsettings will be removed.
+        /// </summary>
+        public static string IgnoringLegacySettings
+        {
+            get
+            {
+                return ResourceManager.GetString("IgnoringLegacySettings", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Valid usage: SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to new runsettings file>
         /// </summary>
@@ -80,5 +91,16 @@ public static string ValidUsage
                 return ResourceManager.GetString("ValidUsage", resourceCulture);
             }
         }
+
+        /// <summary>
+        ///   Looks up a localized string similar to The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.
+        /// </summary>
+        public static string UnsupportedAttributes
+        {
+            get
+            {
+                return ResourceManager.GetString("UnsupportedAttributes", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/SettingsMigrator/Resources/Resources.resx b/src/SettingsMigrator/Resources/Resources.resx
index 9464b58fd3..0fecc686c4 100644
--- a/src/SettingsMigrator/Resources/Resources.resx
+++ b/src/SettingsMigrator/Resources/Resources.resx
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="IgnoringLegacySettings" xml:space="preserve">
+    <value>Any LegacySettings node already present in the runsettings will be removed.</value>
+  </data>
+  <data name="UnsupportedAttributes" xml:space="preserve">
+    <value>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</value>
+  </data>
   <data name="ValidUsage" xml:space="preserve">
     <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</value>
   </data>
diff --git a/src/SettingsMigrator/TestSettingsNodes.cs b/src/SettingsMigrator/TestSettingsNodes.cs
index 825b0eb8e2..93c31c05eb 100644
--- a/src/SettingsMigrator/TestSettingsNodes.cs
+++ b/src/SettingsMigrator/TestSettingsNodes.cs
@@ -1,12 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.TestPlatform.CommandLine
 {
+    using System.Xml;
+
+    /// <summary>
+    /// Contains the test settings nodes that need to be converted.
+    /// </summary>
     public class TestSettingsNodes
     {
         public XmlNode Deployment { get; set; }

From 528f31a820f2602bd283c6889dd540345af1afb0 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Thu, 17 May 2018 14:39:25 +0530
Subject: [PATCH 05/21] More UTs

---
 .../MigratorUnitTests.cs                      | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
index 97d3d706ef..f066dc2cca 100644
--- a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
@@ -19,11 +19,11 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
             string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
             string oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
             
-            File.WriteAllText(oldTestsettingsPath, oldtestsettings);
+            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
             File.WriteAllText(newRunsettingsPath, "");
 
             var doc = new XmlDocument();
-            doc.LoadXml(oldrunsettings);
+            doc.LoadXml(OldRunSettings);
             var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
                 settingsnode.InnerText = oldTestsettingsPath;
             File.WriteAllText(oldRunsettingsPath, doc.InnerXml);
@@ -72,9 +72,8 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
             var migrator = new Migrator();
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
             string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
-            //File.Create(oldTestsettingsPath);
-            //File.Create(newRunsettingsPath);
-            File.WriteAllText(oldTestsettingsPath, oldtestsettings);
+            
+            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
             File.WriteAllText(newRunsettingsPath, "");
 
             migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
@@ -113,14 +112,47 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
             File.Delete(oldTestsettingsPath);
         }
 
-        const string oldrunsettings = "<RunSettings>" +
-                                      "<MSTest>" +
-                                      "<ForcedLegacyMode>true</ForcedLegacyMode>" +
-                                      "<SettingsFile ></SettingsFile>" +
-                                      "</MSTest>" +
-                                      "</RunSettings>";
+        [TestMethod]
+        [ExpectedException(typeof(XmlException))]
+        public void InvalidSettingsThrowsException()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+            
+            File.WriteAllText(oldTestsettingsPath, InvalidSettings);
+            File.WriteAllText(newRunsettingsPath, "");
+
+            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
 
-        const string oldtestsettings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+            File.Delete(oldTestsettingsPath);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(DirectoryNotFoundException))]
+        public void InvalidPathThrowsException()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = @"X:\generatedRunsettings.runsettings";
+            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+
+            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
+            File.WriteAllText(newRunsettingsPath, "");
+
+            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
+
+            File.Delete(oldTestsettingsPath);
+        }
+
+        const string InvalidSettings = "<InvalidSettings>";
+        const string OldRunSettings = "<RunSettings>" +
+                                    "<MSTest>" +
+                                    "<ForcedLegacyMode>true</ForcedLegacyMode>" +
+                                    "<SettingsFile ></SettingsFile>" +
+                                    "</MSTest>" +
+                                    "</RunSettings>";
+
+        const string OldTestSettings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
                                     "<TestSettings name=\"TestSettings1\" id=\"cfb5c9a7-f57f-42db-8006-108cdf34bee1\" xmlns=\"http://microsoft.com/schemas/VisualStudio/TeamTest/2010\">" +
                                     "<Description>These are default test settings for a local test run.</Description>" +
                                     "<Deployment>" +
@@ -151,7 +183,5 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
                                     "</Execution>" +
                                     "<Properties/>" +
                                     "</TestSettings>";
-    }
-
-    
+    }   
 }

From 29649c1a1b60874905f3e3db31e4893be89f4752 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Thu, 17 May 2018 15:10:12 +0530
Subject: [PATCH 06/21] Fixing message

---
 src/SettingsMigrator/Migrator.cs              | 12 ++++++------
 src/SettingsMigrator/Resources/Resources.resx |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index e189b22dea..9c7323b81d 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -149,10 +149,10 @@ private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
                 testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
                 testSettingsNodes.Execution = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution");
 
-                if (testSettingsNodes.Timeout != null && (testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null ||
-                    testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null || testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null))
+                if (testSettingsNodes.Timeout != null && (testSettingsNodes.Timeout.Attributes[AgentNotRespondingTimeoutAttribute] != null ||
+                    testSettingsNodes.Timeout.Attributes[DeploymentTimeoutAttribute] != null || testSettingsNodes.Timeout.Attributes[ScriptTimeoutAttribute] != null))
                 {
-                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
+                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UnsupportedAttributes));
                 }
             }
 
@@ -298,9 +298,9 @@ private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
         const string DataCollectorsNodeName = "DataCollectors";
         const string sampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                                                 "<RunSettings></RunSettings>";
-        const string agentNotRespondingTimeout = "agentNotRespondingTimeout";
-        const string DeploymentTimeout = "deploymentTimeout";
-        const string ScriptTimeout = "scriptTimeout";
+        const string AgentNotRespondingTimeoutAttribute = "agentNotRespondingTimeout";
+        const string DeploymentTimeoutAttribute = "deploymentTimeout";
+        const string ScriptTimeoutAttribute = "scriptTimeout";
     }
 }
 
diff --git a/src/SettingsMigrator/Resources/Resources.resx b/src/SettingsMigrator/Resources/Resources.resx
index 0fecc686c4..91a261771b 100644
--- a/src/SettingsMigrator/Resources/Resources.resx
+++ b/src/SettingsMigrator/Resources/Resources.resx
@@ -124,6 +124,7 @@
     <value>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</value>
   </data>
   <data name="ValidUsage" xml:space="preserve">
-    <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</value>
+    <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings</value>
   </data>
 </root>
\ No newline at end of file

From d67f77b62f06cf049cdacf7378cce8ad51abde8f Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Thu, 17 May 2018 15:45:04 +0530
Subject: [PATCH 07/21] Fixing datacollector node

---
 src/SettingsMigrator/Migrator.cs                   |  4 ++--
 .../MigratorUnitTests.cs                           | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index 9c7323b81d..2b76681aef 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -143,7 +143,7 @@ private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
                 testSettingsNodes.Deployment = testSettingsRoot.SelectSingleNode(@"/TestSettings/Deployment");
                 testSettingsNodes.Script = testSettingsRoot.SelectSingleNode(@"/TestSettings/Scripts");
                 testSettingsNodes.WebSettings = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
-                testSettingsNodes.Datacollectors = testSettingsRoot.SelectNodes(@"/TestSettings/AgentRule/DataCollectors/DataCollector");
+                testSettingsNodes.Datacollectors = testSettingsRoot.SelectNodes(@"/TestSettings/Execution/AgentRule/DataCollectors/DataCollector");
                 testSettingsNodes.Timeout = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
                 testSettingsNodes.UnitTestConfig = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
                 testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
@@ -255,6 +255,7 @@ private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocumen
             {
                 dataCollectorsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectorsNodeName, null);
                 dataCollectionRunSettingsNode.AppendChild(newXmlDoc.ImportNode(dataCollectorsNode, deep: true));
+                newXmlDoc.DocumentElement.AppendChild(dataCollectionRunSettingsNode);
                 dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
             }
 
@@ -262,7 +263,6 @@ private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocumen
             {
                 dataCollectorsNode.AppendChild(newXmlDoc.ImportNode(datacollector, deep: true));
             }
-            newXmlDoc.DocumentElement.AppendChild(dataCollectionRunSettingsNode);
         }
 
         /// <summary>
diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
index f066dc2cca..7b1163a717 100644
--- a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
@@ -58,6 +58,10 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
                 var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
                 Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
                 Assert.AreEqual(testSessionTimeoutNode.InnerText, "60000", "Timeout value does not match.");
+
+                var dataCollectorNode = root.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+                Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
+                Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
             }
 
             File.Delete(oldRunsettingsPath);
@@ -106,6 +110,10 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
                 var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
                 Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
                 Assert.AreEqual(testSessionTimeoutNode.InnerText, "60000", "Timeout value does not match.");
+
+                var dataCollectorNode = root.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+                Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
+                Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
             }
 
             File.Delete(newRunsettingsPath);
@@ -148,7 +156,7 @@ public void InvalidPathThrowsException()
         const string OldRunSettings = "<RunSettings>" +
                                     "<MSTest>" +
                                     "<ForcedLegacyMode>true</ForcedLegacyMode>" +
-                                    "<SettingsFile ></SettingsFile>" +
+                                    "<SettingsFile></SettingsFile>" +
                                     "</MSTest>" +
                                     "</RunSettings>";
 
@@ -179,6 +187,10 @@ public void InvalidPathThrowsException()
                                     "</WebTestRunConfiguration>" +
                                     "</TestTypeSpecific>" +
                                     "<AgentRule name=\"LocalMachineDefaultRole\">" +
+                                    "<DataCollectors>" +
+                                    "<DataCollector uri=\"datacollector://microsoft/EventLog/1.0\" assemblyQualifiedName=\"Microsoft.VisualStudio.TestTools.DataCollection.EventLog.EventLogDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.EventLog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"Event Log\">" +
+                                    "</DataCollector>" +
+                                    "</DataCollectors>" +
                                     "</AgentRule>" +
                                     "</Execution>" +
                                     "<Properties/>" +

From 2e1b3182b1cfadc14eb36260614fd9e0636d21e8 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 12:33:22 +0530
Subject: [PATCH 08/21] PR comments

---
 src/SettingsMigrator/Migrator.cs              | 138 ++++++++------
 src/SettingsMigrator/Program.cs               |  26 +--
 .../Resources/Resources.Designer.cs           |  24 ++-
 src/SettingsMigrator/Resources/Resources.resx |   9 +-
 src/SettingsMigrator/SettingsMigrator.csproj  |  11 +-
 src/SettingsMigrator/TestSettingsNodes.cs     |   9 +-
 src/SettingsMigrator/app.manifest             |  27 ---
 .../MigratorUnitTests.cs                      | 172 +++++++-----------
 .../SettingsMigrator.UnitTests.csproj         |  16 +-
 .../oldRunSettings.runsettings                |   6 +
 ...ldRunSettingsWithDataCollector.runsettings |  11 ++
 .../oldTestSettings.testsettings              |  42 +++++
 12 files changed, 272 insertions(+), 219 deletions(-)
 delete mode 100644 src/SettingsMigrator/app.manifest
 create mode 100644 test/SettingsMigrator.UnitTests/oldRunSettings.runsettings
 create mode 100644 test/SettingsMigrator.UnitTests/oldRunSettingsWithDataCollector.runsettings
 create mode 100644 test/SettingsMigrator.UnitTests/oldTestSettings.testsettings

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index 2b76681aef..edce5b7eb6 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -1,24 +1,55 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
 {
     using System;
+    using System.Globalization;
     using System.IO;
     using System.Xml;
-    using System.Globalization;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    using CommandLineResources = Resources.Resources;
 
     /// <summary>
     /// Migrator used to migrate test settings and run settings with embedded testsettings to run settings.
     /// </summary>
     public class Migrator
     {
+        private const string TestTimeoutAttributeName = "testTimeout";
+
+        private const string ParallelTestCountAttributeName = "parallelTestCount";
+
+        private const string RunTimeoutAttributeName = "runTimeout";
+
+        private const string LegacySettingsNodeName = "LegacySettings";
+
+        private const string ExecutionNodeName = "Execution";
+
+        private const string TimeoutsNodeName = "Timeouts";
+
+        private const string TestTypeSpecificNodeName = "TestTypeSpecific";
+
+        private const string RunConfigurationNodeName = "RunConfiguration";
+
+        private const string TestSessionTimeoutNodeName = "TestSessionTimeout";
+
+        private const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
+
+        private const string DataCollectorsNodeName = "DataCollectors";
+
+        private const string SampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                                                "<RunSettings></RunSettings>";
+
+        private const string AgentNotRespondingTimeoutAttribute = "agentNotRespondingTimeout";
+
+        private const string DeploymentTimeoutAttribute = "deploymentTimeout";
+
+        private const string ScriptTimeoutAttribute = "scriptTimeout";
+
         /// <summary>
         /// Given a runSettings with an embedded testSettings, converts it to runSettings.
         /// </summary>
-        /// <param name="oldRunSettingsPath"></param>
-        /// <param name="newRunSettingsPath"></param>
+        /// <param name="oldRunSettingsPath"> Path to old runsettings.</param>
+        /// <param name="newRunSettingsPath">Path to new runsettings.</param>
         public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
         {
             string testSettingsPath = null;
@@ -36,21 +67,26 @@ public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsP
                 {
                     testSettingsPath = testSettingsNode.InnerText;
                 }
+
                 if (!string.IsNullOrWhiteSpace(testSettingsPath))
                 {
                     // Expand path relative to runSettings location.
                     if (!Path.IsPathRooted(testSettingsPath))
                     {
-                        testSettingsPath = Path.Combine(oldRunSettingsPath, testSettingsPath);
+                        testSettingsPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(oldRunSettingsPath), testSettingsPath));
                     }
 
-                    MigrateTestSettingsNodesToRunSettings(testSettingsPath, runSettingsXmlDoc);
+                    // Remove the embedded testSettings node if it exists.
+                    this.RemoveEmbeddedTestSettings(runSettingsXmlDoc);
+
+                    this.MigrateTestSettingsNodesToRunSettings(testSettingsPath, runSettingsXmlDoc);
 
                     runSettingsXmlDoc.Save(newRunSettingsPath);
+                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.RunSettingsCreated, newRunSettingsPath));
                 }
                 else
                 {
-                    Console.WriteLine("RunSettings does not contain an embedded testSettings, not migrating.");
+                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoEmbeddedSettings));
                 }
             }
         }
@@ -58,27 +94,27 @@ public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsP
         /// <summary>
         /// Given a testSettings, converts it to runSettings.
         /// </summary>
-        /// <param name="oldTestSettingsPath"></param>
-        /// <param name="newRunSettingsPath"></param>
+        /// <param name="oldTestSettingsPath">Path to old testsettings.</param>
+        /// <param name="newRunSettingsPath">Path to new runsettings.</param>
         public void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
         {
             var runSettingsXmlDoc = new XmlDocument();
-            runSettingsXmlDoc.LoadXml(sampleRunSettingsContent);
+            runSettingsXmlDoc.LoadXml(SampleRunSettingsContent);
 
-            MigrateTestSettingsNodesToRunSettings(oldTestSettingsPath, runSettingsXmlDoc);
+            this.MigrateTestSettingsNodesToRunSettings(oldTestSettingsPath, runSettingsXmlDoc);
 
             runSettingsXmlDoc.Save(newRunSettingsPath);
+            Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.RunSettingsCreated, newRunSettingsPath));
         }
 
         /// <summary>
         /// Given a testSettings, converts it to runSettings
         /// </summary>
-        /// <param name="testSettingsPath"></param>
-        /// <param name="newRunSettingsPath"></param>
-        /// <param name="oldRunSettingsContent"></param>
+        /// <param name="testSettingsPath">Path to test settings</param>
+        /// <param name="runSettingsXmlDoc">Runsettings Xml</param>
         private void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
         {
-            var testSettingsNodes = ReadTestSettingsNodes(testSettingsPath);
+            var testSettingsNodes = this.ReadTestSettingsNodes(testSettingsPath);
 
             string testTimeout = null;
             if (testSettingsNodes.Timeout != null && testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null)
@@ -98,9 +134,6 @@ private void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlD
                 parallelTestCount = testSettingsNodes.Execution.Attributes[ParallelTestCountAttributeName].Value;
             }
 
-            // Remove the embedded testSettings node if it exists.
-            RemoveEmbeddedTestSettings(runSettingsXmlDoc);
-
             // WebTestRunConfiguration node.
             if (testSettingsNodes.WebSettings != null)
             {
@@ -108,22 +141,18 @@ private void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlD
             }
 
             // LegacySettings node.
-            if (testSettingsNodes.Deployment != null || testSettingsNodes.Script != null || testSettingsNodes.UnitTestConfig != null ||
-                !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || testSettingsNodes.Hosts != null)
-            {
-                AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, runSettingsXmlDoc);
-            }
+            this.AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, runSettingsXmlDoc);
 
             // TestSessionTimeout node.
             if (!string.IsNullOrEmpty(runTimeout))
             {
-                AddRunTimeoutNode(runTimeout, runSettingsXmlDoc);
+                this.AddRunTimeoutNode(runTimeout, runSettingsXmlDoc);
             }
 
             // DataCollectors node.
             if (testSettingsNodes.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
             {
-                AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc);
+                this.AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc);
             }
         }
 
@@ -162,7 +191,7 @@ private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
         /// <summary>
         /// Removes the embedded testSettings node if present.
         /// </summary>
-        /// <param name="newXmlDoc"></param>
+        /// <param name="newXmlDoc">Xml doc to process</param>
         private void RemoveEmbeddedTestSettings(XmlDocument newXmlDoc)
         {
             var testSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
@@ -175,16 +204,19 @@ private void RemoveEmbeddedTestSettings(XmlDocument newXmlDoc)
         /// <summary>
         /// Adds the legacy nodes to runSettings xml.
         /// </summary>
-        /// <param name="deploymentNode"></param>
-        /// <param name="scriptnode"></param>
-        /// <param name="testTimeout"></param>
-        /// <param name="assemblyresolutionNode"></param>
-        /// <param name="hostsNode"></param>
-        /// <param name="parallelTestCount"></param>
-        /// <param name="newXmlDoc"></param>
+        /// <param name="testSettingsNodes">testSettingsNodes</param>
+        /// <param name="testTimeout">testTimeout</param>
+        /// <param name="parallelTestCount">parallelTestCount</param>
+        /// <param name="newXmlDoc">newXmlDoc</param>
         private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTimeout, string parallelTestCount, XmlDocument newXmlDoc)
         {
-            //Remove if the legacy node already exists.
+            if (!(testSettingsNodes.Deployment != null || testSettingsNodes.Script != null || testSettingsNodes.UnitTestConfig != null ||
+                !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || testSettingsNodes.Hosts != null))
+            {
+                return;
+            }
+
+            // Remove if the legacy node already exists.
             var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
             if (legacyNode != null)
             {
@@ -198,6 +230,7 @@ private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTime
             {
                 legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Deployment, deep: true));
             }
+
             if (testSettingsNodes.Script != null)
             {
                 legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Script, deep: true));
@@ -208,12 +241,13 @@ private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTime
             {
                 var newExecutionNode = newXmlDoc.CreateNode(XmlNodeType.Element, ExecutionNodeName, null);
 
-                if (string.IsNullOrEmpty(parallelTestCount))
+                if (!string.IsNullOrEmpty(parallelTestCount))
                 {
                     var paralellAttribute = newXmlDoc.CreateAttribute(ParallelTestCountAttributeName);
                     paralellAttribute.Value = parallelTestCount;
                     newExecutionNode.Attributes.Append(paralellAttribute);
                 }
+
                 if (!string.IsNullOrEmpty(testTimeout))
                 {
                     var newTimeoutsNode = newXmlDoc.CreateNode(XmlNodeType.Element, TimeoutsNodeName, null);
@@ -222,26 +256,30 @@ private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTime
                     newTimeoutsNode.Attributes.Append(testtimeoutattribute);
                     newExecutionNode.AppendChild(newXmlDoc.ImportNode(newTimeoutsNode, deep: true));
                 }
+
                 if (testSettingsNodes.Hosts != null)
                 {
                     newExecutionNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Hosts, deep: true));
                 }
+
                 if (testSettingsNodes.UnitTestConfig != null)
                 {
                     var testTypeSpecificNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestTypeSpecificNodeName, null);
                     testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.UnitTestConfig, deep: true));
                     newExecutionNode.AppendChild(newXmlDoc.ImportNode(testTypeSpecificNode, deep: true));
                 }
+
                 legacyNode.AppendChild(newXmlDoc.ImportNode(newExecutionNode, deep: true));
             }
+
             newXmlDoc.DocumentElement.AppendChild(legacyNode);
         }
 
         /// <summary>
         /// Adds the datacollector nodes to the runSettings xml.
         /// </summary>
-        /// <param name="oldDatacollectorNodes"></param>
-        /// <param name="newXmlDoc"></param>
+        /// <param name="oldDatacollectorNodes"> Datacollector Nodes</param>
+        /// <param name="newXmlDoc">Xml doc to process</param>
         private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocument newXmlDoc)
         {
             var dataCollectionRunSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings");
@@ -268,8 +306,8 @@ private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocumen
         /// <summary>
         /// Adds run session timeout node.
         /// </summary>
-        /// <param name="runTimeout"></param>
-        /// <param name="newXmlDoc"></param>
+        /// <param name="runTimeout">Run Timeout</param>
+        /// <param name="newXmlDoc">Xml doc to process</param>
         private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
         {
             var runConfigurationNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/RunConfiguration");
@@ -284,23 +322,5 @@ private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
 
             newXmlDoc.DocumentElement.AppendChild(runConfigurationNode);
         }
-
-        const string TestTimeoutAttributeName = "testTimeout";
-        const string ParallelTestCountAttributeName = "testTimeout";
-        const string RunTimeoutAttributeName = "runTimeout";
-        const string LegacySettingsNodeName = "LegacySettings";
-        const string ExecutionNodeName = "Execution";
-        const string TimeoutsNodeName = "Timeouts";
-        const string TestTypeSpecificNodeName = "TestTypeSpecific";
-        const string RunConfigurationNodeName = "RunConfiguration";
-        const string TestSessionTimeoutNodeName = "TestSessionTimeout";
-        const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
-        const string DataCollectorsNodeName = "DataCollectors";
-        const string sampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-                                                "<RunSettings></RunSettings>";
-        const string AgentNotRespondingTimeoutAttribute = "agentNotRespondingTimeout";
-        const string DeploymentTimeoutAttribute = "deploymentTimeout";
-        const string ScriptTimeoutAttribute = "scriptTimeout";
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
index daa8fbe9aa..21f4359702 100644
--- a/src/SettingsMigrator/Program.cs
+++ b/src/SettingsMigrator/Program.cs
@@ -1,39 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
 {
     using System;
     using System.Globalization;
     using System.IO;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    using CommandLineResources = Resources.Resources;
 
     /// <summary>
     /// Entry point for SettingsMigrator.
     /// </summary>
-    class Program
+    public static class Program
     {
+        private const string RunSettingsExtension = ".runsettings";
+
+        private const string TestSettingsExtension = ".testsettings";
+
         /// <summary>
         /// Main entry point. Hands off execution to Migrator.
         /// </summary>
         /// <param name="args">Arguments provided on the command line.</param>
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
-            if (args.Length != 2)
+            if (args.Length != 1)
             {
                 Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
                 return;
             }
 
             string oldFilePath = args[0];
-            string newFilePath = args[1];
 
-            if (!Path.IsPathRooted(oldFilePath) || !Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunSettingsExtension))
+            if (!Path.IsPathRooted(oldFilePath))
             {
                 Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
                 return;
             }
 
+            var newFileName = string.Concat(Guid.NewGuid().ToString(), RunSettingsExtension);
+            string newFilePath = Path.Combine(Path.GetDirectoryName(oldFilePath), newFileName);
+
             var migrator = new Migrator();
 
             if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension))
@@ -50,9 +56,5 @@ static void Main(string[] args)
                 return;
             }
         }
-
-        const string RunSettingsExtension = ".runsettings";
-        const string TestSettingsExtension = ".testsettings";
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/Resources.Designer.cs b/src/SettingsMigrator/Resources/Resources.Designer.cs
index 3fc7ff5f6a..8636032416 100644
--- a/src/SettingsMigrator/Resources/Resources.Designer.cs
+++ b/src/SettingsMigrator/Resources/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Resources
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources
 {
     using System;
     using System.Reflection;
@@ -81,6 +81,28 @@ public static string IgnoringLegacySettings
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to RunSettings does not contain an embedded testSettings, not migrating.
+        /// </summary>
+        public static string NoEmbeddedSettings
+        {
+            get
+            {
+                return ResourceManager.GetString("NoEmbeddedSettings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The migrated RunSettings file has been created at
+        /// </summary>
+        public static string RunSettingsCreated
+        {
+            get
+            {
+                return ResourceManager.GetString("RunSettingsCreated", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Valid usage: SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to new runsettings file>
         /// </summary>
diff --git a/src/SettingsMigrator/Resources/Resources.resx b/src/SettingsMigrator/Resources/Resources.resx
index 91a261771b..64f19199cf 100644
--- a/src/SettingsMigrator/Resources/Resources.resx
+++ b/src/SettingsMigrator/Resources/Resources.resx
@@ -120,11 +120,18 @@
   <data name="IgnoringLegacySettings" xml:space="preserve">
     <value>Any LegacySettings node already present in the runsettings will be removed.</value>
   </data>
+  <data name="NoEmbeddedSettings" xml:space="preserve">
+    <value>RunSettings does not contain an embedded testSettings, not migrating.</value>
+  </data>
+  <data name="RunSettingsCreated" xml:space="preserve">
+    <value>The migrated RunSettings file has been created at: {0}</value>
+  </data>
   <data name="UnsupportedAttributes" xml:space="preserve">
     <value>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</value>
   </data>
   <data name="ValidUsage" xml:space="preserve">
     <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings</value>
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
index 824453cf1a..675d6c1963 100644
--- a/src/SettingsMigrator/SettingsMigrator.csproj
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -6,14 +6,15 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
     <AssemblyName>SettingsMigrator</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFramework>net451</TargetFramework>
+	<WarningsAsErrors>true</WarningsAsErrors>
+    <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <WarningsAsErrors>true</WarningsAsErrors>
     <OutputType>Exe</OutputType>
-    <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
-    <Prefer32Bit Condition="'$(TargetFramework)' == 'net451'">true</Prefer32Bit>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.0'">
+  <PropertyGroup>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/SettingsMigrator/TestSettingsNodes.cs b/src/SettingsMigrator/TestSettingsNodes.cs
index 93c31c05eb..c0e3271366 100644
--- a/src/SettingsMigrator/TestSettingsNodes.cs
+++ b/src/SettingsMigrator/TestSettingsNodes.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
 {
     using System.Xml;
 
@@ -11,12 +11,19 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine
     public class TestSettingsNodes
     {
         public XmlNode Deployment { get; set; }
+
         public XmlNode Script { get; set; }
+
         public XmlNode WebSettings { get; set; }
+
         public XmlNodeList Datacollectors { get; set; }
+
         public XmlNode Timeout { get; set; }
+
         public XmlNode UnitTestConfig { get; set; }
+
         public XmlNode Hosts { get; set; }
+
         public XmlNode Execution { get; set; }
     }
 }
diff --git a/src/SettingsMigrator/app.manifest b/src/SettingsMigrator/app.manifest
deleted file mode 100644
index 9952698906..0000000000
--- a/src/SettingsMigrator/app.manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-    </application>
-  </compatibility>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
index 7b1163a717..0cc63d9aab 100644
--- a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
 {
     using System.IO;
     using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
+    using Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -16,11 +16,8 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
         {
             var migrator = new Migrator();
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+            string oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
             string oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
-            
-            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
-            File.WriteAllText(newRunsettingsPath, "");
 
             var doc = new XmlDocument();
             doc.LoadXml(OldRunSettings);
@@ -30,58 +27,90 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
 
             migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
 
-            Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
+            Validate(newRunsettingsPath);
+
+            File.Delete(oldRunsettingsPath);
+            File.Delete(newRunsettingsPath);
+        }
+
+        [TestMethod]
+        public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelativePath()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunsettings.runsettings"));
+
+            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
+            Validate(newRunsettingsPath);
+
+            File.Delete(newRunsettingsPath);
+        }
+
+        [TestMethod]
+        public void MigratorGeneratesCorrectRunsettingsWithDC()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
+
+            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
 
             using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
             {
                 reader.Namespaces = false;
-
                 var document = new XmlDocument();
                 document.Load(reader);
                 var root = document.DocumentElement;
+                var dataCollectorNode = root.SelectNodes(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+                Assert.AreEqual(2, dataCollectorNode.Count, "Data collector is missing");
+            }
 
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/WebTestRunConfiguration/Browser/Headers/Header"), "There should be a WebTestRunConfiguration node");
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings"), "There should be a LegacySettings node");
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment/DeploymentItem"), "There should be a DeploymentItem node");
-
-                var scriptNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Scripts");
-                Assert.IsNotNull(scriptNode, "There should be a WebTestRunConfiguration node");
-                Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
-                Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
-
-                var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
-                Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
-                Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"].Value, "testTimeout value does not match.");
+            File.Delete(newRunsettingsPath);
+        }
 
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution/TestDirectory"), "There should be a Assembly resolution node");
+        [TestMethod]
+        public void MigratorGeneratesCorrectRunsettingsForTestSettings()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            string oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
 
-                var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
-                Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
-                Assert.AreEqual(testSessionTimeoutNode.InnerText, "60000", "Timeout value does not match.");
+            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
 
-                var dataCollectorNode = root.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
-                Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
-                Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
-            }
+            Validate(newRunsettingsPath);
 
-            File.Delete(oldRunsettingsPath);
             File.Delete(newRunsettingsPath);
-            File.Delete(oldTestsettingsPath);
         }
 
-
         [TestMethod]
-        public void MigratorGeneratesCorrectRunsettingsForTestSettings()
+        [ExpectedException(typeof(XmlException))]
+        public void InvalidSettingsThrowsException()
         {
             var migrator = new Migrator();
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
             string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
             
-            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
+            File.WriteAllText(oldTestsettingsPath, InvalidSettings);
             File.WriteAllText(newRunsettingsPath, "");
 
             migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
 
+            File.Delete(oldTestsettingsPath);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(DirectoryNotFoundException))]
+        public void InvalidPathThrowsException()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = @"X:\generatedRunsettings.runsettings";
+            string oldTestsettingsPath = @"X:\generatedRunsettings.runsettings";
+
+            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
+        }
+
+        private static void Validate(string newRunsettingsPath)
+        {
             Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
 
             using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
@@ -101,6 +130,12 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
                 Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
                 Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
 
+                var executionNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution");
+                Assert.IsNotNull(executionNode, "There should be a Execution node");
+                Assert.AreEqual("2", executionNode.Attributes["parallelTestCount"].Value, "parallelTestCount value does not match.");
+
+                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Hosts"), "There should be a Hosts node");
+
                 var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
                 Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
                 Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"].Value, "testTimeout value does not match.");
@@ -115,41 +150,6 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
                 Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
                 Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
             }
-
-            File.Delete(newRunsettingsPath);
-            File.Delete(oldTestsettingsPath);
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(XmlException))]
-        public void InvalidSettingsThrowsException()
-        {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
-            
-            File.WriteAllText(oldTestsettingsPath, InvalidSettings);
-            File.WriteAllText(newRunsettingsPath, "");
-
-            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
-
-            File.Delete(oldTestsettingsPath);
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(DirectoryNotFoundException))]
-        public void InvalidPathThrowsException()
-        {
-            var migrator = new Migrator();
-            string newRunsettingsPath = @"X:\generatedRunsettings.runsettings";
-            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
-
-            File.WriteAllText(oldTestsettingsPath, OldTestSettings);
-            File.WriteAllText(newRunsettingsPath, "");
-
-            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
-
-            File.Delete(oldTestsettingsPath);
         }
 
         const string InvalidSettings = "<InvalidSettings>";
@@ -159,41 +159,5 @@ public void InvalidPathThrowsException()
                                     "<SettingsFile></SettingsFile>" +
                                     "</MSTest>" +
                                     "</RunSettings>";
-
-        const string OldTestSettings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-                                    "<TestSettings name=\"TestSettings1\" id=\"cfb5c9a7-f57f-42db-8006-108cdf34bee1\" xmlns=\"http://microsoft.com/schemas/VisualStudio/TeamTest/2010\">" +
-                                    "<Description>These are default test settings for a local test run.</Description>" +
-                                    "<Deployment>" +
-                                    "<DeploymentItem filename=\".\test.txt\" />" +
-                                    "</Deployment>" +
-                                    "<Scripts setupScript=\".\\setup.bat\" cleanupScript=\".\\cleanup.bat\" />" +
-                                    "<Execution hostProcessPlatform=\"MSIL\">" +
-                                    "<Timeouts runTimeout=\"60000\" testTimeout=\"120000\" />" +
-                                    "<TestTypeSpecific>" +
-                                    "<UnitTestRunConfig testTypeId=\"13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b\">" +
-                                    "<AssemblyResolution>" +
-                                    "<TestDirectory useLoadContext=\"true\" />" +
-                                    "</AssemblyResolution>" +
-                                    "</UnitTestRunConfig>" +
-                                    "<WebTestRunConfiguration testTypeId=\"4e7599fa-5ecb-43e9-a887-cd63cf72d207\">" +
-                                    "<Browser name=\"Internet Explorer 9.0\" MaxConnections=\"6\">" +
-                                    "<Headers>" +
-                                    "<Header name=\"User-Agent\" value=\"Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)\"/>" +
-                                    "<Header name=\"Accept\" value=\"*/*\" />" +
-                                    "<Header name=\"Accept-Language\" value=\"{{$IEAcceptLanguage}}\" />" +
-                                    "<Header name=\"Accept-Encoding\" value=\"GZIP\" />" +
-                                    "</Headers>" +
-                                    "</Browser>" +
-                                    "</WebTestRunConfiguration>" +
-                                    "</TestTypeSpecific>" +
-                                    "<AgentRule name=\"LocalMachineDefaultRole\">" +
-                                    "<DataCollectors>" +
-                                    "<DataCollector uri=\"datacollector://microsoft/EventLog/1.0\" assemblyQualifiedName=\"Microsoft.VisualStudio.TestTools.DataCollection.EventLog.EventLogDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.EventLog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"Event Log\">" +
-                                    "</DataCollector>" +
-                                    "</DataCollectors>" +
-                                    "</AgentRule>" +
-                                    "</Execution>" +
-                                    "<Properties/>" +
-                                    "</TestSettings>";
     }   
 }
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index 7460da6c9f..6e9aa33fb5 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -6,20 +6,18 @@
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
-    <OutputType Condition=" '$(TargetFramework)' != 'net451' ">Exe</OutputType>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFramework>net451</TargetFramework>
     <AssemblyName>SettingsMigrator.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\SettingsMigrator\SettingsMigrator.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup>
+    <Content Include="oldTestSettings.testsettings" CopyToOutputDirectory="Always" />
+	<Content Include="oldRunSettings.runsettings" CopyToOutputDirectory="Always" />
+	<Content Include="oldRunSettingsWithDataCollector.runsettings" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/test/SettingsMigrator.UnitTests/oldRunSettings.runsettings b/test/SettingsMigrator.UnitTests/oldRunSettings.runsettings
new file mode 100644
index 0000000000..510c693ede
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/oldRunSettings.runsettings
@@ -0,0 +1,6 @@
+<RunSettings>
+	<MSTest>
+		<ForcedLegacyMode>true</ForcedLegacyMode>
+		<SettingsFile>.\oldTestsettings.testsettings</SettingsFile>	
+	</MSTest>
+</RunSettings>
\ No newline at end of file
diff --git a/test/SettingsMigrator.UnitTests/oldRunSettingsWithDataCollector.runsettings b/test/SettingsMigrator.UnitTests/oldRunSettingsWithDataCollector.runsettings
new file mode 100644
index 0000000000..539396df11
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/oldRunSettingsWithDataCollector.runsettings
@@ -0,0 +1,11 @@
+<RunSettings>
+	<MSTest>
+		<ForcedLegacyMode>true</ForcedLegacyMode>
+		<SettingsFile>.\oldTestsettings.testsettings</SettingsFile>	
+	</MSTest>
+	<DataCollectionRunSettings>
+		<DataCollectors>
+			<DataCollector uri="datacollector://microsoft/MyCollector/1.0" friendlyName="MyCollector" />
+		</DataCollectors>
+	</DataCollectionRunSettings>
+</RunSettings>
\ No newline at end of file
diff --git a/test/SettingsMigrator.UnitTests/oldTestSettings.testsettings b/test/SettingsMigrator.UnitTests/oldTestSettings.testsettings
new file mode 100644
index 0000000000..f83a5d86f0
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/oldTestSettings.testsettings
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="TestSettings1" id="2ac9d667-ce4a-4a9b-a1ca-4f82847322cc" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Deployment>
+    <DeploymentItem filename=".\test.txt" />
+  </Deployment>
+  <Scripts setupScript=".\setup.bat" cleanupScript=".\cleanup.bat" />
+  <Execution parallelTestCount="2" hostProcessPlatform="MSIL">
+    <Hosts skipUnhostableTests="false" />
+    <Timeouts runTimeout="60000" testTimeout="120000" />
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution applicationBaseDirectory="E:\">
+          <TestDirectory useLoadContext="true" />
+          <RuntimeResolution>
+            <Directory path="E:\adapter" includeSubDirectories="true" />
+          </RuntimeResolution>
+          <DiscoveryResolution>
+            <Directory path="E:\adapters" includeSubDirectories="true" />
+          </DiscoveryResolution>
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+      <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
+        <Browser name="Internet Explorer 9.0" MaxConnections="6">
+          <Headers>
+            <Header name="User-Agent" value="Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" />
+            <Header name="Accept" value="*/*" />
+            <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
+            <Header name="Accept-Encoding" value="GZIP" />
+          </Headers>
+        </Browser>
+      </WebTestRunConfiguration>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+      <DataCollectors>
+        <DataCollector uri="datacollector://microsoft/EventLog/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.EventLog.EventLogDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.EventLog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Event Log">
+        </DataCollector>
+      </DataCollectors>
+    </AgentRule>
+  </Execution>
+  <Properties />
+</TestSettings>
\ No newline at end of file

From acce98bcd3b3032a17dcba1d6a434fb5fc03a2fd Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 13:43:27 +0530
Subject: [PATCH 09/21] Resx changes

---
 .../Resources/Resources.Designer.cs           | 100 +++++++-----------
 .../Resources/xlf/Resources.cs.xlf            |  28 ++++-
 .../Resources/xlf/Resources.de.xlf            |  28 ++++-
 .../Resources/xlf/Resources.es.xlf            |  28 ++++-
 .../Resources/xlf/Resources.fr.xlf            |  28 ++++-
 .../Resources/xlf/Resources.it.xlf            |  28 ++++-
 .../Resources/xlf/Resources.ja.xlf            |  28 ++++-
 .../Resources/xlf/Resources.ko.xlf            |  28 ++++-
 .../Resources/xlf/Resources.pl.xlf            |  28 ++++-
 .../Resources/xlf/Resources.pt-BR.xlf         |  28 ++++-
 .../Resources/xlf/Resources.ru.xlf            |  28 ++++-
 .../Resources/xlf/Resources.tr.xlf            |  28 ++++-
 .../Resources/xlf/Resources.xlf               |  28 ++++-
 .../Resources/xlf/Resources.zh-Hans.xlf       |  28 ++++-
 .../Resources/xlf/Resources.zh-Hant.xlf       |  28 ++++-
 15 files changed, 405 insertions(+), 87 deletions(-)

diff --git a/src/SettingsMigrator/Resources/Resources.Designer.cs b/src/SettingsMigrator/Resources/Resources.Designer.cs
index 8636032416..897ea5ce35 100644
--- a/src/SettingsMigrator/Resources/Resources.Designer.cs
+++ b/src/SettingsMigrator/Resources/Resources.Designer.cs
@@ -8,12 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources
-{
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources {
     using System;
-    using System.Reflection;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -21,107 +19,91 @@ namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if (object.ReferenceEquals(resourceMan, null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SettingsMigrator.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly);
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SettingsMigrator.Resources.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to Any LegacySettings node already present in the runsettings will be removed.
+        ///   Looks up a localized string similar to Any LegacySettings node already present in the runsettings will be removed..
         /// </summary>
-        public static string IgnoringLegacySettings
-        {
-            get
-            {
+        internal static string IgnoringLegacySettings {
+            get {
                 return ResourceManager.GetString("IgnoringLegacySettings", resourceCulture);
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to RunSettings does not contain an embedded testSettings, not migrating.
+        ///   Looks up a localized string similar to RunSettings does not contain an embedded testSettings, not migrating..
         /// </summary>
-        public static string NoEmbeddedSettings
-        {
-            get
-            {
+        internal static string NoEmbeddedSettings {
+            get {
                 return ResourceManager.GetString("NoEmbeddedSettings", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The migrated RunSettings file has been created at
+        ///   Looks up a localized string similar to The migrated RunSettings file has been created at: {0}.
         /// </summary>
-        public static string RunSettingsCreated
-        {
-            get
-            {
+        internal static string RunSettingsCreated {
+            get {
                 return ResourceManager.GetString("RunSettingsCreated", resourceCulture);
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to Valid usage: SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to new runsettings file>
+        ///   Looks up a localized string similar to The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated..
         /// </summary>
-        public static string ValidUsage
-        {
-            get
-            {
-                return ResourceManager.GetString("ValidUsage", resourceCulture);
+        internal static string UnsupportedAttributes {
+            get {
+                return ResourceManager.GetString("UnsupportedAttributes", resourceCulture);
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.
+        ///   Looks up a localized string similar to Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+        ///Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+        ///Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings.
         /// </summary>
-        public static string UnsupportedAttributes
-        {
-            get
-            {
-                return ResourceManager.GetString("UnsupportedAttributes", resourceCulture);
+        internal static string ValidUsage {
+            get {
+                return ResourceManager.GetString("ValidUsage", resourceCulture);
             }
         }
     }
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
index 87ee60c31a..956a3628fc 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
index 2bd4739a2a..bb1ff9e3d7 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
index aa2a558675..4f2245342a 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
index 5506da0d0f..b155439a7b 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
index f2c6c4ac53..4632917471 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
index 92644a4650..53917518dd 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
index a804409b81..76ea470e28 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
index 02e8d2fbfa..c452c3659b 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
index ab2206c4af..78edb18fac 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
index cb823c7d77..f8496645f4 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
index 92e7e3cfa8..7d63f8fda0 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.xlf b/src/SettingsMigrator/Resources/xlf/Resources.xlf
index 0a59b0c85c..830e5a8fb8 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.xlf
@@ -2,9 +2,33 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" original="../Resources.resx">
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
index 375d9b98ab..899099fdbe 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
index 5d78eef487..6fea6ce0c8 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
@@ -20,9 +20,33 @@
       </count-group>
     </header>
     <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="new">The migrated RunSettings file has been created at: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
+        <note></note>
+      </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</source>
-        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;</target>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
         <note></note>
       </trans-unit>
     </body>

From 3aaa2fb110de9f665271ce850c11f9c6674fd668 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 17:40:14 +0530
Subject: [PATCH 10/21] PR comments

---
 src/SettingsMigrator/App.config               |  6 --
 src/SettingsMigrator/Migrator.cs              | 53 +++++++++++++++++-
 src/SettingsMigrator/Program.cs               | 31 ++---------
 src/SettingsMigrator/Resources/Resources.resx |  8 +--
 .../Resources/xlf/Resources.cs.xlf            |  8 +--
 .../Resources/xlf/Resources.de.xlf            |  8 +--
 .../Resources/xlf/Resources.es.xlf            |  8 +--
 .../Resources/xlf/Resources.fr.xlf            |  8 +--
 .../Resources/xlf/Resources.it.xlf            |  8 +--
 .../Resources/xlf/Resources.ja.xlf            |  8 +--
 .../Resources/xlf/Resources.ko.xlf            |  8 +--
 .../Resources/xlf/Resources.pl.xlf            |  8 +--
 .../Resources/xlf/Resources.pt-BR.xlf         |  8 +--
 .../Resources/xlf/Resources.ru.xlf            |  8 +--
 .../Resources/xlf/Resources.tr.xlf            |  8 +--
 .../Resources/xlf/Resources.xlf               |  8 +--
 .../Resources/xlf/Resources.zh-Hans.xlf       |  8 +--
 .../Resources/xlf/Resources.zh-Hant.xlf       |  8 +--
 ...{MigratorUnitTests.cs => MigratorTests.cs} | 55 ++++++++++++-------
 .../ProgramTests.cs                           | 21 +++++++
 .../SettingsMigrator.UnitTests.csproj         |  8 +--
 ...nSettingsWithEmbeddedSettings.runsettings} |  0
 22 files changed, 177 insertions(+), 117 deletions(-)
 delete mode 100644 src/SettingsMigrator/App.config
 rename test/SettingsMigrator.UnitTests/{MigratorUnitTests.cs => MigratorTests.cs} (82%)
 create mode 100644 test/SettingsMigrator.UnitTests/ProgramTests.cs
 rename test/SettingsMigrator.UnitTests/{oldRunSettings.runsettings => oldRunSettingsWithEmbeddedSettings.runsettings} (100%)

diff --git a/src/SettingsMigrator/App.config b/src/SettingsMigrator/App.config
deleted file mode 100644
index 731f6de6c2..0000000000
--- a/src/SettingsMigrator/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index edce5b7eb6..50bcd94f39 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -22,6 +22,10 @@ public class Migrator
 
         private const string LegacySettingsNodeName = "LegacySettings";
 
+        private const string MSTestNodeName = "MSTest";
+
+        private const string ForcedLegacyModeName = "ForcedLegacyMode";
+
         private const string ExecutionNodeName = "Execution";
 
         private const string TimeoutsNodeName = "Timeouts";
@@ -45,12 +49,37 @@ public class Migrator
 
         private const string ScriptTimeoutAttribute = "scriptTimeout";
 
+        private const string TestSettingsExtension = ".testsettings";
+
+        private const string RunSettingsExtension = ".runsettings";
+
+        public void Migrate(string oldFilePath, string newFilePath)
+        {
+            if (!Path.IsPathRooted(oldFilePath))
+            {
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
+            }
+
+            if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension))
+            {
+                this.MigrateTestSettings(oldFilePath, newFilePath);
+            }
+            else if (string.Equals(Path.GetExtension(oldFilePath), RunSettingsExtension))
+            {
+                this.MigrateRunSettings(oldFilePath, newFilePath);
+            }
+            else
+            {
+                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
+            }
+        }
+
         /// <summary>
         /// Given a runSettings with an embedded testSettings, converts it to runSettings.
         /// </summary>
         /// <param name="oldRunSettingsPath"> Path to old runsettings.</param>
         /// <param name="newRunSettingsPath">Path to new runsettings.</param>
-        public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
+        private void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
         {
             string testSettingsPath = null;
             using (XmlTextReader reader = new XmlTextReader(oldRunSettingsPath))
@@ -96,7 +125,7 @@ public void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsP
         /// </summary>
         /// <param name="oldTestSettingsPath">Path to old testsettings.</param>
         /// <param name="newRunSettingsPath">Path to new runsettings.</param>
-        public void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
+        private void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
         {
             var runSettingsXmlDoc = new XmlDocument();
             runSettingsXmlDoc.LoadXml(SampleRunSettingsContent);
@@ -216,6 +245,26 @@ private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTime
                 return;
             }
 
+            // Add ForcedLegacy node.
+            var mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
+            XmlNode forcedLegacyNode;
+            if (mstestNode == null)
+            {
+                mstestNode = newXmlDoc.CreateNode(XmlNodeType.Element, MSTestNodeName, null);
+                newXmlDoc.DocumentElement.AppendChild(mstestNode);
+                mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
+            }
+
+            forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
+            if (forcedLegacyNode == null)
+            {
+                forcedLegacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, ForcedLegacyModeName, null);
+                mstestNode.AppendChild(newXmlDoc.ImportNode(forcedLegacyNode, deep: true));
+                forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
+            }
+
+            forcedLegacyNode.InnerText = "true";
+
             // Remove if the legacy node already exists.
             var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
             if (legacyNode != null)
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
index 21f4359702..613b196a2b 100644
--- a/src/SettingsMigrator/Program.cs
+++ b/src/SettingsMigrator/Program.cs
@@ -15,46 +15,27 @@ public static class Program
     {
         private const string RunSettingsExtension = ".runsettings";
 
-        private const string TestSettingsExtension = ".testsettings";
-
         /// <summary>
         /// Main entry point. Hands off execution to Migrator.
         /// </summary>
-        /// <param name="args">Arguments provided on the command line.</param>
-        public static void Main(string[] args)
+        /// <param name="args">Arguments on the commandline</param>
+        /// <returns>Exit code</returns>
+        public static int Main(string[] args)
         {
             if (args.Length != 1)
             {
                 Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-                return;
+                return 1;
             }
 
             string oldFilePath = args[0];
-
-            if (!Path.IsPathRooted(oldFilePath))
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-                return;
-            }
-
             var newFileName = string.Concat(Guid.NewGuid().ToString(), RunSettingsExtension);
             string newFilePath = Path.Combine(Path.GetDirectoryName(oldFilePath), newFileName);
 
             var migrator = new Migrator();
+            migrator.Migrate(oldFilePath, newFilePath);
 
-            if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension))
-            {
-                migrator.MigrateTestSettings(oldFilePath, newFilePath);
-            }
-            else if (string.Equals(Path.GetExtension(oldFilePath), RunSettingsExtension))
-            {
-                migrator.MigrateRunSettings(oldFilePath, newFilePath);
-            }
-            else
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-                return;
-            }
+            return 0;
         }
     }
 }
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/Resources.resx b/src/SettingsMigrator/Resources/Resources.resx
index 64f19199cf..f0a8f58abb 100644
--- a/src/SettingsMigrator/Resources/Resources.resx
+++ b/src/SettingsMigrator/Resources/Resources.resx
@@ -127,11 +127,11 @@
     <value>The migrated RunSettings file has been created at: {0}</value>
   </data>
   <data name="UnsupportedAttributes" xml:space="preserve">
-    <value>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</value>
+    <value>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</value>
   </data>
   <data name="ValidUsage" xml:space="preserve">
-    <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</value>
+    <value>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
index 956a3628fc..0bced29b92 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
index bb1ff9e3d7..70ea25c890 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
index 4f2245342a..08353aa034 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
index b155439a7b..26c3ee6292 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
index 4632917471..fe8fef440d 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
index 53917518dd..6c7ea4bf95 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
index 76ea470e28..ecd43596b7 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
index c452c3659b..4bf5e47a33 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
index 78edb18fac..3a21422cda 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
index f8496645f4..579d7911ca 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
index 7d63f8fda0..ff16900c9e 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.xlf b/src/SettingsMigrator/Resources/xlf/Resources.xlf
index 830e5a8fb8..f14ebefd57 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.xlf
@@ -18,14 +18,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
index 899099fdbe..d769555315 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
index 6fea6ce0c8..09327abc38 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
@@ -36,14 +36,14 @@
         <note></note>
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</source>
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ValidUsage">
-        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
-Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
-Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</source>
+        <source>Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings 
+Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings</source>
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
diff --git a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
similarity index 82%
rename from test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
rename to test/SettingsMigrator.UnitTests/MigratorTests.cs
index 0cc63d9aab..9f23ceace8 100644
--- a/test/SettingsMigrator.UnitTests/MigratorUnitTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -9,8 +9,27 @@ namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
-    public class MigratorUnitTests
+    public class MigratorTests
     {
+        private const string InvalidSettings = "<InvalidSettings>";
+
+        private const string OldRunSettings = "<RunSettings>" +
+                                    "<MSTest>" +
+                                    "<ForcedLegacyMode>true</ForcedLegacyMode>" +
+                                    "<SettingsFile></SettingsFile>" +
+                                    "</MSTest>" +
+                                    "</RunSettings>";
+
+        [TestMethod]
+        public void NonRootedPathIsNotMigrator()
+        {
+            var migrator = new Migrator();
+            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            migrator.Migrate("asda", newRunsettingsPath);
+
+            Assert.IsFalse(File.Exists(newRunsettingsPath), "Run settings should not be generated.");
+        }
+
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
         {
@@ -25,7 +44,7 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
                 settingsnode.InnerText = oldTestsettingsPath;
             File.WriteAllText(oldRunsettingsPath, doc.InnerXml);
 
-            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
 
             Validate(newRunsettingsPath);
 
@@ -38,9 +57,9 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelative
         {
             var migrator = new Migrator();
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunsettings.runsettings"));
+            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithEmbeddedSettings.runsettings"));
 
-            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
             Validate(newRunsettingsPath);
 
             File.Delete(newRunsettingsPath);
@@ -53,7 +72,7 @@ public void MigratorGeneratesCorrectRunsettingsWithDC()
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
             string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
 
-            migrator.MigrateRunSettings(oldRunsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
 
             using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
             {
@@ -75,7 +94,7 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
             string oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
 
-            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
 
             Validate(newRunsettingsPath);
 
@@ -89,11 +108,11 @@ public void InvalidSettingsThrowsException()
             var migrator = new Migrator();
             string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
             string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
-            
+
             File.WriteAllText(oldTestsettingsPath, InvalidSettings);
-            File.WriteAllText(newRunsettingsPath, "");
+            File.WriteAllText(newRunsettingsPath, string.Empty);
 
-            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
 
             File.Delete(oldTestsettingsPath);
         }
@@ -106,7 +125,7 @@ public void InvalidPathThrowsException()
             string newRunsettingsPath = @"X:\generatedRunsettings.runsettings";
             string oldTestsettingsPath = @"X:\generatedRunsettings.runsettings";
 
-            migrator.MigrateTestSettings(oldTestsettingsPath, newRunsettingsPath);
+            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
         }
 
         private static void Validate(string newRunsettingsPath)
@@ -130,7 +149,11 @@ private static void Validate(string newRunsettingsPath)
                 Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
                 Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
 
-                var executionNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution");
+                var forcedLegacyNode = root.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
+                Assert.IsNotNull(forcedLegacyNode, "ForcedLegacy node should be present");
+                Assert.AreEqual("true", forcedLegacyNode.InnerText, "Forced legacy should be true");
+
+                var executionNode = root.SelectSingleNode(@" / RunSettings/LegacySettings/Execution");
                 Assert.IsNotNull(executionNode, "There should be a Execution node");
                 Assert.AreEqual("2", executionNode.Attributes["parallelTestCount"].Value, "parallelTestCount value does not match.");
 
@@ -151,13 +174,5 @@ private static void Validate(string newRunsettingsPath)
                 Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
             }
         }
-
-        const string InvalidSettings = "<InvalidSettings>";
-        const string OldRunSettings = "<RunSettings>" +
-                                    "<MSTest>" +
-                                    "<ForcedLegacyMode>true</ForcedLegacyMode>" +
-                                    "<SettingsFile></SettingsFile>" +
-                                    "</MSTest>" +
-                                    "</RunSettings>";
-    }   
+    }
 }
diff --git a/test/SettingsMigrator.UnitTests/ProgramTests.cs b/test/SettingsMigrator.UnitTests/ProgramTests.cs
new file mode 100644
index 0000000000..f71bb971f9
--- /dev/null
+++ b/test/SettingsMigrator.UnitTests/ProgramTests.cs
@@ -0,0 +1,21 @@
+// Copyright(c) Microsoft Corporation.All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
+{
+    using System.IO;
+    using System.Xml;
+    using Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class ProgramTests
+    {
+        [TestMethod]
+        public void OnlyOneArgumentShouldBeAccepted()
+        {
+            int returnCode = Program.Main(new string[] { "asd", "asd" });
+            Assert.AreEqual(1, returnCode, "Only one argument should be accepted.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index 6e9aa33fb5..376dbe0e01 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -7,6 +7,8 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
     <TargetFramework>net451</TargetFramework>
+	<WarningsAsErrors>true</WarningsAsErrors>
+    <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <AssemblyName>SettingsMigrator.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -14,15 +16,13 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="oldTestSettings.testsettings" CopyToOutputDirectory="Always" />
-	<Content Include="oldRunSettings.runsettings" CopyToOutputDirectory="Always" />
+	<Content Include="oldRunSettingsWithEmbeddedSettings.runsettings" CopyToOutputDirectory="Always" />
 	<Content Include="oldRunSettingsWithDataCollector.runsettings" CopyToOutputDirectory="Always" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Runtime" />
     <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
+    <!-- <Reference Include="Microsoft.CSharp" /> -->
     <Reference Include="System.Xml" />
-    <Reference Include=" System.Runtime.Serialization" />
   </ItemGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/SettingsMigrator.UnitTests/oldRunSettings.runsettings b/test/SettingsMigrator.UnitTests/oldRunSettingsWithEmbeddedSettings.runsettings
similarity index 100%
rename from test/SettingsMigrator.UnitTests/oldRunSettings.runsettings
rename to test/SettingsMigrator.UnitTests/oldRunSettingsWithEmbeddedSettings.runsettings

From 645273c1525dac9ff66b0b91c165428de78e3cde Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 17:46:39 +0530
Subject: [PATCH 11/21] Comments

---
 src/SettingsMigrator/Migrator.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index 50bcd94f39..4f0cf6d364 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -53,6 +53,11 @@ public class Migrator
 
         private const string RunSettingsExtension = ".runsettings";
 
+        /// <summary>
+        /// Migrates the nodes from given settings to run settings format.
+        /// </summary>
+        /// <param name="oldFilePath">Path to old file</param>
+        /// <param name="newFilePath">Path to new file</param>
         public void Migrate(string oldFilePath, string newFilePath)
         {
             if (!Path.IsPathRooted(oldFilePath))

From 09226c51b98126a2f455c05417fc04757f7fd333 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 18:19:22 +0530
Subject: [PATCH 12/21] PR comments

---
 .../MigratorTests.cs                          | 85 +++++++++----------
 .../SettingsMigrator.UnitTests.csproj         |  1 -
 2 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/test/SettingsMigrator.UnitTests/MigratorTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
index 9f23ceace8..36c34283f0 100644
--- a/test/SettingsMigrator.UnitTests/MigratorTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -20,61 +20,66 @@ public class MigratorTests
                                     "</MSTest>" +
                                     "</RunSettings>";
 
+        private Migrator migrator;
+        private string newRunsettingsPath;
+        private string oldTestsettingsPath;
+        private string oldRunsettingsPath;
+
+        [TestInitialize]
+        public void TestInit()
+        {
+            this.migrator = new Migrator();
+            this.newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+            this.oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
+            this.oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
+        }
+
         [TestMethod]
         public void NonRootedPathIsNotMigrator()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            migrator.Migrate("asda", newRunsettingsPath);
+            this.migrator.Migrate("asda", this.newRunsettingsPath);
 
-            Assert.IsFalse(File.Exists(newRunsettingsPath), "Run settings should not be generated.");
+            Assert.IsFalse(File.Exists(this.newRunsettingsPath), "Run settings should not be generated.");
         }
 
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
-            string oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
+            this.oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
 
             var doc = new XmlDocument();
             doc.LoadXml(OldRunSettings);
             var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-                settingsnode.InnerText = oldTestsettingsPath;
-            File.WriteAllText(oldRunsettingsPath, doc.InnerXml);
+                settingsnode.InnerText = this.oldTestsettingsPath;
+            File.WriteAllText(this.oldRunsettingsPath, doc.InnerXml);
 
-            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
+            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
 
-            Validate(newRunsettingsPath);
+            Validate(this.newRunsettingsPath);
 
-            File.Delete(oldRunsettingsPath);
-            File.Delete(newRunsettingsPath);
+            File.Delete(this.oldRunsettingsPath);
+            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelativePath()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithEmbeddedSettings.runsettings"));
+            this.oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithEmbeddedSettings.runsettings"));
 
-            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
-            Validate(newRunsettingsPath);
+            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
+            Validate(this.newRunsettingsPath);
 
-            File.Delete(newRunsettingsPath);
+            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsWithDC()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
+            this.oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
 
-            migrator.Migrate(oldRunsettingsPath, newRunsettingsPath);
+            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
 
-            using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
+            using (XmlTextReader reader = new XmlTextReader(this.newRunsettingsPath))
             {
                 reader.Namespaces = false;
                 var document = new XmlDocument();
@@ -84,48 +89,40 @@ public void MigratorGeneratesCorrectRunsettingsWithDC()
                 Assert.AreEqual(2, dataCollectorNode.Count, "Data collector is missing");
             }
 
-            File.Delete(newRunsettingsPath);
+            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsForTestSettings()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
-
-            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
+            this.migrator.Migrate(this.oldTestsettingsPath, this.newRunsettingsPath);
 
-            Validate(newRunsettingsPath);
+            Validate(this.newRunsettingsPath);
 
-            File.Delete(newRunsettingsPath);
+            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
         [ExpectedException(typeof(XmlException))]
         public void InvalidSettingsThrowsException()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            string oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+            this.oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
 
-            File.WriteAllText(oldTestsettingsPath, InvalidSettings);
-            File.WriteAllText(newRunsettingsPath, string.Empty);
+            File.WriteAllText(this.oldTestsettingsPath, InvalidSettings);
+            File.WriteAllText(this.newRunsettingsPath, string.Empty);
 
-            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
+            this.migrator.Migrate(this.oldTestsettingsPath, this.newRunsettingsPath);
 
-            File.Delete(oldTestsettingsPath);
+            File.Delete(this.oldTestsettingsPath);
         }
 
         [TestMethod]
         [ExpectedException(typeof(DirectoryNotFoundException))]
         public void InvalidPathThrowsException()
         {
-            var migrator = new Migrator();
-            string newRunsettingsPath = @"X:\generatedRunsettings.runsettings";
-            string oldTestsettingsPath = @"X:\generatedRunsettings.runsettings";
+            string oldTestsettingsPath = @"X:\generatedRun,settings.runsettings";
 
-            migrator.Migrate(oldTestsettingsPath, newRunsettingsPath);
+            this.migrator.Migrate(oldTestsettingsPath, this.newRunsettingsPath);
         }
 
         private static void Validate(string newRunsettingsPath)
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index 376dbe0e01..cee2d51b13 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -21,7 +21,6 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <!-- <Reference Include="Microsoft.CSharp" /> -->
     <Reference Include="System.Xml" />
   </ItemGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />

From 4c5d7c38fb0a94b98fb097ec08a96f49d0e47cec Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Fri, 18 May 2018 18:20:48 +0530
Subject: [PATCH 13/21] Fix

---
 test/SettingsMigrator.UnitTests/MigratorTests.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/SettingsMigrator.UnitTests/MigratorTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
index 36c34283f0..ce0cf95b19 100644
--- a/test/SettingsMigrator.UnitTests/MigratorTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -45,8 +45,6 @@ public void NonRootedPathIsNotMigrator()
         [TestMethod]
         public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
         {
-            this.oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
-
             var doc = new XmlDocument();
             doc.LoadXml(OldRunSettings);
             var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");

From 67f2cd38c1881b5255093bd544b7115a7c85a014 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 13:54:18 +0530
Subject: [PATCH 14/21] Signproj

---
 src/package/sign/sign.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj
index 23070a4bc5..989f1e2235 100644
--- a/src/package/sign/sign.proj
+++ b/src/package/sign/sign.proj
@@ -170,6 +170,7 @@
       <AssembliesToSign Include="$(ArtifactsDirectory)vstest.console.exe" />
       <AssembliesToSign Include="$(ArtifactsDirectory)testhost.exe" />
       <AssembliesToSign Include="$(ArtifactsDirectory)testhost.x86.exe" />
+	  <AssembliesToSign Include="$(ArtifactsDirectory)SettingsMigrator.exe" />
 
       <!-- NetFullExtensions -->
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />

From 07a5ba7c1e007cf1bde59f4570f9a8a4bf8f95d2 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 14:17:44 +0530
Subject: [PATCH 15/21] Required reference

---
 .../SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index cee2d51b13..e307621240 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.RunTime" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />

From e38c75b9cacde0bcbcff9a4cd480118e3636c332 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 14:44:37 +0530
Subject: [PATCH 16/21] Nuspec update

---
 src/package/nuspec/Microsoft.TestPlatform.nuspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index 8b20197e93..3546ef9cf8 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -175,7 +175,6 @@
     <file src="net451\$Runtime$\vstest.console.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
     <file src="net451\$Runtime$\vstest.console.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
     <file src="net451\$Runtime$\SettingsMigrator.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
-    <file src="net451\$Runtime$\SettingsMigrator.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe.config" />
     <file src="net451\$Runtime$\VsWebSite.Interop.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\VsWebSite.Interop.dll" />
     <file src="net451\$Runtime$\Webloadtest.testtype"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Webloadtest.testtype" />
     <file src="net451\$Runtime$\CoreCon\VisualStudioDatastoreConfigurationProvider.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CoreCon\VisualStudioDatastoreConfigurationProvider.dll" />

From c7ce3c41918794f2d391adab732afacb4e22cdcd Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 15:56:39 +0530
Subject: [PATCH 17/21] References

---
 .../SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index e307621240..329aa260ff 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -22,6 +22,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.RunTime" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />

From fc16f53be93456a8565939e0c070e3e947f9bd51 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 17:05:14 +0530
Subject: [PATCH 18/21] Fix reference

---
 .../SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index 329aa260ff..aa9868f2fc 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.RunTime" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />

From 204fa47b8c16fa5de4670f32b180947d807fc6e0 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Mon, 21 May 2018 17:55:21 +0530
Subject: [PATCH 19/21] Fix references

---
 .../SettingsMigrator.UnitTests.csproj                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index aa9868f2fc..038ae2f4be 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.RunTime" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
   </ItemGroup>

From b31a07a9e9c27ae0c9f654155402645b9719ee11 Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Wed, 23 May 2018 11:38:24 +0530
Subject: [PATCH 20/21] Refactor

---
 .../MigratorTests.cs                           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/SettingsMigrator.UnitTests/MigratorTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
index ce0cf95b19..c57cbb7ed1 100644
--- a/test/SettingsMigrator.UnitTests/MigratorTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -34,8 +34,17 @@ public void TestInit()
             this.oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
         }
 
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            if (File.Exists(this.newRunsettingsPath))
+            {
+                File.Delete(this.newRunsettingsPath);
+            }
+        }
+
         [TestMethod]
-        public void NonRootedPathIsNotMigrator()
+        public void NonRootedPathIsNotMigrated()
         {
             this.migrator.Migrate("asda", this.newRunsettingsPath);
 
@@ -56,7 +65,6 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
             Validate(this.newRunsettingsPath);
 
             File.Delete(this.oldRunsettingsPath);
-            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
@@ -66,8 +74,6 @@ public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelative
 
             this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
             Validate(this.newRunsettingsPath);
-
-            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
@@ -86,8 +92,6 @@ public void MigratorGeneratesCorrectRunsettingsWithDC()
                 var dataCollectorNode = root.SelectNodes(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
                 Assert.AreEqual(2, dataCollectorNode.Count, "Data collector is missing");
             }
-
-            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]
@@ -96,8 +100,6 @@ public void MigratorGeneratesCorrectRunsettingsForTestSettings()
             this.migrator.Migrate(this.oldTestsettingsPath, this.newRunsettingsPath);
 
             Validate(this.newRunsettingsPath);
-
-            File.Delete(this.newRunsettingsPath);
         }
 
         [TestMethod]

From 5d6715215dc3f98c8e8ac5a67e505750cc8364af Mon Sep 17 00:00:00 2001
From: Kavipriya Adhinarayanan <kaadhina@microsoft.com>
Date: Wed, 23 May 2018 15:27:34 +0530
Subject: [PATCH 21/21] Fixing file count

---
 scripts/verify-nupkgs.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 446bac4ff0..75199580bc 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory)
     Write-Log "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{"Microsoft.CodeCoverage" = 28;
                      "Microsoft.NET.Test.Sdk" = 10;
-                     "Microsoft.TestPlatform" = 406;
+                     "Microsoft.TestPlatform" = 420;
                      "Microsoft.TestPlatform.Build" = 19;
                      "Microsoft.TestPlatform.CLI" = 302;
                      "Microsoft.TestPlatform.ObjectModel" = 65;