From 348fe083cfbc3dcbd263a191a07b0bfcd1e14360 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Mon, 29 Jul 2019 16:04:36 +0530
Subject: [PATCH 01/20] First draft for the Html Logger.

---
 TestPlatform.sln                              |  34 +-
 .../Friends.cs                                |  10 +
 .../Html.xslt                                 | 257 ++++++++++
 .../HtmlLogger.cs                             | 239 +++++++++
 .../HtmlTransformer.cs                        |  25 +
 .../IHtmlTransformer.cs                       |  18 +
 ....TestPlatform.Extensions.HtmlLogger.csproj |  56 +++
 .../Resources.Designer.cs                     |  84 ++++
 .../Resources.resx                            | 124 +++++
 .../TestResults.cs                            |  56 +++
 .../TestRunSummary.cs                         |  10 +
 .../Testresult.cs                             |  29 ++
 .../Utility/Constants.cs                      |  33 ++
 .../converter.cs                              |  38 ++
 .../html.html                                 |  58 +++
 .../sample.xml                                |   2 +
 .../HtmlLoggerTests.cs                        | 473 ++++++++++++++++++
 ...orm.Extensions.HtmlLogger.UnitTests.csproj |  26 +
 18 files changed, 1570 insertions(+), 2 deletions(-)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
 create mode 100644 test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
 create mode 100644 test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj

diff --git a/TestPlatform.sln b/TestPlatform.sln
index 4db14778e0..fb47dab9d9 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29025.244
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.779
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
 EndProject
@@ -172,6 +172,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator.UnitTests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscoveryTestProject", "test\TestAssets\DiscoveryTestProject\DiscoveryTestProject.csproj", "{D16ACC60-52F8-4912-8870-5733A9F6852D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.HtmlLogger", "src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj", "{236A71E3-01DA-4679-9DFF-16A8E079ACFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests", "test\Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests\Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj", "{41248B96-6E15-4E5E-A78F-859897676814}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -866,6 +870,30 @@ Global
 		{D16ACC60-52F8-4912-8870-5733A9F6852D}.Release|x64.Build.0 = Release|Any CPU
 		{D16ACC60-52F8-4912-8870-5733A9F6852D}.Release|x86.ActiveCfg = Release|Any CPU
 		{D16ACC60-52F8-4912-8870-5733A9F6852D}.Release|x86.Build.0 = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.Build.0 = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.Build.0 = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x64.Build.0 = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x86.Build.0 = Debug|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x64.ActiveCfg = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x64.Build.0 = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x86.ActiveCfg = Release|Any CPU
+		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -940,6 +968,8 @@ Global
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{D16ACC60-52F8-4912-8870-5733A9F6852D} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
+		{236A71E3-01DA-4679-9DFF-16A8E079ACFF} = {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}
+		{41248B96-6E15-4E5E-A78F-859897676814} = {020E15EA-731F-4667-95AF-226671E0C3AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
new file mode 100644
index 0000000000..b110313624
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
@@ -0,0 +1,10 @@
+// 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.Runtime.CompilerServices;
+
+#region Test Assemblies
+
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+#endregion
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
new file mode 100644
index 0000000000..93e82624a4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="2.0"
+    
+                xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"
+>
+  <xsl:output method="html" indent="yes"/>
+  <xsl:template match="/">
+    <html>
+      <body>
+        <h1>TestResults</h1>
+        <xsl:apply-templates select ="/tp:TestResults"/>
+      </body>
+      <script language="javascript">
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      </script>
+      <style>
+        #testtable {
+        border-collapse: collapse;
+        }
+
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+      </style>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="/tp:TestResults">
+    <h2>Summary</h2>
+
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
+
+    <h2>Results</h2>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
+
+  </xsl:template>
+
+  <xsl:template match="/tp:TestResults/tp:Results">
+    <h3>TestResult</h3>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/>
+  </xsl:template>
+
+  <xsl:template match="tp:TestResults/tp:Summary">
+    <!--<table id="testtable">
+      <tr>
+        <th>Total Tests</th>
+        <th>Failed Tests</th>
+        <th>Passed Tests</th>
+      </tr>
+      <tr>
+        <td>
+          <xsl:value-of select="tp:TotalTests"/>
+        </td>
+        <td>
+          <xsl:value-of select="tp:FailedTests"/>
+        </td>
+        <td>
+          <xsl:value-of select="tp:PassedTests"/>
+        </td>
+      </tr>
+     
+    </table>-->
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
+
+  </xsl:template>
+
+
+
+
+
+
+  <xsl:template match="tp:TestResult">
+    <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
+
+      <div>
+
+        <xsl:apply-templates select = "tp:resultOutcome" />
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+        <div  style="float:right;">
+          <xsl:apply-templates select = "tp:Duration" />
+        </div>
+
+      </div>
+
+
+      <!--<div style="width:60%;">
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+      </div>-->
+
+      <!--<xsl:apply-templates select = "tp:DisplayName" />-->
+      <xsl:if test ="tp:ErrorMessage!=''">
+        <xsl:apply-templates select = "tp:ErrorMessage" />
+      </xsl:if>
+      <xsl:if test ="tp:ErrorStackTrace!=''">
+        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+      </xsl:if>
+
+
+      <xsl:if test ="tp:innerTestResults!=''">
+        <a Id="{generate-id()}" style="display:none;">
+          <h3>innerTestResults:</h3>
+          <xsl:apply-templates select = "tp:innerTestResults" />
+        </a>
+        <!--<br/>-->
+      </xsl:if>
+      <br />
+    </div>
+  </xsl:template>
+
+
+  <xsl:template match="tp:innerTestResults/tp:TestResult">
+    <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
+
+      <div>
+
+        <xsl:apply-templates select = "tp:resultOutcome" />
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+        <div  style="float:right;">
+          <xsl:apply-templates select = "tp:Duration" />
+        </div>
+
+      </div>
+
+
+      <!--<div style="width:60%;">
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+      </div>-->
+
+      <!--<xsl:apply-templates select = "tp:DisplayName" />-->
+      <xsl:if test ="tp:ErrorMessage!=''">
+        <xsl:apply-templates select = "tp:ErrorMessage" />
+      </xsl:if>
+      <xsl:if test ="tp:ErrorStackTrace!=''">
+        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+      </xsl:if>
+
+
+      <xsl:if test ="tp:innerTestResults!=''">
+        <a Id="{generate-id()}" style="display:none;">
+          <h3>innerTestResults:</h3>
+          <xsl:apply-templates select = "tp:innerTestResults" />
+        </a>
+        <!--<br/>-->
+      </xsl:if>
+      <br />
+    </div>
+  </xsl:template>
+
+
+  <xsl:template match = "tp:ErrorMessage">
+    ErrorMessage: <span style = "color:brown;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:ErrorStackTrace">
+    ErrorStackTrace: <span style = "color:brown;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:FailedTests">
+    <span style = "width:10%">
+      FailedTests:
+    </span>
+    <span style = "color:brown;padding-right:10px;">
+      <xsl:value-of select = "." />
+    </span>
+
+    <br />
+  </xsl:template>
+  <xsl:template match = "tp:PassedTests">
+    <span style = "width:10%">
+      PassedTests:
+    </span>
+    <span style = "color:brown;padding-right:10px;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  <xsl:template match = "tp:TotalTests">
+    <span style = "width:10%">
+      TotalTests:
+    </span>
+    <span style = "color:brown;padding-right:10px;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:DisplayName">
+    DisplayName:<span style = "color:brown;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:resultOutcome">
+    <!--<xsl:text>  &#x2714; </xsl:text>-->
+    <xsl:if test ="tp:resultOutcome!='Passed'">
+      <xsl:text>  &#x2714; </xsl:text>
+    </xsl:if>
+    <xsl:if test ="tp:resultOutcome!='Failed'">
+      <xsl:apply-templates select = "pass" />
+    </xsl:if>
+    <span style = "color:brown;padding-right:10px;">
+      <xsl:value-of select = "." />
+    </span>
+
+  </xsl:template>
+
+  <xsl:template match = "pass">
+    <span style = "color:brown;padding-right:10px;">
+      &#x2714;
+    </span>
+  </xsl:template>
+
+  <xsl:template match = "fail">
+    <span style = "color:brown;padding-right:10px;">
+      &#x2718;
+    </span>
+  </xsl:template>
+
+  <xsl:template match = "tp:Duration">
+    Duration:<span style = "color:brown;">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:FullyQualifiedName">
+    <span style = "color:brown">
+      <xsl:value-of select = "." />
+    </span>
+  </xsl:template>
+
+
+  <!--<xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>-->
+</xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
new file mode 100644
index 0000000000..edb569f3bb
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -0,0 +1,239 @@
+// 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.Extensions.HtmlLogger
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    using System.Xml.Serialization;
+    using System.Xml;
+    using System.Runtime.Serialization;
+    using System.IO;
+    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+    using System.Collections.Concurrent;
+    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    using System.Globalization;
+    using System.Text;
+    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+
+    /// <summary>
+    /// Logger for generating Html log
+    /// </summary>
+    [FriendlyName(HtmlLoggerConstants.FriendlyName)]
+    [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
+    public class Htmllogger : ITestLoggerWithParameters
+    {
+        // private string htmlFilePath;
+        private Dictionary<string, string> parametersDictionary;
+        private ConcurrentDictionary<Guid, TestResult> Results;
+        //private TestOutcome testRunOutcome;
+        internal int totalTests;
+        internal int failTests;
+        internal int passTests { get; set; }
+        // private string htmlFilePath;
+        private TestResults testResults;
+        internal string htmlFileName;
+        internal string xmlFileName;
+        internal IFileHelper filehelper;
+
+        DataContractSerializer xmlSerializer;
+        IHtmlTransformer htmlTransformer;
+
+        public Htmllogger()
+            : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestResults)))
+            {
+            }
+
+        public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, DataContractSerializer dataContractSerializer)
+        {
+            this.filehelper = filehelper;
+            this.htmlTransformer = htmlTransformer;
+            this.xmlSerializer = dataContractSerializer;
+        }
+    
+        /// <summary>
+        /// Gets the directory under which default trx file and test results attachements should be saved.
+        /// </summary>
+        public string TestResultsDirPath { get; private set; }
+        public ConcurrentDictionary<Guid, TestResult> GetResults() { return this.Results; }
+
+        internal TestResults GetTestResults()
+        {
+            return this.testResults;
+        }
+
+        internal void SetTestResults(TestResults testresults)
+        {
+            this.testResults = testresults;
+        }
+              
+        public void Initialize(TestLoggerEvents events, string testResultsDirPath)
+        {
+            if (events == null)
+            {
+                throw new ArgumentNullException(nameof(events));
+            }
+
+            if (string.IsNullOrEmpty(testResultsDirPath))
+            {
+                throw new ArgumentNullException(nameof(testResultsDirPath));
+            }
+
+            // Register for the events.
+            events.TestRunMessage += this.TestMessageHandler;
+            events.TestResult += this.TestResultHandler;
+            events.TestRunComplete += this.TestRunCompleteHandler;
+
+            this.TestResultsDirPath = testResultsDirPath;
+            this.testResults = new TestResults();
+            this.Results = new ConcurrentDictionary<Guid, TestResult>();
+        }
+
+        /// <inheritdoc/>
+        public void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)
+        {
+            if (parameters == null)
+            {
+                throw new ArgumentNullException(nameof(parameters));
+            }
+            
+            if (parameters.Count == 0)
+            {
+                throw new ArgumentException("No default parameters added", nameof(parameters));
+            }
+
+            this.parametersDictionary = parameters;
+            this.Initialize(events, this.parametersDictionary[DefaultLoggerParameterNames.TestRunDirectory]);
+        }
+
+        internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
+        {
+            ValidateArg.NotNull<object>(sender, "sender");
+            ValidateArg.NotNull<TestRunMessageEventArgs>(e, "e");
+            
+            // TrxLoggerObjectModel.RunInfo runMessage;
+            switch (e.Level)
+            {
+                case TestMessageLevel.Informational:
+                    testResults.RunLevelMessageInformational.Add(e.Message);
+                    break;
+                case TestMessageLevel.Warning:
+                    testResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    break;
+                case TestMessageLevel.Error:
+                    testResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    break;
+                default:
+                    Debug.Fail("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
+                    break;
+            }
+        }
+
+        internal void TestResultHandler(object sender, TestResultEventArgs e)
+        {
+            ValidateArg.NotNull<object>(sender, "sender");
+            ValidateArg.NotNull<TestResultEventArgs>(e, "e");
+
+            Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.TestResult testResult = new Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.TestResult() ;
+            if(e.Result.DisplayName!=null)
+                testResult.DisplayName = e.Result.DisplayName;
+            else
+                testResult.DisplayName = e.Result.TestCase.DisplayName;
+
+            testResult.FullyQualifiedName = e.Result.TestCase.FullyQualifiedName;
+            //yet to test...
+            testResult.Duration = e.Result.Duration;
+            testResult.ErrorStackTrace = e.Result.ErrorStackTrace;
+            testResult.ErrorMessage = e.Result.ErrorMessage;
+
+            //yet to test..
+            var executionId = Converter.GetExecutionId(e.Result);
+            var parentExecutionId = Converter.GetParentExecutionId(e.Result);
+            
+            this.totalTests++;
+
+
+            testResult.resultOutcome = e.Result.Outcome;
+            if (e.Result.Outcome == TestOutcome.Failed)
+            {
+                this.failTests++;
+            }
+            else if (e.Result.Outcome == TestOutcome.Passed)
+            {
+                this.passTests++;
+            }
+
+            if(parentExecutionId==Guid.Empty)
+                testResults.Results.Add(testResult);
+
+            Results.TryAdd(executionId, testResult);
+            if(parentExecutionId!= Guid.Empty)
+            {
+                this.AddToParentResult(executionId,parentExecutionId,testResult);
+            }
+        }
+
+        internal void AddToParentResult(Guid executionId,Guid parentExecutionId ,TestResult testResult)
+        {
+            TestResult ParentTestResult;
+            this.Results.TryGetValue(parentExecutionId, out ParentTestResult);
+            if (ParentTestResult.innerTestResults == null)
+                ParentTestResult.innerTestResults = new List<TestResult>();
+            ParentTestResult.innerTestResults.Add(testResult);
+
+        }
+
+
+        internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
+        {
+            testResults.Summary = new TestRunSummary
+            {
+                FailedTests = this.failTests,
+                PassedTests = this.passTests,
+                TotalTests = this.totalTests
+            };
+            //var list = new List<TestResult>();
+            //list.Add(new TestResult(new TestCase("abc", new Uri("executor://dummy"), "abc.dll")));
+            this.PopulateHtmlFile();
+        }
+
+        private void PopulateHtmlFile()
+        {
+            var xmlFilePath = GetXmlFilePath();
+            Stream xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
+
+            var htmlFilePath = GetHtmlFilePath();
+            xmlSerializer.WriteObject(xmlStream, testResults);
+            xmlStream.Close();
+
+            htmlTransformer.Transform(xmlFilePath, htmlFilePath);
+        }
+
+        private string GetHtmlFilePath()
+        {
+            this.htmlFileName = GetFileName("html");
+            var htmlFilePath = Path.Combine(this.TestResultsDirPath, htmlFileName);
+            return htmlFilePath;
+        }
+
+        private string GetXmlFilePath()
+        {
+            this.xmlFileName = GetFileName("xml");
+            var xmlFilePath = Path.Combine(this.TestResultsDirPath, xmlFileName);
+            return xmlFilePath;
+        }
+
+        private string GetFileName(string fileFormat)
+        {
+            var fullfileformat = string.Concat("." +fileFormat);
+            return string.Concat("TestResult_", DateTime.Now.ToLongDateString(), fullfileformat);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
new file mode 100644
index 0000000000..bb3e16d963
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Xsl;
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+{
+    class HtmlTransformer : IHtmlTransformer
+    {
+        StringReader xsltStringReader = new StringReader(Resources.Html);
+        XslCompiledTransform myXslTransform;
+
+        public HtmlTransformer()
+        {
+            myXslTransform = new XslCompiledTransform();
+            myXslTransform.Load(XmlReader.Create(xsltStringReader));
+        }
+
+        public void Transform(string xmlfile,string htmlfile)
+        {
+            myXslTransform.Transform(xmlfile, htmlfile);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
new file mode 100644
index 0000000000..5f12d4b52e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
@@ -0,0 +1,18 @@
+// 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.Extensions.HtmlLogger
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface IHtmlTransformer
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="xmlfile"></param>
+        /// <param name="htmlfile"></param>
+        void Transform(string xmlfile, string htmlfile);
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
new file mode 100644
index 0000000000..4cba3b64f1
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -0,0 +1,56 @@
+<?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>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+  <!--<ItemGroup>
+    <EmbeddedResource Include="Resources\TrxResource.resx" />
+  </ItemGroup>-->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <!--<ItemGroup>
+    <Compile Update="Resources\TrxResource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>TrxResource.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\TrxResource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>TrxResource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>-->
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+</Project>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs
new file mode 100644
index 0000000000..6d3930e635
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs
@@ -0,0 +1,84 @@
+//------------------------------------------------------------------------------
+// <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.Extensions.HtmlLogger {
+    using System;
+    
+    
+    /// <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", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    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")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.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)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;xsl:stylesheet version=&quot;2.0&quot;
+        ///    
+        ///                xmlns:tp=&quot;http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger&quot;
+        ///                xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;
+        ///    xmlns:msxsl=&quot;urn:schemas-microsoft-com:xslt&quot; exclude-result-prefixes=&quot;msxs tp&quot;
+        ///&gt;
+        ///  &lt;xsl:output method=&quot;html&quot; indent=&quot;yes&quot;/&gt;
+        ///  &lt;xsl:template match=&quot;/&quot;&gt;
+        ///    &lt;html&gt;
+        ///      &lt;body&gt;
+        ///        &lt;h1&gt;TestResults&lt;/h1&gt;
+        ///        &lt;xsl:apply-templates [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Html {
+            get {
+                return ResourceManager.GetString("Html", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx
new file mode 100644
index 0000000000..5f8e39a864
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx
@@ -0,0 +1,124 @@
+<?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>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Html" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Html.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
new file mode 100644
index 0000000000..b87e59f942
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+{
+    [DataContract]
+    [KnownType(typeof(TestResult))]
+    public sealed class TestResults
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public TestResults()
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [DataMember]
+        internal TestRunSummary Summary { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [DataMember]
+        internal List<string> RunLevelMessageInformational =  new List<string>();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [DataMember]
+        internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [DataMember]
+        internal List<TestResult> Results = new List<TestResult>();
+
+        
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        internal int GetTestResultscount()
+        {
+            return this.Results.Count;
+        }
+
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
new file mode 100644
index 0000000000..a92a64e98f
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
@@ -0,0 +1,10 @@
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+{
+    public class TestRunSummary
+    {
+        public int TotalTests { get; set; }
+        public int PassedTests { get; set; }
+        public int FailedTests { get; set; }
+        public int SkippedTests { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
new file mode 100644
index 0000000000..1f43a91a41
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
@@ -0,0 +1,29 @@
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+{
+    
+    public class TestResult
+    {
+        public string FullyQualifiedName;
+        public string DisplayName;
+        public string ErrorStackTrace;
+        public string ErrorMessage;
+        public TestOutcome resultOutcome;
+        
+
+        public TimeSpan Duration { get; set; }
+        public List<TestResult> innerTestResults;
+        internal int GetInnerTestResultscount()
+        {
+            return this.innerTestResults.Count;
+        }
+        internal TestResult GetTestResult()
+        {
+            return this;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
new file mode 100644
index 0000000000..42fd482cb3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
@@ -0,0 +1,33 @@
+namespace Microsoft.TestPlatform.Extensions.HtmlLogger.Utility
+{
+    using System;
+    // using Microsoft.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+    internal static class Constants
+    {
+        /// <summary>
+        /// Uri used to uniquely identify the TRX logger.
+        /// </summary>
+        public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
+
+        /// <summary>
+        /// Alternate user friendly string to uniquely identify the console logger.
+        /// </summary>
+        public const string FriendlyName = "Html";
+        public const string TestTypePropertyIdentifier = "TestType";
+        public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
+
+        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
+        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
+        public const string LogFileNameKey = "LogFileName";
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+        public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+        public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+        public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs
new file mode 100644
index 0000000000..33a453d571
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.TestPlatform.Extensions.HtmlLogger.Utility;
+using Constants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+{
+    class Converter
+    {
+        public static Guid GetParentExecutionId(ObjectModel.TestResult testResult)
+        {
+            TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(
+                property => property.Id.Equals(Constants.ParentExecutionIdPropertyIdentifier));
+
+            return parentExecutionIdProperty == null ?
+                Guid.Empty :
+                testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+        }
+
+
+        public static Guid GetExecutionId(ObjectModel.TestResult testResult)
+        {
+            TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(
+                property => property.Id.Equals(Constants.ExecutionIdPropertyIdentifier));
+
+            var executionId = Guid.Empty;
+            if (executionIdProperty != null)
+                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+
+            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+        }
+    }
+
+
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
new file mode 100644
index 0000000000..248702c5db
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
@@ -0,0 +1,58 @@
+<html xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+  <body>
+    <h1>TestResults</h1>
+    <h2>Summary</h2><span style="width:10%">
+      TotalTests:
+    </span><span style="color:brown;padding-right:10px;">6</span><br><span style="width:10%">
+      FailedTests:
+    </span><span style="color:brown;padding-right:10px;">2</span><br><span style="width:10%">
+      PassedTests:
+    </span><span style="color:brown;padding-right:10px;">4</span><br><h2>Results</h2>
+    <h3>TestResult</h3>
+    <div onclick="ToggleClass('ID0EE')" style="border:3px solid grey;cursor:pointer; width:100%;">
+      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod1</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT0.0058002S</span><br></div>
+      </div><br></div>
+    <div onclick="ToggleClass('ID0EP')" style="border:3px solid grey;cursor:pointer; width:100%;">
+      <div><span style="color:brown;padding-right:10px;">Failed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT1.288131S</span><br></div>
+      </div><a Id="ID0EP" style="display:none;"><h3>innerTestResults:</h3>
+        <div onclick="ToggleClass('ID0EY')" style="border:3px solid grey;cursor:pointer; width:100%;">
+          <div><span style="color:brown;padding-right:10px;">Failed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT1.2875673S</span><br></div>
+          </div>
+    ErrorMessage: <span style="color:brown;">Assert.AreEqual failed. Expected:&lt;5&gt;. Actual:&lt;4&gt;. </span><br>
+    ErrorStackTrace: <span style="color:brown;">   at UnitTestProject3.UnitTest1.TestMethod2(Int32 a, Int32 b) in C:\Users\havineet\source\repos\UnitTestProject3\UnitTestProject3\UnitTest1.cs:line 19
+</span><br><br></div>
+        <div onclick="ToggleClass('ID0EBB')" style="border:3px solid grey;cursor:pointer; width:100%;">
+          <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT0.0000059S</span><br></div>
+          </div><br></div></a><br></div>
+    <div onclick="ToggleClass('ID0ENB')" style="border:3px solid grey;cursor:pointer; width:100%;">
+      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest2.TestMethod1</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT0.000227S</span><br></div>
+      </div><br></div>
+    <div onclick="ToggleClass('ID0EYB')" style="border:3px solid grey;cursor:pointer; width:100%;">
+      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest2.TestMethod2</span><div style="float:right;">
+    Duration:<span style="color:brown;">PT0.0000478S</span><br></div>
+      </div><br></div>
+  </body><script language="javascript">
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      </script><style>
+        #testtable {
+        border-collapse: collapse;
+        }
+
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+      </style>
+</html>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
new file mode 100644
index 0000000000..19165bd29a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
@@ -0,0 +1,2 @@
+<TestResults xmlns="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Results><TestResult><DisplayName>TestMethod1</DisplayName><Duration>PT0.0058002S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod1</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod2</DisplayName><Duration>PT1.288131S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults><TestResult><DisplayName>Sequential numbers</DisplayName><Duration>PT1.2875673S</Duration><ErrorMessage>Assert.AreEqual failed. Expected:&lt;5&gt;. Actual:&lt;4&gt;. </ErrorMessage><ErrorStackTrace>   at UnitTestProject3.UnitTest1.TestMethod2(Int32 a, Int32 b) in C:\Users\havineet\source\repos\UnitTestProject3\UnitTestProject3\UnitTest1.cs:line 19&#xD;
+</ErrorStackTrace><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Failed</resultOutcome></TestResult><TestResult><DisplayName>equal numbers</DisplayName><Duration>PT0.0000059S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult></innerTestResults><resultOutcome>Failed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod1</DisplayName><Duration>PT0.000227S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest2.TestMethod1</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod2</DisplayName><Duration>PT0.0000478S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest2.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult></Results><Summary><FailedTests>2</FailedTests><PassedTests>4</PassedTests><TotalTests>6</TotalTests></Summary></TestResults>
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
new file mode 100644
index 0000000000..ebb4ecd84f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -0,0 +1,473 @@
+// 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.TestPlatform.Extensions.HtmlLogger.UnitTests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using Moq;
+    using ObjectModel = VisualStudio.TestPlatform.ObjectModel;
+    using VisualStudio.TestPlatform.ObjectModel.Client;
+    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    using HtmlLogger = VisualStudio.TestPlatform.Extensions.HtmlLogger;
+    using System.Text;
+    using System.Collections.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using System.Linq;
+    using System.Xml;
+    using System.Xml.Linq;
+    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+    [TestClass]
+    public class HtmlLoggerTests
+    {
+        private Mock<TestLoggerEvents> events;
+        private Htmllogger htmlLogger;
+        private Dictionary<string, string> parameters;
+        private static string DefaultTestRunDirectory = Path.GetTempPath();
+        private static string DefaultLogFileNameParameterValue = "logfilevalue.trx";
+        private Mock<IFileHelper> mockFileHelper;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            this.events = new Mock<TestLoggerEvents>();
+            this.htmlLogger = new Htmllogger();
+            this.parameters = new Dictionary<string, string>(2);
+            this.parameters[ObjectModel.DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory;
+            this.parameters[HtmlLoggerConstants.LogFileNameKey] = HtmlLoggerTests.DefaultLogFileNameParameterValue;
+            this.htmlLogger.Initialize(this.events.Object, this.parameters);
+
+
+        }
+        [TestMethod]
+        public void InitializeShouldThrowExceptionIfEventsIsNull()
+        {
+            Assert.ThrowsException<ArgumentNullException>(
+                () =>
+                {
+                    this.htmlLogger.Initialize(null, this.parameters);
+                });
+        }
+
+        [TestMethod]
+        public void InitializeShouldInitializeAllProperties()
+        {
+            var testResultDir = @"C:\Code\abc";
+            var events = new Mock<TestLoggerEvents>();
+
+            this.htmlLogger.Initialize(events.Object, testResultDir);
+
+            Assert.AreEqual(this.htmlLogger.TestResultsDirPath, testResultDir);
+            Assert.IsNotNull(this.htmlLogger.GetTestResults());
+           
+            Assert.IsNotNull(this.htmlLogger.GetResults());
+        }
+
+        
+
+        [TestMethod]
+        public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
+        {
+            Assert.ThrowsException<ArgumentNullException>(
+                () =>
+                {
+                    this.events = new Mock<TestLoggerEvents>();
+                    this.parameters[ObjectModel.DefaultLoggerParameterNames.TestRunDirectory] = null;
+                    this.htmlLogger.Initialize(events.Object, parameters);
+                });
+        }
+
+      
+        [TestMethod]
+        public void InitializeShouldThrowExceptionIfParametersAreEmpty()
+        {
+            var events = new Mock<TestLoggerEvents>();
+            Assert.ThrowsException<ArgumentException>(() => this.htmlLogger.Initialize(events.Object, new Dictionary<string, string>()));
+        }
+
+        [TestMethod]
+        public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
+        {
+            Assert.ThrowsException<ArgumentNullException>(() =>
+            {
+                this.htmlLogger.TestMessageHandler(new object(), default(TestRunMessageEventArgs));
+            });
+        }
+
+        [TestMethod]
+        public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
+        {
+            string message = "First message";
+            
+            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
+            HtmlLogger.TestResults testResults = this.CreateTestResults();
+            this.htmlLogger.SetTestResults(testResults);
+            this.htmlLogger.TestMessageHandler(new object(), trme);
+ 
+            string actualMessage = this.htmlLogger.GetTestResults().RunLevelMessageInformational.First();
+            Assert.AreEqual(message, actualMessage.ToString());
+           
+        }
+
+        [TestMethod]
+        public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
+        {
+            string message = "error message";
+            string message2 = "warning message";
+  
+            HtmlLogger.TestResults testResults = this.CreateTestResults();
+            this.htmlLogger.SetTestResults(testResults); 
+
+            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
+            this.htmlLogger.TestMessageHandler(new object(), trme);
+            TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
+            this.htmlLogger.TestMessageHandler(new object(), trme2);
+            
+           
+
+            Assert.AreEqual(message, this.htmlLogger.GetTestResults().RunLevelMessageErrorAndWarning.First());
+            Assert.AreEqual(2, this.htmlLogger.GetTestResults().RunLevelMessageErrorAndWarning.Count());
+        }
+
+        
+        
+        [TestMethod]
+        public void TestResultHandlerShouldKeepTrackofSummary()
+        {
+            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
+            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
+            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
+            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+
+            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
+            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+
+            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
+            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+
+            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
+            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+
+            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
+            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+
+            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
+            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
+            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
+            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+
+
+            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
+            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
+            this.htmlLogger.TestResultHandler(new object(), fail1.Object);
+            this.htmlLogger.TestResultHandler(new object(), skip1.Object);
+
+            Assert.AreEqual(this.htmlLogger.passTests, 2, "Passed Tests");
+            Assert.AreEqual(this.htmlLogger.failTests, 1, "Failed Tests");
+            Assert.AreEqual(this.htmlLogger.totalTests, 4, "Total Tests");
+
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateDisplayNameIfNullProperly()
+        {
+            //this assert is for checking result dispalyname equals to null
+            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
+            ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase1);
+            PassTestResultExpected.DisplayName = null;
+            PassTestResultExpected.TestCase.DisplayName = "abc";
+         
+
+            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(PassTestResultExpected);
+            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
+
+            HtmlLogger.TestResult passTestResultActual = new HtmlLogger.TestResult();
+            
+            passTestResultActual.resultOutcome = TestOutcome.Passed;
+            passTestResultActual.DisplayName = "abc";
+
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.GetTestResults().Results.First().DisplayName);
+          //  Assert.AreEqual( passTestResultActual,this.htmlLogger.GetTestResults().Results.First());
+
+            //this assert is for checking result dispalyname equals to notnull
+
+            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
+            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase1);
+            PassTestResultExpected.DisplayName = "def";
+            PassTestResultExpected.TestCase.DisplayName = "abc";
+
+            Mock<TestResultEventArgs> pass2= new Mock<TestResultEventArgs>(PassTestResultExpected);
+            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
+
+            HtmlLogger.TestResult passTestResultActual1 = new HtmlLogger.TestResult();
+            passTestResultActual.resultOutcome = TestOutcome.Passed;
+            passTestResultActual.DisplayName = "def";
+
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.GetTestResults().Results.Last().DisplayName);
+           // Assert.AreEqual(passTestResultActual1, this.htmlLogger.GetTestResults().Results.First());
+
+
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateDisplayNameIfNotNullProperly()
+        {
+           
+            //this assert is for checking result dispalyname equals to notnull
+
+            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
+            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase2);
+            PassTestResultExpected1.DisplayName = "def";
+            PassTestResultExpected1.TestCase.DisplayName = "abc";
+
+            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(PassTestResultExpected1);
+            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
+
+            HtmlLogger.TestResult passTestResultActual1 = new HtmlLogger.TestResult();
+            passTestResultActual1.resultOutcome = TestOutcome.Passed;
+            passTestResultActual1.DisplayName = "def";
+
+
+            Assert.AreEqual(passTestResultActual1, this.htmlLogger.GetTestResults().Results.First());
+
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateTestResultProperly()
+        {
+
+            //this assert is for checking result dispalyname equals to notnull
+
+            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
+                passTestCase2.DisplayName = "abc";
+                passTestCase2.FullyQualifiedName = "fully";
+
+            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase2)
+            {
+                DisplayName = "def",
+                ErrorMessage = "error message",
+                ErrorStackTrace = "Error strack trace"
+            };
+
+
+            Mock<TestResultEventArgs> eventArg = new Mock<TestResultEventArgs>(PassTestResultExpected1);
+
+            this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
+
+            var result = this.htmlLogger.GetTestResults().Results.First();
+
+            Assert.AreEqual(result.Duration, "");
+            Assert.AreEqual(result.Duration, "");
+            Assert.AreEqual(result.Duration, "");
+            Assert.AreEqual(result.Duration, "");
+            Assert.AreEqual(result.Duration, "");
+
+        }
+
+
+
+        private HtmlLogger.TestResult CreateTestResult(ObjectModel.TestOutcome testoutcome,string displayName)
+        {
+
+            HtmlLogger.TestResult testResult = new HtmlLogger.TestResult();
+            testResult.resultOutcome = testoutcome;
+            testResult.DisplayName = displayName;
+            return testResult;
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
+        {
+            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
+
+            HtmlLogger.TestResults testResults = this.CreateTestResults();
+            this.htmlLogger.SetTestResults(testResults);
+
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = ObjectModel.TestOutcome.Failed;
+
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
+            result2.Outcome = ObjectModel.TestOutcome.Passed;
+
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
+
+            Assert.AreEqual(this.htmlLogger.GetTestResults().GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
+        {
+            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
+            ObjectModel.TestCase testCase3 = CreateTestCase("TestCase3");
+
+            Guid parentExecutionId = Guid.NewGuid();
+
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
+            result1.SetPropertyValue<Guid>(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
+
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
+            result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+            result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+
+            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
+            result3.Outcome = ObjectModel.TestOutcome.Failed;
+            result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+            result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
+
+            Assert.AreEqual(this.htmlLogger.GetTestResults().GetTestResultscount(), 1, "testhandler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.GetTestResults().Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
+
+           
+        }
+
+        [TestMethod]
+        public void TestCompleteHandlerShouldKeepTackOfSummary()
+        {
+            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
+            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
+            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
+            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+
+            HtmlLogger.TestResults testResults = this.CreateTestResults();
+            this.htmlLogger.SetTestResults(testResults);
+
+            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
+            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+
+            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
+            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+
+            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
+            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+
+            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
+            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+
+            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
+            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
+            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
+            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+
+
+            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
+            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
+            this.htmlLogger.TestResultHandler(new object(), fail1.Object);
+            this.htmlLogger.TestResultHandler(new object(), skip1.Object);
+
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+
+            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.TotalTests, 4, "summary should keep track of totaltests");
+            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.FailedTests, 1, "summary should keep track of failedtests");
+            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.PassedTests, 2, "summary should keep track of passedtests");
+        }
+
+        [TestMethod]
+        public void TestRunInformationShouldContainUtcDateTime()
+        {
+            HtmlLogger.TestResults testResults = this.CreateTestResults();
+            this.htmlLogger.SetTestResults(testResults);
+            this.MakeTestRunComplete();
+
+
+            this.ValidateDateTimeInTrx(this.htmlLogger.htmlFileName,"should handle htmlfilename time to meet bounds of utc");
+            this.ValidateDateTimeInTrx(this.htmlLogger.xmlFileName, "should handle xmlfilename time to meet bounds of utc");
+        }
+
+        private void ValidateDateTimeInTrx(string htmlFileName,string error)
+        {
+            this.mockFileHelper = new Mock<IFileHelper>();
+            this.mockFileHelper.Verify(x => x.WriteAllTextToFile(htmlFileName, It.IsAny<string>()), Times.Once);
+
+            //using (FileStream file = File.OpenRead(htmlFileName))
+            //{
+            //    using (XmlReader reader = XmlReader.Create(htmlFileName))
+            //    {
+            //        XDocument document = XDocument.Load(htmlFileName);
+            //        var timesNode = document.Descendants(document.Root.GetDefaultNamespace() + "Times").FirstOrDefault();
+            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("creation").FirstOrDefault().Value),error);
+            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("start").FirstOrDefault().Value),error);
+            //        var resultNode = document.Descendants(document.Root.GetDefaultNamespace() + "UnitTestResult").FirstOrDefault();
+            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("endTime").FirstOrDefault().Value),error);
+            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("startTime").FirstOrDefault().Value),error);
+            //    }
+            //}
+        }
+
+        private void ValidateTimeWithinUtcLimits(DateTimeOffset dateTime,string error)
+        {
+            Assert.IsTrue(dateTime.UtcDateTime.Subtract(DateTime.UtcNow) < new TimeSpan(0, 0, 0, 60),error);
+        }
+
+        private HtmlLogger.TestResults CreateTestResults()
+        {
+            HtmlLogger.TestResults testresults = new HtmlLogger.TestResults();
+            //testresults.Summary.PassedTests = 1;
+            return testresults;
+        }
+
+        private static TestCase CreateTestCase(string testCaseName)
+        {
+            return new ObjectModel.TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
+        }
+
+        private static TestRunCompleteEventArgs CreateTestRunCompleteEventArgs()
+        {
+            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null,
+                new Collection<AttachmentSet>(), new TimeSpan(1, 0, 0, 0));
+            return testRunCompleteEventArgs;
+        }
+
+        private static Mock<TestResultEventArgs> CreatePassTestResultEventArgsMock(string testCaseName = "Pass1", List<TestResultMessage> testResultMessages = null)
+        {
+            TestCase passTestCase = CreateTestCase(testCaseName);
+            var passResult = new ObjectModel.TestResult(passTestCase);
+
+            if (testResultMessages != null && testResultMessages.Any())
+            {
+                foreach (var message in testResultMessages)
+                {
+                    passResult.Messages.Add(message);
+                }
+            }
+
+            return new Mock<TestResultEventArgs>(passResult);
+        }
+
+        private void MakeTestRunComplete()
+        {
+            var pass = HtmlLoggerTests.CreatePassTestResultEventArgsMock();
+            this.htmlLogger.TestResultHandler(new object(), pass.Object);
+            var testRunCompleteEventArgs = HtmlLoggerTests.CreateTestRunCompleteEventArgs();
+            this.htmlLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+        }
+
+
+    }
+
+}
+
+
+
+
+  
+
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
new file mode 100644
index 0000000000..621dc40853
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
+    <TestProject>true</TestProject>
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+  </PropertyGroup>
+  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+  <PropertyGroup>
+    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
+    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
+    <!--<AssemblyName>Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests</AssemblyName>-->
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+</Project>

From 56091eb99c81cf92976c1b12ec6fa3345a87de4b Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Mon, 29 Jul 2019 16:05:42 +0530
Subject: [PATCH 02/20] Adding the Program.cs for making the unit tests project
 build

---
 .../Program.cs                                      | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs

diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs
new file mode 100644
index 0000000000..d674656dd0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}

From a5fe993775723d43a72deb91d421aa3411bd3a9f Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Tue, 30 Jul 2019 19:51:49 +0530
Subject: [PATCH 03/20] 1. Added docs for methods 2. Added remaining unit tests
 3. Removed redundant spaces.

---
 .../Html.xslt                                 |  83 +----
 .../HtmlLogger.cs                             | 260 +++++++++-----
 .../HtmlTransformer.cs                        |  12 +-
 .../IHtmlTransformer.cs                       |   5 +-
 .../TestResults.cs                            |  21 +-
 .../TestRunSummary.cs                         |  19 +-
 .../Testresult.cs                             |  46 ++-
 .../Utility/Constants.cs                      |  30 +-
 .../converter.cs                              |  38 ---
 .../HtmlLoggerTests.cs                        | 316 +++++++++---------
 10 files changed, 425 insertions(+), 405 deletions(-)
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 93e82624a4..ecd3fc7e2a 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -3,8 +3,7 @@
     
                 xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"
->
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
   <xsl:output method="html" indent="yes"/>
   <xsl:template match="/">
     <html>
@@ -37,12 +36,9 @@
 
   <xsl:template match="/tp:TestResults">
     <h2>Summary</h2>
-
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
-
     <h2>Results</h2>
     <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
-
   </xsl:template>
 
   <xsl:template match="/tp:TestResults/tp:Results">
@@ -51,128 +47,71 @@
   </xsl:template>
 
   <xsl:template match="tp:TestResults/tp:Summary">
-    <!--<table id="testtable">
-      <tr>
-        <th>Total Tests</th>
-        <th>Failed Tests</th>
-        <th>Passed Tests</th>
-      </tr>
-      <tr>
-        <td>
-          <xsl:value-of select="tp:TotalTests"/>
-        </td>
-        <td>
-          <xsl:value-of select="tp:FailedTests"/>
-        </td>
-        <td>
-          <xsl:value-of select="tp:PassedTests"/>
-        </td>
-      </tr>
-     
-    </table>-->
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
-
   </xsl:template>
-
-
-
-
-
-
   <xsl:template match="tp:TestResult">
     <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
-
       <div>
-
         <xsl:apply-templates select = "tp:resultOutcome" />
         <xsl:apply-templates select = "tp:FullyQualifiedName" />
         <div  style="float:right;">
           <xsl:apply-templates select = "tp:Duration" />
         </div>
-
       </div>
 
-
-      <!--<div style="width:60%;">
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-      </div>-->
-
-      <!--<xsl:apply-templates select = "tp:DisplayName" />-->
       <xsl:if test ="tp:ErrorMessage!=''">
         <xsl:apply-templates select = "tp:ErrorMessage" />
       </xsl:if>
       <xsl:if test ="tp:ErrorStackTrace!=''">
         <xsl:apply-templates select = "tp:ErrorStackTrace" />
       </xsl:if>
-
-
       <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <h3>innerTestResults:</h3>
+          <h3>Child Test Results:</h3>
           <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
-        <!--<br/>-->
       </xsl:if>
       <br />
     </div>
   </xsl:template>
-
-
   <xsl:template match="tp:innerTestResults/tp:TestResult">
     <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
-
       <div>
-
         <xsl:apply-templates select = "tp:resultOutcome" />
         <xsl:apply-templates select = "tp:FullyQualifiedName" />
         <div  style="float:right;">
           <xsl:apply-templates select = "tp:Duration" />
         </div>
-
       </div>
-
-
-      <!--<div style="width:60%;">
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-      </div>-->
-
-      <!--<xsl:apply-templates select = "tp:DisplayName" />-->
       <xsl:if test ="tp:ErrorMessage!=''">
         <xsl:apply-templates select = "tp:ErrorMessage" />
       </xsl:if>
       <xsl:if test ="tp:ErrorStackTrace!=''">
         <xsl:apply-templates select = "tp:ErrorStackTrace" />
       </xsl:if>
-
-
       <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
           <h3>innerTestResults:</h3>
           <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
-        <!--<br/>-->
       </xsl:if>
       <br />
     </div>
   </xsl:template>
-
-
   <xsl:template match = "tp:ErrorMessage">
     ErrorMessage: <span style = "color:brown;">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-
   <xsl:template match = "tp:ErrorStackTrace">
     ErrorStackTrace: <span style = "color:brown;">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-
   <xsl:template match = "tp:FailedTests">
     <span style = "width:10%">
       FailedTests:
@@ -180,7 +119,6 @@
     <span style = "color:brown;padding-right:10px;">
       <xsl:value-of select = "." />
     </span>
-
     <br />
   </xsl:template>
   <xsl:template match = "tp:PassedTests">
@@ -201,16 +139,13 @@
     </span>
     <br />
   </xsl:template>
-
   <xsl:template match = "tp:DisplayName">
     DisplayName:<span style = "color:brown;">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-
   <xsl:template match = "tp:resultOutcome">
-    <!--<xsl:text>  &#x2714; </xsl:text>-->
     <xsl:if test ="tp:resultOutcome!='Passed'">
       <xsl:text>  &#x2714; </xsl:text>
     </xsl:if>
@@ -220,38 +155,26 @@
     <span style = "color:brown;padding-right:10px;">
       <xsl:value-of select = "." />
     </span>
-
   </xsl:template>
-
   <xsl:template match = "pass">
     <span style = "color:brown;padding-right:10px;">
       &#x2714;
     </span>
   </xsl:template>
-
   <xsl:template match = "fail">
     <span style = "color:brown;padding-right:10px;">
       &#x2718;
     </span>
   </xsl:template>
-
   <xsl:template match = "tp:Duration">
-    Duration:<span style = "color:brown;">
+    <span style = "color:brown;">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-
   <xsl:template match = "tp:FullyQualifiedName">
     <span style = "color:brown">
       <xsl:value-of select = "." />
     </span>
   </xsl:template>
-
-
-  <!--<xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>-->
 </xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index edb569f3bb..0e16107e6e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -10,18 +10,13 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using System.Xml.Serialization;
-    using System.Xml;
     using System.Runtime.Serialization;
     using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
     using System.Collections.Concurrent;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using System.Globalization;
-    using System.Text;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-
+    using System.Linq;
+    using System.Globalization;
 
     /// <summary>
     /// Logger for generating Html log
@@ -30,60 +25,72 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
     public class Htmllogger : ITestLoggerWithParameters
     {
-        // private string htmlFilePath;
-        private Dictionary<string, string> parametersDictionary;
-        private ConcurrentDictionary<Guid, TestResult> Results;
-        //private TestOutcome testRunOutcome;
-        internal int totalTests;
-        internal int failTests;
-        internal int passTests { get; set; }
-        // private string htmlFilePath;
-        private TestResults testResults;
-        internal string htmlFileName;
-        internal string xmlFileName;
-        internal IFileHelper filehelper;
-
-        DataContractSerializer xmlSerializer;
-        IHtmlTransformer htmlTransformer;
+        private IFileHelper filehelper;
+        private XmlObjectSerializer xmlSerializer;
+        private IHtmlTransformer htmlTransformer;
 
         public Htmllogger()
-            : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestResults)))
-            {
-            }
+        : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestResults)))
+        {
+        }
 
-        public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, DataContractSerializer dataContractSerializer)
+        public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlObjectSerializer dataContractSerializer)
         {
             this.filehelper = filehelper;
             this.htmlTransformer = htmlTransformer;
             this.xmlSerializer = dataContractSerializer;
         }
-    
+
+        public string FilePath { get; private set; }
         /// <summary>
-        /// Gets the directory under which default trx file and test results attachements should be saved.
+        /// Gets the directory under which default html file and test results attachements should be saved.
         /// </summary>
         public string TestResultsDirPath { get; private set; }
-        public ConcurrentDictionary<Guid, TestResult> GetResults() { return this.Results; }
 
-        internal TestResults GetTestResults()
-        {
-            return this.testResults;
-        }
+        /// <summary>
+        /// Total Results are stored in sequential order
+        /// </summary>
+        /// <returns></returns>
+        public ConcurrentDictionary<Guid, TestResult> Results { get; private set; }
 
-        internal void SetTestResults(TestResults testresults)
-        {
-            this.testResults = testresults;
-        }
-              
-        public void Initialize(TestLoggerEvents events, string testResultsDirPath)
+        /// <summary>
+        /// TestResults Stores all the Summary and the details of evrey Results in Hiearachial order.
+        /// </summary>
+        public TestResults TestResults { get; private set; }
+
+        /// <summary>
+        /// Total Passed Tests in the TestResults
+        /// </summary>
+        public int PassedTests { get; private set; }
+
+        /// <summary>
+        /// Total FailedTests in the Results
+        /// </summary>
+        public int FailedTests { get; private set; }
+
+        /// <summary>
+        /// Total Tests in the Results
+        /// </summary>
+        public int TotalTests { get; private set; }
+
+        /// <summary>
+        /// Total SkippedTests in the Results
+        /// </summary>
+        public int SkippedTests { get; private set; }
+        private string fileName;
+        public string xmlFilePath { get; private set; }
+        public string htmlFilePath { get; private set; }
+
+        public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
         {
             if (events == null)
             {
                 throw new ArgumentNullException(nameof(events));
             }
 
-            if (string.IsNullOrEmpty(testResultsDirPath))
+            if (string.IsNullOrEmpty(TestResultsDirPath))
             {
-                throw new ArgumentNullException(nameof(testResultsDirPath));
+                throw new ArgumentNullException(nameof(TestResultsDirPath));
             }
 
             // Register for the events.
@@ -91,8 +98,8 @@ public void Initialize(TestLoggerEvents events, string testResultsDirPath)
             events.TestResult += this.TestResultHandler;
             events.TestRunComplete += this.TestRunCompleteHandler;
 
-            this.TestResultsDirPath = testResultsDirPath;
-            this.testResults = new TestResults();
+            this.TestResultsDirPath = TestResultsDirPath;
+            this.TestResults = new TestResults();
             this.Results = new ConcurrentDictionary<Guid, TestResult>();
         }
 
@@ -103,32 +110,35 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
             {
                 throw new ArgumentNullException(nameof(parameters));
             }
-            
+
             if (parameters.Count == 0)
             {
                 throw new ArgumentException("No default parameters added", nameof(parameters));
             }
-
-            this.parametersDictionary = parameters;
-            this.Initialize(events, this.parametersDictionary[DefaultLoggerParameterNames.TestRunDirectory]);
+    
+            this.Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
         }
 
+        /// <summary>
+        /// Handles the Message level information like warnings errors etc..
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
         {
             ValidateArg.NotNull<object>(sender, "sender");
             ValidateArg.NotNull<TestRunMessageEventArgs>(e, "e");
-            
-            // TrxLoggerObjectModel.RunInfo runMessage;
+
             switch (e.Level)
             {
                 case TestMessageLevel.Informational:
-                    testResults.RunLevelMessageInformational.Add(e.Message);
+                    TestResults.RunLevelMessageInformational.Add(e.Message);
                     break;
                 case TestMessageLevel.Warning:
-                    testResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    TestResults.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 case TestMessageLevel.Error:
-                    testResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    TestResults.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 default:
                     Debug.Fail("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
@@ -136,104 +146,170 @@ internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
             }
         }
 
+        /// <summary>
+        /// Handles the Result coming from vstest and store it in testresults 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         internal void TestResultHandler(object sender, TestResultEventArgs e)
         {
             ValidateArg.NotNull<object>(sender, "sender");
             ValidateArg.NotNull<TestResultEventArgs>(e, "e");
 
-            Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.TestResult testResult = new Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.TestResult() ;
-            if(e.Result.DisplayName!=null)
+            TestResult testResult = new TestResult();
+            if (e.Result.DisplayName != null)
                 testResult.DisplayName = e.Result.DisplayName;
             else
                 testResult.DisplayName = e.Result.TestCase.DisplayName;
 
             testResult.FullyQualifiedName = e.Result.TestCase.FullyQualifiedName;
-            //yet to test...
-            testResult.Duration = e.Result.Duration;
+            testResult.Duration = GetFormattedDurationString(e.Result.Duration);
             testResult.ErrorStackTrace = e.Result.ErrorStackTrace;
             testResult.ErrorMessage = e.Result.ErrorMessage;
 
-            //yet to test..
-            var executionId = Converter.GetExecutionId(e.Result);
-            var parentExecutionId = Converter.GetParentExecutionId(e.Result);
-            
-            this.totalTests++;
-
+            var executionId = this.GetExecutionId(e.Result);
+            var parentExecutionId = this.GetParentExecutionId(e.Result);
 
+            /// TODO: handle skipped tests 
+            this.TotalTests++;
             testResult.resultOutcome = e.Result.Outcome;
             if (e.Result.Outcome == TestOutcome.Failed)
             {
-                this.failTests++;
+                this.FailedTests++;
             }
             else if (e.Result.Outcome == TestOutcome.Passed)
             {
-                this.passTests++;
+                this.PassedTests++;
+            }
+            else if (e.Result.Outcome == TestOutcome.Skipped)
+            {
+                this.SkippedTests++;
             }
 
-            if(parentExecutionId==Guid.Empty)
-                testResults.Results.Add(testResult);
+            if (parentExecutionId == Guid.Empty)
+                TestResults.Results.Add(testResult);
 
             Results.TryAdd(executionId, testResult);
-            if(parentExecutionId!= Guid.Empty)
+            if (parentExecutionId != Guid.Empty)
             {
-                this.AddToParentResult(executionId,parentExecutionId,testResult);
+                this.AddToParentResult(parentExecutionId, testResult);
             }
         }
 
-        internal void AddToParentResult(Guid executionId,Guid parentExecutionId ,TestResult testResult)
+        private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         {
             TestResult ParentTestResult;
             this.Results.TryGetValue(parentExecutionId, out ParentTestResult);
             if (ParentTestResult.innerTestResults == null)
                 ParentTestResult.innerTestResults = new List<TestResult>();
             ParentTestResult.innerTestResults.Add(testResult);
-
         }
 
-
+        /// <summary>
+        /// Creates a Summary of tests and Popultes the html file by transforming the xml file with help of xslt file
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
         {
-            testResults.Summary = new TestRunSummary
+            TestResults.Summary = new TestRunSummary
             {
-                FailedTests = this.failTests,
-                PassedTests = this.passTests,
-                TotalTests = this.totalTests
+                FailedTests = this.FailedTests,
+                PassedTests = this.PassedTests,
+                TotalTests = this.TotalTests
             };
-            //var list = new List<TestResult>();
-            //list.Add(new TestResult(new TestCase("abc", new Uri("executor://dummy"), "abc.dll")));
             this.PopulateHtmlFile();
         }
 
         private void PopulateHtmlFile()
         {
-            var xmlFilePath = GetXmlFilePath();
-            Stream xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
+            // TODO: Add exception handling and logging
+            fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
+            xmlFilePath = this.GetFilePath("xml",fileName);
 
-            var htmlFilePath = GetHtmlFilePath();
-            xmlSerializer.WriteObject(xmlStream, testResults);
+            Stream xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
+            xmlSerializer.WriteObject(xmlStream, TestResults);
             xmlStream.Close();
 
+            htmlFilePath = this.GetFilePath("html", fileName);
             htmlTransformer.Transform(xmlFilePath, htmlFilePath);
         }
 
-        private string GetHtmlFilePath()
+        private string GetFilePath(string fileFormat,string FileName)
+        {  
+            var fullfileformat = string.Concat("." + fileFormat);
+            return Path.Combine(this.TestResultsDirPath, string.Concat("TestResult_", FileName, fullfileformat));
+        }
+
+
+        private static string FormatDateTimeForRunName(DateTime timeStamp)
+        {
+            return timeStamp.ToString("yyyyMMdd_HHmmss", DateTimeFormatInfo.InvariantInfo);
+        }
+
+        /// <summary>
+        /// Gives the parent execution id of a TestResult
+        /// </summary>
+        /// <param name="testResult"></param>
+        /// <returns></returns>
+        private Guid GetParentExecutionId(ObjectModel.TestResult testResult)
         {
-            this.htmlFileName = GetFileName("html");
-            var htmlFilePath = Path.Combine(this.TestResultsDirPath, htmlFileName);
-            return htmlFilePath;
+            TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
+            return parentExecutionIdProperty == null ? Guid.Empty : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
         }
 
-        private string GetXmlFilePath()
+        /// <summary>
+        /// Gives the execution id of a TestResult
+        /// </summary>
+        /// <param name="testResult"></param>
+        /// <returns></returns>
+        private Guid GetExecutionId(ObjectModel.TestResult testResult)
         {
-            this.xmlFileName = GetFileName("xml");
-            var xmlFilePath = Path.Combine(this.TestResultsDirPath, xmlFileName);
-            return xmlFilePath;
+            TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
+            var executionId = Guid.Empty;
+            if (executionIdProperty != null)
+                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+
+            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
         }
 
-        private string GetFileName(string fileFormat)
+        /// <summary>
+        /// converts the timespan format to readable string 
+        /// </summary>
+        /// <param name="duration"></param>
+        /// <returns></returns>
+        private string GetFormattedDurationString(TimeSpan duration)
         {
-            var fullfileformat = string.Concat("." +fileFormat);
-            return string.Concat("TestResult_", DateTime.Now.ToLongDateString(), fullfileformat);
+            if (duration == default(TimeSpan))
+            {
+                return null;
+            }
+
+            var time = new List<string>();
+            if (duration.Hours > 0)
+            {
+                time.Add(duration.Hours + "h");
+            }
+
+            if (duration.Minutes > 0)
+            {
+                time.Add(duration.Minutes + "m");
+            }
+
+            if (duration.Hours == 0)
+            {
+                if (duration.Seconds > 0)
+                {
+                    time.Add(duration.Seconds + "s");
+                }
+
+                if (duration.Milliseconds > 0 && duration.Minutes == 0)
+                {
+                    time.Add(duration.Milliseconds + "ms");
+                }
+            }
+
+            return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index bb3e16d963..293cdba708 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
+// 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.IO;
-using System.Text;
 using System.Xml;
 using System.Xml.Xsl;
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
@@ -11,12 +11,18 @@ class HtmlTransformer : IHtmlTransformer
         StringReader xsltStringReader = new StringReader(Resources.Html);
         XslCompiledTransform myXslTransform;
 
+        /// <summary>
+        /// the following  function invoesthe compiled tranform and Loads the xslt file 
+        /// </summary>
         public HtmlTransformer()
         {
             myXslTransform = new XslCompiledTransform();
             myXslTransform.Load(XmlReader.Create(xsltStringReader));
         }
 
+        /// <summary>
+        ///It transforms the xmlfile to htmlfile 
+        /// </summary>
         public void Transform(string xmlfile,string htmlfile)
         {
             myXslTransform.Transform(xmlfile, htmlfile);
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
index 5f12d4b52e..3a19571cf9 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
@@ -3,13 +3,10 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
-    /// <summary>
-    /// 
-    /// </summary>
     public interface IHtmlTransformer
     {
         /// <summary>
-        /// 
+        /// It transforms the xmlfile to htmlfile 
         /// </summary>
         /// <param name="xmlfile"></param>
         /// <param name="htmlfile"></param>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
index b87e59f942..4e0b09f6f6 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
@@ -1,8 +1,8 @@
-using System;
+// 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.Collections.Generic;
 using System.Runtime.Serialization;
-using System.Text;
-using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
@@ -11,46 +11,43 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public sealed class TestResults
     {
         /// <summary>
-        /// 
+        /// constructor Class for testResults
         /// </summary>
         public TestResults()
         {
         }
 
         /// <summary>
-        /// 
+        /// it has the test run summary of all test results
         /// </summary>
         [DataMember]
         internal TestRunSummary Summary { get; set; }
 
         /// <summary>
-        /// 
+        /// List of Run Level Message that is Informational 
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageInformational =  new List<string>();
 
         /// <summary>
-        /// 
+        /// List of Run Level MessageError and warnings
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
 
         /// <summary>
-        /// 
+        /// List of all results in Hieracheal model
         /// </summary>
         [DataMember]
         internal List<TestResult> Results = new List<TestResult>();
 
-        
-
         /// <summary>
-        /// 
+        /// Gives the count of elements that Present in the Results List
         /// </summary>
         /// <returns></returns>
         internal int GetTestResultscount()
         {
             return this.Results.Count;
         }
-
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
index a92a64e98f..71da9d0c48 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
@@ -1,10 +1,27 @@
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+// 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.Extensions.HtmlLogger
 {
     public class TestRunSummary
     {
+        /// <summary>
+        /// total tests of a testrun
+        /// </summary>
         public int TotalTests { get; set; }
+
+        /// <summary>
+        /// Passed tests of test run
+        /// </summary>
         public int PassedTests { get; set; }
+
+        /// <summary>
+        /// Failed Tests of test run
+        /// </summary>
         public int FailedTests { get; set; }
+
+        /// <summary>
+        /// Skipped Tests of test run
+        /// </summary>
         public int SkippedTests { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
index 1f43a91a41..d93adcfca6 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
@@ -1,26 +1,62 @@
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
-    
     public class TestResult
     {
+        /// <summary>
+        /// Fully Qualified name of test result
+        /// </summary>
         public string FullyQualifiedName;
+
+        /// <summary>
+        /// DisplayName for the Particular TestResult.It is unique for each Testresult
+        /// </summary>
         public string DisplayName;
+
+        /// <summary>
+        /// the error stact trace of the testResult
+        /// </summary>
         public string ErrorStackTrace;
+
+        /// <summary>
+        /// error message of the testresult
+        /// </summary>
         public string ErrorMessage;
+
+        /// <summary>
+        /// it is enum whether the testresult is passed failed or skipped  
+        /// </summary>
         public TestOutcome resultOutcome;
-        
 
-        public TimeSpan Duration { get; set; }
+        /// <summary>
+        /// total timespan of the testresult
+        /// </summary>
+        public string Duration { get; set; }
+
+        /// <summary>
+        /// the list of testresults that are chioldren to the current TestResults
+        /// </summary>
         public List<TestResult> innerTestResults;
+
+        /// <summary>
+        /// get the count of inner testresults count
+        /// </summary>
+        /// <returns></returns>
         internal int GetInnerTestResultscount()
         {
             return this.innerTestResults.Count;
         }
+
+        /// <summary>
+        /// givest the current testresult
+        /// </summary>
+        /// <returns></returns>
         internal TestResult GetTestResult()
         {
             return this;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
index 42fd482cb3..86b574cdeb 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
@@ -1,13 +1,15 @@
-namespace Microsoft.TestPlatform.Extensions.HtmlLogger.Utility
+// 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.TestPlatform.Extensions.HtmlLogger.Utility
 {
     using System;
-    // using Microsoft.TestPlatform.Extensions.HtmlLogger.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
     internal static class Constants
     {
         /// <summary>
-        /// Uri used to uniquely identify the TRX logger.
+        /// Uri used to uniquely identify the Html logger.
         /// </summary>
         public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
 
@@ -15,12 +17,32 @@ internal static class Constants
         /// Alternate user friendly string to uniquely identify the console logger.
         /// </summary>
         public const string FriendlyName = "Html";
+
+        ///  /// <summary>
+        /// Property Id storing the TestType.
+        /// </summary>
         public const string TestTypePropertyIdentifier = "TestType";
+
+        /// <summary>
+        /// Ordered test type guid
+        /// </summary>
         public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
 
+        /// <summary>
+        ///  Property Id storing the ParentExecutionId.
+        /// </summary>
         public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
+
+        /// <summary>
+        ///  Property Id storing the ExecutionId.
+        /// </summary>
         public const string ExecutionIdPropertyIdentifier = "ExecutionId";
-        public const string LogFileNameKey = "LogFileName";
+
+        /// <summary>
+        ///  Log file parameter key
+        /// </summary>
+        public const string LogFileNameKey = "LogFileName"; 
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
 
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs
deleted file mode 100644
index 33a453d571..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/converter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using Microsoft.TestPlatform.Extensions.HtmlLogger.Utility;
-using Constants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
-
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
-{
-    class Converter
-    {
-        public static Guid GetParentExecutionId(ObjectModel.TestResult testResult)
-        {
-            TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(
-                property => property.Id.Equals(Constants.ParentExecutionIdPropertyIdentifier));
-
-            return parentExecutionIdProperty == null ?
-                Guid.Empty :
-                testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
-        }
-
-
-        public static Guid GetExecutionId(ObjectModel.TestResult testResult)
-        {
-            TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(
-                property => property.Id.Equals(Constants.ExecutionIdPropertyIdentifier));
-
-            var executionId = Guid.Empty;
-            if (executionIdProperty != null)
-                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
-
-            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
-        }
-    }
-
-
-}
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index ebb4ecd84f..bc09f77677 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -11,16 +11,14 @@ namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
     using ObjectModel = VisualStudio.TestPlatform.ObjectModel;
     using VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
+    using HtmlLoggerConstants = Utility.Constants;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using HtmlLogger = VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using System.Text;
     using System.Collections.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using System.Linq;
-    using System.Xml;
-    using System.Xml.Linq;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    using System.Runtime.Serialization;
 
     [TestClass]
     public class HtmlLoggerTests
@@ -30,20 +28,28 @@ public class HtmlLoggerTests
         private Dictionary<string, string> parameters;
         private static string DefaultTestRunDirectory = Path.GetTempPath();
         private static string DefaultLogFileNameParameterValue = "logfilevalue.trx";
+
         private Mock<IFileHelper> mockFileHelper;
+        private Mock<XmlObjectSerializer> mockXmlSerializer ;
+        private Mock<IHtmlTransformer> mockHtmlTransformer;
 
         [TestInitialize]
         public void Initialize()
         {
             this.events = new Mock<TestLoggerEvents>();
-            this.htmlLogger = new Htmllogger();
+            this.mockFileHelper = new Mock<IFileHelper>();
+            this.mockHtmlTransformer = new Mock<IHtmlTransformer>();
+            this.mockXmlSerializer = new Mock<XmlObjectSerializer>();
+            this.htmlLogger = new Htmllogger(this.mockFileHelper.Object, this.mockHtmlTransformer.Object, this.mockXmlSerializer.Object);
             this.parameters = new Dictionary<string, string>(2);
-            this.parameters[ObjectModel.DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory;
+            this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory;
             this.parameters[HtmlLoggerConstants.LogFileNameKey] = HtmlLoggerTests.DefaultLogFileNameParameterValue;
             this.htmlLogger.Initialize(this.events.Object, this.parameters);
-
-
         }
+
+        /// <summary>
+        /// if events is null initialize should throw exception
+        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfEventsIsNull()
         {
@@ -54,6 +60,9 @@ public void InitializeShouldThrowExceptionIfEventsIsNull()
                 });
         }
 
+        /// <summary>
+        /// initilaize should initialize all Properties
+        /// </summary>
         [TestMethod]
         public void InitializeShouldInitializeAllProperties()
         {
@@ -63,13 +72,13 @@ public void InitializeShouldInitializeAllProperties()
             this.htmlLogger.Initialize(events.Object, testResultDir);
 
             Assert.AreEqual(this.htmlLogger.TestResultsDirPath, testResultDir);
-            Assert.IsNotNull(this.htmlLogger.GetTestResults());
-           
-            Assert.IsNotNull(this.htmlLogger.GetResults());
+            Assert.IsNotNull(this.htmlLogger.TestResults);
+            Assert.IsNotNull(this.htmlLogger.Results);
         }
 
-        
-
+        /// <summary>
+        /// if test run directory is null the initialize should throw exception
+        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
         {
@@ -82,7 +91,9 @@ public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
                 });
         }
 
-      
+        /// <summary>
+        /// initialize should throw exception if parameters are empty
+        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfParametersAreEmpty()
         {
@@ -90,6 +101,9 @@ public void InitializeShouldThrowExceptionIfParametersAreEmpty()
             Assert.ThrowsException<ArgumentException>(() => this.htmlLogger.Initialize(events.Object, new Dictionary<string, string>()));
         }
 
+        /// <summary>
+        /// if event args is null test message handler should throw exception
+        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
         {
@@ -99,62 +113,61 @@ public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
             });
         }
 
+        /// <summary>
+        /// Test message handler should add informational messages to list of informational strings in test results
+        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
         {
             string message = "First message";
-            
             TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
-            HtmlLogger.TestResults testResults = this.CreateTestResults();
-            this.htmlLogger.SetTestResults(testResults);
+            
             this.htmlLogger.TestMessageHandler(new object(), trme);
  
-            string actualMessage = this.htmlLogger.GetTestResults().RunLevelMessageInformational.First();
-            Assert.AreEqual(message, actualMessage.ToString());
-           
+            string actualMessage = this.htmlLogger.TestResults.RunLevelMessageInformational.First();
+            Assert.AreEqual(message, actualMessage.ToString());   
         }
 
+        /// <summary>
+        /// Test message handler should add ierror and warning messages to list of error and warning strings in test results
+        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
         {
             string message = "error message";
             string message2 = "warning message";
-  
-            HtmlLogger.TestResults testResults = this.CreateTestResults();
-            this.htmlLogger.SetTestResults(testResults); 
 
             TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
             this.htmlLogger.TestMessageHandler(new object(), trme);
             TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
             this.htmlLogger.TestMessageHandler(new object(), trme2);
             
-           
-
-            Assert.AreEqual(message, this.htmlLogger.GetTestResults().RunLevelMessageErrorAndWarning.First());
-            Assert.AreEqual(2, this.htmlLogger.GetTestResults().RunLevelMessageErrorAndWarning.Count());
+            Assert.AreEqual(message, this.htmlLogger.TestResults.RunLevelMessageErrorAndWarning.First());
+            Assert.AreEqual(2, this.htmlLogger.TestResults.RunLevelMessageErrorAndWarning.Count());
         }
 
-        
-        
+        /// <summary>
+        /// Test result handler should keep track of passed failed total skipped tests summary
+        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldKeepTrackofSummary()
         {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+            TestCase passTestCase1 = CreateTestCase("Pass1");
+            TestCase passTestCase2 = CreateTestCase("Pass2");
+            TestCase failTestCase1 = CreateTestCase("Fail1");
+            TestCase skipTestCase1 = CreateTestCase("Skip1");
 
             ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+            passResult1.Outcome = TestOutcome.Passed;
 
             ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+            passResult2.Outcome = TestOutcome.Passed;
 
             ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+            failResult1.Outcome = TestOutcome.Failed;
 
             ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+            skipResult1.Outcome = TestOutcome.Skipped;
 
             Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
             Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
@@ -167,17 +180,19 @@ public void TestResultHandlerShouldKeepTrackofSummary()
             this.htmlLogger.TestResultHandler(new object(), fail1.Object);
             this.htmlLogger.TestResultHandler(new object(), skip1.Object);
 
-            Assert.AreEqual(this.htmlLogger.passTests, 2, "Passed Tests");
-            Assert.AreEqual(this.htmlLogger.failTests, 1, "Failed Tests");
-            Assert.AreEqual(this.htmlLogger.totalTests, 4, "Total Tests");
-
+            Assert.AreEqual(this.htmlLogger.PassedTests, 2, "Passed Tests");
+            Assert.AreEqual(this.htmlLogger.FailedTests, 1, "Failed Tests");
+            Assert.AreEqual(this.htmlLogger.TotalTests, 4, "Total Tests");
         }
 
+        /// <summary>
+        /// Test Result handler should set dispaly name in test result Properly
+        /// </summary>
         [TestMethod]
-        public void TestResultHandlerShouldCreateDisplayNameIfNullProperly()
+        public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
         {
             //this assert is for checking result dispalyname equals to null
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
+            TestCase passTestCase1 = CreateTestCase("Pass1");
             ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase1);
             PassTestResultExpected.DisplayName = null;
             PassTestResultExpected.TestCase.DisplayName = "abc";
@@ -191,12 +206,9 @@ public void TestResultHandlerShouldCreateDisplayNameIfNullProperly()
             passTestResultActual.resultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "abc";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.GetTestResults().Results.First().DisplayName);
-          //  Assert.AreEqual( passTestResultActual,this.htmlLogger.GetTestResults().Results.First());
-
-            //this assert is for checking result dispalyname equals to notnull
-
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestResults.Results.First().DisplayName);
+       
+            TestCase passTestCase2 = CreateTestCase("Pass1");
             ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase1);
             PassTestResultExpected.DisplayName = "def";
             PassTestResultExpected.TestCase.DisplayName = "abc";
@@ -208,42 +220,16 @@ public void TestResultHandlerShouldCreateDisplayNameIfNullProperly()
             passTestResultActual.resultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "def";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.GetTestResults().Results.Last().DisplayName);
-           // Assert.AreEqual(passTestResultActual1, this.htmlLogger.GetTestResults().Results.First());
-
-
-        }
-
-        [TestMethod]
-        public void TestResultHandlerShouldCreateDisplayNameIfNotNullProperly()
-        {
-           
-            //this assert is for checking result dispalyname equals to notnull
-
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
-            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase2);
-            PassTestResultExpected1.DisplayName = "def";
-            PassTestResultExpected1.TestCase.DisplayName = "abc";
-
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(PassTestResultExpected1);
-            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
-
-            HtmlLogger.TestResult passTestResultActual1 = new HtmlLogger.TestResult();
-            passTestResultActual1.resultOutcome = TestOutcome.Passed;
-            passTestResultActual1.DisplayName = "def";
-
-
-            Assert.AreEqual(passTestResultActual1, this.htmlLogger.GetTestResults().Results.First());
-
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestResults.Results.Last().DisplayName);           
         }
 
+        /// <summary>
+        /// Test Result Handler should create test result  properly
+        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldCreateTestResultProperly()
         {
-
-            //this assert is for checking result dispalyname equals to notnull
-
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass1");
+                TestCase passTestCase2 = CreateTestCase("Pass1");
                 passTestCase2.DisplayName = "abc";
                 passTestCase2.FullyQualifiedName = "fully";
 
@@ -251,49 +237,37 @@ public void TestResultHandlerShouldCreateTestResultProperly()
             {
                 DisplayName = "def",
                 ErrorMessage = "error message",
-                ErrorStackTrace = "Error strack trace"
+                ErrorStackTrace = "Error strack trace",
+                Duration = TimeSpan.Zero
             };
 
-
             Mock<TestResultEventArgs> eventArg = new Mock<TestResultEventArgs>(PassTestResultExpected1);
 
             this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
 
-            var result = this.htmlLogger.GetTestResults().Results.First();
-
-            Assert.AreEqual(result.Duration, "");
-            Assert.AreEqual(result.Duration, "");
-            Assert.AreEqual(result.Duration, "");
-            Assert.AreEqual(result.Duration, "");
-            Assert.AreEqual(result.Duration, "");
-
-        }
-
-
-
-        private HtmlLogger.TestResult CreateTestResult(ObjectModel.TestOutcome testoutcome,string displayName)
-        {
-
-            HtmlLogger.TestResult testResult = new HtmlLogger.TestResult();
-            testResult.resultOutcome = testoutcome;
-            testResult.DisplayName = displayName;
-            return testResult;
+            var result = this.htmlLogger.TestResults.Results.First();
+           
+            Assert.AreEqual(result.DisplayName, "def");
+            Assert.AreEqual(result.ErrorMessage, "error message");
+            Assert.AreEqual(result.ErrorStackTrace, "Error strack trace");
+            Assert.AreEqual(result.FullyQualifiedName, "fully");
+            Assert.AreEqual(result.Duration, null);
         }
 
+        /// <summary>
+        /// test result should create one test result for one resutlt event args 
+        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
         {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
-
-            HtmlLogger.TestResults testResults = this.CreateTestResults();
-            this.htmlLogger.SetTestResults(testResults);
-
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            TestCase testCase2 = CreateTestCase("TestCase2");
+            
             ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = ObjectModel.TestOutcome.Failed;
+            result1.Outcome = TestOutcome.Failed;
 
             ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = ObjectModel.TestOutcome.Passed;
+            result2.Outcome = TestOutcome.Passed;
 
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
@@ -301,15 +275,15 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.GetTestResults().GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
+            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
         }
 
         [TestMethod]
         public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
         {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
-            ObjectModel.TestCase testCase3 = CreateTestCase("TestCase3");
+           TestCase testCase1 = CreateTestCase("TestCase1");
+           TestCase testCase2 = CreateTestCase("TestCase2");
+           TestCase testCase3 = CreateTestCase("TestCase3");
 
             Guid parentExecutionId = Guid.NewGuid();
 
@@ -317,51 +291,54 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             result1.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
             result1.SetPropertyValue<Guid>(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
 
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+
+            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
+            Assert.IsNull(this.htmlLogger.TestResults.Results[0].innerTestResults,  "testhandler is adding child result correctly");
+
             ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
             result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
             result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
             ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
+            result3.Outcome = TestOutcome.Failed;
             result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
             result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
             Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Assert.AreEqual(this.htmlLogger.GetTestResults().GetTestResultscount(), 1, "testhandler is adding parent result correctly");
-            Assert.AreEqual(this.htmlLogger.GetTestResults().Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
-
-           
+            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.TestResults.Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
         }
 
+        /// <summary>
+        /// Test comple handler should set summary property in test results properly
+        /// </summary>
         [TestMethod]
         public void TestCompleteHandlerShouldKeepTackOfSummary()
         {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
-
-            HtmlLogger.TestResults testResults = this.CreateTestResults();
-            this.htmlLogger.SetTestResults(testResults);
+            TestCase passTestCase1 = CreateTestCase("Pass1");
+            TestCase passTestCase2 = CreateTestCase("Pass2");
+            TestCase failTestCase1 = CreateTestCase("Fail1");
+            TestCase skipTestCase1 = CreateTestCase("Skip1");
 
             ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+            passResult1.Outcome = TestOutcome.Passed;
 
             ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+            passResult2.Outcome = TestOutcome.Passed;
 
             ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+            failResult1.Outcome = TestOutcome.Failed;
 
             ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+            skipResult1.Outcome = TestOutcome.Skipped;
 
             Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
             Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
@@ -374,60 +351,70 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             this.htmlLogger.TestResultHandler(new object(), fail1.Object);
             this.htmlLogger.TestResultHandler(new object(), skip1.Object);
 
+            string fileName;
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
-            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.TotalTests, 4, "summary should keep track of totaltests");
-            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.FailedTests, 1, "summary should keep track of failedtests");
-            Assert.AreEqual(this.htmlLogger.GetTestResults().Summary.PassedTests, 2, "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestResults.Summary.TotalTests, 4, "summary should keep track of totaltests");
+            Assert.AreEqual(this.htmlLogger.TestResults.Summary.FailedTests, 1, "summary should keep track of failedtests");
+            Assert.AreEqual(this.htmlLogger.TestResults.Summary.PassedTests, 2, "summary should keep track of passedtests");
         }
 
+        /// <summary>
+        /// Test complete handle should create file correctly
+        /// </summary>
         [TestMethod]
-        public void TestRunInformationShouldContainUtcDateTime()
+        public void TestCompleteHandlerShouldCreateFileCorrectly()
         {
-            HtmlLogger.TestResults testResults = this.CreateTestResults();
-            this.htmlLogger.SetTestResults(testResults);
-            this.MakeTestRunComplete();
+            string fileName;
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
 
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
-            this.ValidateDateTimeInTrx(this.htmlLogger.htmlFileName,"should handle htmlfilename time to meet bounds of utc");
-            this.ValidateDateTimeInTrx(this.htmlLogger.xmlFileName, "should handle xmlfilename time to meet bounds of utc");
+            this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
         }
 
-        private void ValidateDateTimeInTrx(string htmlFileName,string error)
+        [TestMethod]
+        public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockFileHelper.Verify(x => x.WriteAllTextToFile(htmlFileName, It.IsAny<string>()), Times.Once);
-
-            //using (FileStream file = File.OpenRead(htmlFileName))
-            //{
-            //    using (XmlReader reader = XmlReader.Create(htmlFileName))
-            //    {
-            //        XDocument document = XDocument.Load(htmlFileName);
-            //        var timesNode = document.Descendants(document.Root.GetDefaultNamespace() + "Times").FirstOrDefault();
-            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("creation").FirstOrDefault().Value),error);
-            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("start").FirstOrDefault().Value),error);
-            //        var resultNode = document.Descendants(document.Root.GetDefaultNamespace() + "UnitTestResult").FirstOrDefault();
-            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("endTime").FirstOrDefault().Value),error);
-            //        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("startTime").FirstOrDefault().Value),error);
-            //    }
-            //}
+            string fileName;
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+            this.mockHtmlTransformer.Verify(x => x.Transform(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+        }
+
+        [TestMethod]
+        public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
+        {
+            string fileName;
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);          
+
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+
+            this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestResults>()), Times.Once);
+            Assert.IsTrue(htmlLogger.xmlFilePath.Contains(".xml"));
+            Assert.IsTrue(htmlLogger.htmlFilePath.Contains(".html"));
         }
 
-        private void ValidateTimeWithinUtcLimits(DateTimeOffset dateTime,string error)
+        private HtmlLogger.TestResult CreateTestResult(TestOutcome testoutcome, string displayName)
         {
-            Assert.IsTrue(dateTime.UtcDateTime.Subtract(DateTime.UtcNow) < new TimeSpan(0, 0, 0, 60),error);
+
+            HtmlLogger.TestResult testResult = new HtmlLogger.TestResult();
+            testResult.resultOutcome = testoutcome;
+            testResult.DisplayName = displayName;
+            return testResult;
         }
 
-        private HtmlLogger.TestResults CreateTestResults()
+        private TestResults CreateTestResults()
         {
-            HtmlLogger.TestResults testresults = new HtmlLogger.TestResults();
-            //testresults.Summary.PassedTests = 1;
+            TestResults testresults = new TestResults();
             return testresults;
         }
 
         private static TestCase CreateTestCase(string testCaseName)
         {
-            return new ObjectModel.TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
+            return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
         }
 
         private static TestRunCompleteEventArgs CreateTestRunCompleteEventArgs()
@@ -449,7 +436,6 @@ private static Mock<TestResultEventArgs> CreatePassTestResultEventArgsMock(strin
                     passResult.Messages.Add(message);
                 }
             }
-
             return new Mock<TestResultEventArgs>(passResult);
         }
 
@@ -461,9 +447,7 @@ private void MakeTestRunComplete()
             this.htmlLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
         }
 
-
     }
-
 }
 
 

From 0ed9a7e9777bb43a15ed287368f64c378e4eec5d Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Thu, 8 Aug 2019 19:12:28 +0530
Subject: [PATCH 04/20] Html logger acceptance Test added Resources files added
 updated packeges.json with html logger project Added exception handling and
 eqt trace logging to files

---
 .../Html.xslt                                 | 122 +++--
 .../HtmlLogger.cs                             |  87 +++-
 .../HtmlTransformer.cs                        |  16 +-
 .../IHtmlTransformer.cs                       |   2 +-
 ....TestPlatform.Extensions.HtmlLogger.csproj |  22 +-
 .../{ => ObjectModel}/TestResults.cs          |  10 +-
 .../{ => ObjectModel}/TestRunSummary.cs       |   2 +-
 .../{ => ObjectModel}/Testresult.cs           |   0
 .../Resources/Html.xslt                       | 212 ++++++++
 .../{ => Resources}/Resources.Designer.cs     |  25 +-
 .../{ => Resources}/Resources.resx            |   5 +-
 .../Resources/xlf/Resources.cs.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.de.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.es.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.fr.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.it.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.ja.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.ko.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.pl.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.pt-BR.xlf         | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.ru.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.tr.xlf            | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.xlf               | 441 +++++++++++++++++
 .../Resources/xlf/Resources.zh-Hans.xlf       | 459 ++++++++++++++++++
 .../Resources/xlf/Resources.zh-Hant.xlf       | 459 ++++++++++++++++++
 .../html.html                                 |  58 ---
 .../sample.xml                                |   2 -
 src/package/package/package.csproj            |   1 +
 .../LoggerTests.cs                            |  66 +++
 ...rosoft.TestPlatform.AcceptanceTests.csproj |   1 +
 .../TestResults.html                          |  61 +++
 ...orm.Extensions.HtmlLogger.UnitTests.csproj |   1 -
 32 files changed, 6930 insertions(+), 171 deletions(-)
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/{ => ObjectModel}/TestResults.cs (82%)
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/{ => ObjectModel}/TestRunSummary.cs (95%)
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/{ => ObjectModel}/Testresult.cs (100%)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/{ => Resources}/Resources.Designer.cs (79%)
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/{ => Resources}/Resources.resx (96%)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
 create mode 100644 test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index ecd3fc7e2a..f225e90613 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"
-    
-                xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
   <xsl:output method="html" indent="yes"/>
   <xsl:template match="/">
@@ -26,41 +25,64 @@
         #testtable {
         border-collapse: collapse;
         }
-
         #testtable, th, td {
         border: 1px solid black;
         }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
       </style>
     </html>
   </xsl:template>
 
   <xsl:template match="/tp:TestResults">
-    <h2>Summary</h2>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
     <h2>Results</h2>
     <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
   </xsl:template>
 
   <xsl:template match="/tp:TestResults/tp:Results">
-    <h3>TestResult</h3>
     <xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/>
   </xsl:template>
 
   <xsl:template match="tp:TestResults/tp:Summary">
+    <div class ="summary">
+    <h2>Summary</h2>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
     <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
+    <br/>
+    </div>
   </xsl:template>
+  
   <xsl:template match="tp:TestResult">
-    <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
-      <div>
+    <div class ="row" onclick="ToggleClass('{generate-id()}')">
+      <div >
         <xsl:apply-templates select = "tp:resultOutcome" />
         <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div  style="float:right;">
+        <div class="duration">
           <xsl:apply-templates select = "tp:Duration" />
         </div>
       </div>
-
       <xsl:if test ="tp:ErrorMessage!=''">
         <xsl:apply-templates select = "tp:ErrorMessage" />
       </xsl:if>
@@ -76,8 +98,9 @@
       <br />
     </div>
   </xsl:template>
+  
   <xsl:template match="tp:innerTestResults/tp:TestResult">
-    <div onclick="ToggleClass('{generate-id()}')" style="border:3px solid grey;cursor:pointer; width:100%;">
+    <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
       <div>
         <xsl:apply-templates select = "tp:resultOutcome" />
         <xsl:apply-templates select = "tp:FullyQualifiedName" />
@@ -93,87 +116,96 @@
       </xsl:if>
       <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <h3>innerTestResults:</h3>
+          <h3>Child Test Results:</h3>
           <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
       </xsl:if>
       <br />
     </div>
   </xsl:template>
+  
   <xsl:template match = "tp:ErrorMessage">
-    ErrorMessage: <span style = "color:brown;">
+    ErrorMessage: <span class="errorMessage">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
+  
   <xsl:template match = "tp:ErrorStackTrace">
-    ErrorStackTrace: <span style = "color:brown;">
+    ErrorStackTrace: <span class="errorStackTrace">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
+  
   <xsl:template match = "tp:FailedTests">
-    <span style = "width:10%">
-      FailedTests:
+    <span>
+      FailedTests:&#160;
     </span>
-    <span style = "color:brown;padding-right:10px;">
+    <span class="failedTests">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
+  
   <xsl:template match = "tp:PassedTests">
-    <span style = "width:10%">
-      PassedTests:
+    <span >
+      PassedTests:&#160;
     </span>
-    <span style = "color:brown;padding-right:10px;">
+    <span class="passedTests" >
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  <xsl:template match = "tp:TotalTests">
-    <span style = "width:10%">
-      TotalTests:
+  
+  <xsl:template match = "tp:SkippedTests">
+    <span >
+      SkippedTests:
+    </span>
+    <span class="skippedTests" >
+      <xsl:value-of select = "." />
     </span>
-    <span style = "color:brown;padding-right:10px;">
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:TotalTests">
+    <span >
+      TotalTests:&#160;&#160;
+  </span>
+    <span class="totalTests">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
+  
   <xsl:template match = "tp:DisplayName">
-    DisplayName:<span style = "color:brown;">
+    DisplayName:<span >
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
+  
   <xsl:template match = "tp:resultOutcome">
-    <xsl:if test ="tp:resultOutcome!='Passed'">
-      <xsl:text>  &#x2714; </xsl:text>
+    <xsl:if test =" . = 'Passed' ">
+      <span class="pass">
+        &#x2714;
+      </span>
     </xsl:if>
-    <xsl:if test ="tp:resultOutcome!='Failed'">
-      <xsl:apply-templates select = "pass" />
+    <xsl:if test =" . = 'Failed'">
+      <span class="fail">
+        &#x2718;
+      </span>
     </xsl:if>
-    <span style = "color:brown;padding-right:10px;">
-      <xsl:value-of select = "." />
-    </span>
-  </xsl:template>
-  <xsl:template match = "pass">
-    <span style = "color:brown;padding-right:10px;">
-      &#x2714;
-    </span>
-  </xsl:template>
-  <xsl:template match = "fail">
-    <span style = "color:brown;padding-right:10px;">
-      &#x2718;
-    </span>
   </xsl:template>
+  
   <xsl:template match = "tp:Duration">
-    <span style = "color:brown;">
+    <span >
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
   <xsl:template match = "tp:FullyQualifiedName">
-    <span style = "color:brown">
+    <span >
       <xsl:value-of select = "." />
     </span>
   </xsl:template>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 0e16107e6e..4bc1220472 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -3,20 +3,23 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using System.Runtime.Serialization;
-    using System.IO;
-    using System.Collections.Concurrent;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    using Microsoft.VisualStudio.TestPlatform.Utilities;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using System.Linq;
+    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Globalization;
+    using System.IO;
+    using System.Linq;
+    using System.Runtime.Serialization;
+    using System.Xml.Xsl;
+    using HtmlResource = Resources.Resources;
+    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
 
     /// <summary>
     /// Logger for generating Html log
@@ -28,6 +31,8 @@ public class Htmllogger : ITestLoggerWithParameters
         private IFileHelper filehelper;
         private XmlObjectSerializer xmlSerializer;
         private IHtmlTransformer htmlTransformer;
+        private string fileName;
+        private Dictionary<string, string> parametersDictionary;
 
         public Htmllogger()
         : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestResults)))
@@ -77,7 +82,6 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
         /// Total SkippedTests in the Results
         /// </summary>
         public int SkippedTests { get; private set; }
-        private string fileName;
         public string xmlFilePath { get; private set; }
         public string htmlFilePath { get; private set; }
 
@@ -115,7 +119,7 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
             {
                 throw new ArgumentException("No default parameters added", nameof(parameters));
             }
-    
+            this.parametersDictionary = parameters;
             this.Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
         }
 
@@ -157,10 +161,7 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             ValidateArg.NotNull<TestResultEventArgs>(e, "e");
 
             TestResult testResult = new TestResult();
-            if (e.Result.DisplayName != null)
-                testResult.DisplayName = e.Result.DisplayName;
-            else
-                testResult.DisplayName = e.Result.TestCase.DisplayName;
+            testResult.DisplayName = e.Result.DisplayName ?? e.Result.TestCase.DisplayName;
 
             testResult.FullyQualifiedName = e.Result.TestCase.FullyQualifiedName;
             testResult.Duration = GetFormattedDurationString(e.Result.Duration);
@@ -170,7 +171,6 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             var executionId = this.GetExecutionId(e.Result);
             var parentExecutionId = this.GetParentExecutionId(e.Result);
 
-            /// TODO: handle skipped tests 
             this.TotalTests++;
             testResult.resultOutcome = e.Result.Outcome;
             if (e.Result.Outcome == TestOutcome.Failed)
@@ -187,7 +187,9 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             }
 
             if (parentExecutionId == Guid.Empty)
+            {
                 TestResults.Results.Add(testResult);
+            }
 
             Results.TryAdd(executionId, testResult);
             if (parentExecutionId != Guid.Empty)
@@ -198,10 +200,13 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
 
         private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         {
+            // Needs to be tested!
             TestResult ParentTestResult;
             this.Results.TryGetValue(parentExecutionId, out ParentTestResult);
+
             if (ParentTestResult.innerTestResults == null)
                 ParentTestResult.innerTestResults = new List<TestResult>();
+
             ParentTestResult.innerTestResults.Add(testResult);
         }
 
@@ -218,21 +223,51 @@ internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                 PassedTests = this.PassedTests,
                 TotalTests = this.TotalTests
             };
+
+            if (this.parametersDictionary != null)
+            {
+                var isLogFileNameParameterExists = this.parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string logFileNameValue);
+                if (isLogFileNameParameterExists && !string.IsNullOrWhiteSpace(logFileNameValue))
+                {
+                    this.htmlFilePath = Path.Combine(this.TestResultsDirPath, logFileNameValue);
+                }
+            }
+
             this.PopulateHtmlFile();
         }
 
         private void PopulateHtmlFile()
         {
-            // TODO: Add exception handling and logging
             fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
-            xmlFilePath = this.GetFilePath("xml",fileName);
+            xmlFilePath = this.GetFilePath("xml",this.fileName);
+            Stream xmlStream = null;
 
-            Stream xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
-            xmlSerializer.WriteObject(xmlStream, TestResults);
-            xmlStream.Close();
+            try
+            {
+                xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
+                xmlSerializer.WriteObject(xmlStream, TestResults);
+                xmlStream.Close();
 
-            htmlFilePath = this.GetFilePath("html", fileName);
-            htmlTransformer.Transform(xmlFilePath, htmlFilePath);
+                if (htmlFilePath == null)
+                {
+                    htmlFilePath = this.GetFilePath("html", this.fileName);
+                }
+                htmlTransformer.Transform(xmlFilePath, htmlFilePath);
+            }
+            catch (IOException ioEx)
+            {
+                string ioexMessage = string.Format("HtmlLogger : Failed to create a xml file. Exception : {0}", ioEx.ToString());
+                EqtTrace.Error(ioexMessage);
+            }
+            catch (XsltCompileException xslte)
+            {
+                string xslteMessage = string.Format("HtmlLogger : Failed to convert xml file to html file. Exception : {0}", xslte.ToString());
+                EqtTrace.Error(xslteMessage);
+            }
+
+            string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, this.htmlFilePath);
+            EqtTrace.Info(htmlfilePathMessage);
+            ConsoleOutput.Instance.Information(false, this.htmlFilePath);
         }
 
         private string GetFilePath(string fileFormat,string FileName)
@@ -241,7 +276,6 @@ private string GetFilePath(string fileFormat,string FileName)
             return Path.Combine(this.TestResultsDirPath, string.Concat("TestResult_", FileName, fullfileformat));
         }
 
-
         private static string FormatDateTimeForRunName(DateTime timeStamp)
         {
             return timeStamp.ToString("yyyyMMdd_HHmmss", DateTimeFormatInfo.InvariantInfo);
@@ -267,14 +301,17 @@ private Guid GetExecutionId(ObjectModel.TestResult testResult)
         {
             TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
             var executionId = Guid.Empty;
+
             if (executionIdProperty != null)
+            {
                 executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+            }
 
             return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
         }
 
         /// <summary>
-        /// converts the timespan format to readable string 
+        /// Converts the timespan format to readable string 
         /// </summary>
         /// <param name="duration"></param>
         /// <returns></returns>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index 293cdba708..5627bf4569 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -1,18 +1,20 @@
 // 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.IO;
-using System.Xml;
-using System.Xml.Xsl;
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
+    using System.IO;
+    using System.Xml;
+    using System.Xml.Xsl;
+    using HtmlResources = Resources.Resources;
+
     class HtmlTransformer : IHtmlTransformer
     {
-        StringReader xsltStringReader = new StringReader(Resources.Html);
+        StringReader xsltStringReader = new StringReader(@"D:\Code\vstest\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Html.xslt");//HtmlResources.Html);
         XslCompiledTransform myXslTransform;
 
         /// <summary>
-        /// the following  function invoesthe compiled tranform and Loads the xslt file 
+        /// The following function invokes the compiled tranform and Loads the xslt file.
         /// </summary>
         public HtmlTransformer()
         {
@@ -21,9 +23,9 @@ public HtmlTransformer()
         }
 
         /// <summary>
-        ///It transforms the xmlfile to htmlfile 
+        /// It transforms the xmlfile to htmlfile.
         /// </summary>
-        public void Transform(string xmlfile,string htmlfile)
+        public void Transform(string xmlfile, string htmlfile)
         {
             myXslTransform.Transform(xmlfile, htmlfile);
         }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
index 3a19571cf9..d3a59034c1 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
@@ -6,7 +6,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public interface IHtmlTransformer
     {
         /// <summary>
-        /// It transforms the xmlfile to htmlfile 
+        /// It transforms the xmlfile to htmlfile.
         /// </summary>
         /// <param name="xmlfile"></param>
         /// <param name="htmlfile"></param>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
index 4cba3b64f1..9b369c50dc 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -10,9 +10,6 @@
     <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <!--<ItemGroup>
-    <EmbeddedResource Include="Resources\TrxResource.resx" />
-  </ItemGroup>-->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
@@ -20,7 +17,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -30,25 +27,18 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Resources.Designer.cs">
+    <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <!--<ItemGroup>
-    <Compile Update="Resources\TrxResource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>TrxResource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="Resources\TrxResource.resx">
+    <None Update="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>TrxResource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>-->
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
   </PropertyGroup>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs
similarity index 82%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs
index 4e0b09f6f6..dccd2e85f4 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestResults.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs
@@ -11,14 +11,14 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public sealed class TestResults
     {
         /// <summary>
-        /// constructor Class for testResults
+        /// Constructor Class for testResults
         /// </summary>
         public TestResults()
         {
         }
 
         /// <summary>
-        /// it has the test run summary of all test results
+        /// It has the test run summary of all test results
         /// </summary>
         [DataMember]
         internal TestRunSummary Summary { get; set; }
@@ -27,7 +27,7 @@ public TestResults()
         /// List of Run Level Message that is Informational 
         /// </summary>
         [DataMember]
-        internal List<string> RunLevelMessageInformational =  new List<string>();
+        internal List<string> RunLevelMessageInformational = new List<string>();
 
         /// <summary>
         /// List of Run Level MessageError and warnings
@@ -36,7 +36,7 @@ public TestResults()
         internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
 
         /// <summary>
-        /// List of all results in Hieracheal model
+        /// List of all results in Hierachal model
         /// </summary>
         [DataMember]
         internal List<TestResult> Results = new List<TestResult>();
@@ -47,7 +47,7 @@ public TestResults()
         /// <returns></returns>
         internal int GetTestResultscount()
         {
-            return this.Results.Count;
+            return Results.Count;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
similarity index 95%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index 71da9d0c48..78dd2cabf7 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public class TestRunSummary
     {
         /// <summary>
-        /// total tests of a testrun
+        /// Total tests of a test run
         /// </summary>
         public int TotalTests { get; set; }
 
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/Testresult.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
new file mode 100644
index 0000000000..f225e90613
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
+  <xsl:output method="html" indent="yes"/>
+  <xsl:template match="/">
+    <html>
+      <body>
+        <h1>TestResults</h1>
+        <xsl:apply-templates select ="/tp:TestResults"/>
+      </body>
+      <script language="javascript">
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      </script>
+      <style>
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      </style>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="/tp:TestResults">
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
+    <h2>Results</h2>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
+  </xsl:template>
+
+  <xsl:template match="/tp:TestResults/tp:Results">
+    <xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/>
+  </xsl:template>
+
+  <xsl:template match="tp:TestResults/tp:Summary">
+    <div class ="summary">
+    <h2>Summary</h2>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
+    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
+    <br/>
+    </div>
+  </xsl:template>
+  
+  <xsl:template match="tp:TestResult">
+    <div class ="row" onclick="ToggleClass('{generate-id()}')">
+      <div >
+        <xsl:apply-templates select = "tp:resultOutcome" />
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+        <div class="duration">
+          <xsl:apply-templates select = "tp:Duration" />
+        </div>
+      </div>
+      <xsl:if test ="tp:ErrorMessage!=''">
+        <xsl:apply-templates select = "tp:ErrorMessage" />
+      </xsl:if>
+      <xsl:if test ="tp:ErrorStackTrace!=''">
+        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+      </xsl:if>
+      <xsl:if test ="tp:innerTestResults!=''">
+        <a Id="{generate-id()}" style="display:none;">
+          <h3>Child Test Results:</h3>
+          <xsl:apply-templates select = "tp:innerTestResults" />
+        </a>
+      </xsl:if>
+      <br />
+    </div>
+  </xsl:template>
+  
+  <xsl:template match="tp:innerTestResults/tp:TestResult">
+    <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
+      <div>
+        <xsl:apply-templates select = "tp:resultOutcome" />
+        <xsl:apply-templates select = "tp:FullyQualifiedName" />
+        <div  style="float:right;">
+          <xsl:apply-templates select = "tp:Duration" />
+        </div>
+      </div>
+      <xsl:if test ="tp:ErrorMessage!=''">
+        <xsl:apply-templates select = "tp:ErrorMessage" />
+      </xsl:if>
+      <xsl:if test ="tp:ErrorStackTrace!=''">
+        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+      </xsl:if>
+      <xsl:if test ="tp:innerTestResults!=''">
+        <a Id="{generate-id()}" style="display:none;">
+          <h3>Child Test Results:</h3>
+          <xsl:apply-templates select = "tp:innerTestResults" />
+        </a>
+      </xsl:if>
+      <br />
+    </div>
+  </xsl:template>
+  
+  <xsl:template match = "tp:ErrorMessage">
+    ErrorMessage: <span class="errorMessage">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:ErrorStackTrace">
+    ErrorStackTrace: <span class="errorStackTrace">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:FailedTests">
+    <span>
+      FailedTests:&#160;
+    </span>
+    <span class="failedTests">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:PassedTests">
+    <span >
+      PassedTests:&#160;
+    </span>
+    <span class="passedTests" >
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:SkippedTests">
+    <span >
+      SkippedTests:
+    </span>
+    <span class="skippedTests" >
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:TotalTests">
+    <span >
+      TotalTests:&#160;&#160;
+  </span>
+    <span class="totalTests">
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:DisplayName">
+    DisplayName:<span >
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  
+  <xsl:template match = "tp:resultOutcome">
+    <xsl:if test =" . = 'Passed' ">
+      <span class="pass">
+        &#x2714;
+      </span>
+    </xsl:if>
+    <xsl:if test =" . = 'Failed'">
+      <span class="fail">
+        &#x2718;
+      </span>
+    </xsl:if>
+  </xsl:template>
+  
+  <xsl:template match = "tp:Duration">
+    <span >
+      <xsl:value-of select = "." />
+    </span>
+    <br />
+  </xsl:template>
+  <xsl:template match = "tp:FullyQualifiedName">
+    <span >
+      <xsl:value-of select = "." />
+    </span>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
similarity index 79%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
index 6d3930e635..dbe68194a2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger {
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Resources {
     using System;
     
     
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Resources.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -62,23 +62,30 @@ internal Resources() {
         
         /// <summary>
         ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-        ///&lt;xsl:stylesheet version=&quot;2.0&quot;
-        ///    
-        ///                xmlns:tp=&quot;http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger&quot;
-        ///                xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;
-        ///    xmlns:msxsl=&quot;urn:schemas-microsoft-com:xslt&quot; exclude-result-prefixes=&quot;msxs tp&quot;
-        ///&gt;
+        ///&lt;xsl:stylesheet version=&quot;2.0&quot;    
+        ///    xmlns:tp=&quot;http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger&quot;
+        ///    xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;
+        ///    xmlns:msxsl=&quot;urn:schemas-microsoft-com:xslt&quot; exclude-result-prefixes=&quot;msxs tp&quot;&gt;
         ///  &lt;xsl:output method=&quot;html&quot; indent=&quot;yes&quot;/&gt;
         ///  &lt;xsl:template match=&quot;/&quot;&gt;
         ///    &lt;html&gt;
         ///      &lt;body&gt;
         ///        &lt;h1&gt;TestResults&lt;/h1&gt;
-        ///        &lt;xsl:apply-templates [rest of string was truncated]&quot;;.
+        ///        &lt;xsl:apply-templates select =&quot;/tp:TestResults&quot;/&gt; [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Html {
             get {
                 return ResourceManager.GetString("Html", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Path to generated html test results file : {0}.
+        /// </summary>
+        internal static string HtmlFilePath {
+            get {
+                return ResourceManager.GetString("HtmlFilePath", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
similarity index 96%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
index 5f8e39a864..d93ad05628 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources.resx
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
@@ -119,6 +119,9 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Html" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Html.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>html.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="HtmlFilePath" xml:space="preserve">
+    <value>Path to generated html test results file : {0}</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
new file mode 100644
index 0000000000..37ad7298e8
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
new file mode 100644
index 0000000000..a8eb8b6cc7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
new file mode 100644
index 0000000000..ea13cbd968
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
new file mode 100644
index 0000000000..1cbe8db38d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
new file mode 100644
index 0000000000..3bdf08f07a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
new file mode 100644
index 0000000000..b1d2688720
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
new file mode 100644
index 0000000000..d07e1689a9
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
new file mode 100644
index 0000000000..c4e8c3c438
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
new file mode 100644
index 0000000000..59f3c0518d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
new file mode 100644
index 0000000000..6be5537af4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
new file mode 100644
index 0000000000..e771b21219
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
new file mode 100644
index 0000000000..8849b35ba5
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
@@ -0,0 +1,441 @@
+<?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="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
new file mode 100644
index 0000000000..d5cb94a9ea
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
new file mode 100644
index 0000000000..1d86779d13
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
@@ -0,0 +1,459 @@
+<?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="-508382432">
+    <header>
+      <count-group name="BlackBox wordcount">
+        <count count-type="x-wordCount">27</count>
+        <count count-type="x-adjWordCount">22.95</count>
+        <count count-type="x-curAdjWordCount">22.95</count>
+        <count count-type="x-repeatAdjWordCount">0</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">27</count>
+        <count count-type="repetition">0</count>
+      </count-group>
+    </header>
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Path to generated html test results file : {0}</source>
+        <target state="new">Obtained Html File's Path is {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="Html">
+        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</source>
+        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet version="2.0"    
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
+  &lt;xsl:output method="html" indent="yes"/&gt;
+  &lt;xsl:template match="/"&gt;
+    &lt;html&gt;
+      &lt;body&gt;
+        &lt;h1&gt;TestResults&lt;/h1&gt;
+        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
+      &lt;/body&gt;
+      &lt;script language="javascript"&gt;
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      &lt;/script&gt;
+      &lt;style&gt;
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%; 
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      &lt;/style&gt;
+    &lt;/html&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
+    &lt;h2&gt;Results&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
+  &lt;/xsl:template&gt;
+
+  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
+    &lt;div class ="summary"&gt;
+    &lt;h2&gt;Summary&lt;/h2&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+    &lt;br/&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:TestResult"&gt;
+    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
+      &lt;div &gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div class="duration"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
+    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
+      &lt;div&gt;
+        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
+        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
+        &lt;div  style="float:right;"&gt;
+          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
+        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
+      &lt;/xsl:if&gt;
+      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
+        &lt;a Id="{generate-id()}" style="display:none;"&gt;
+          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
+          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
+        &lt;/a&gt;
+      &lt;/xsl:if&gt;
+      &lt;br /&gt;
+    &lt;/div&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorMessage"&gt;
+    ErrorMessage: &lt;span class="errorMessage"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
+    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:FailedTests"&gt;
+    &lt;span&gt;
+      FailedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="failedTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:PassedTests"&gt;
+    &lt;span &gt;
+      PassedTests:&amp;#160;
+    &lt;/span&gt;
+    &lt;span class="passedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:SkippedTests"&gt;
+    &lt;span &gt;
+      SkippedTests:
+    &lt;/span&gt;
+    &lt;span class="skippedTests" &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:TotalTests"&gt;
+    &lt;span &gt;
+      TotalTests:&amp;#160;&amp;#160;
+  &lt;/span&gt;
+    &lt;span class="totalTests"&gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:DisplayName"&gt;
+    DisplayName:&lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:resultOutcome"&gt;
+    &lt;xsl:if test =" . = 'Passed' "&gt;
+      &lt;span class="pass"&gt;
+        &amp;#x2714;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+    &lt;xsl:if test =" . = 'Failed'"&gt;
+      &lt;span class="fail"&gt;
+        &amp;#x2718;
+      &lt;/span&gt;
+    &lt;/xsl:if&gt;
+  &lt;/xsl:template&gt;
+  
+  &lt;xsl:template match = "tp:Duration"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+    &lt;br /&gt;
+  &lt;/xsl:template&gt;
+  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
+    &lt;span &gt;
+      &lt;xsl:value-of select = "." /&gt;
+    &lt;/span&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
deleted file mode 100644
index 248702c5db..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/html.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-  <body>
-    <h1>TestResults</h1>
-    <h2>Summary</h2><span style="width:10%">
-      TotalTests:
-    </span><span style="color:brown;padding-right:10px;">6</span><br><span style="width:10%">
-      FailedTests:
-    </span><span style="color:brown;padding-right:10px;">2</span><br><span style="width:10%">
-      PassedTests:
-    </span><span style="color:brown;padding-right:10px;">4</span><br><h2>Results</h2>
-    <h3>TestResult</h3>
-    <div onclick="ToggleClass('ID0EE')" style="border:3px solid grey;cursor:pointer; width:100%;">
-      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod1</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT0.0058002S</span><br></div>
-      </div><br></div>
-    <div onclick="ToggleClass('ID0EP')" style="border:3px solid grey;cursor:pointer; width:100%;">
-      <div><span style="color:brown;padding-right:10px;">Failed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT1.288131S</span><br></div>
-      </div><a Id="ID0EP" style="display:none;"><h3>innerTestResults:</h3>
-        <div onclick="ToggleClass('ID0EY')" style="border:3px solid grey;cursor:pointer; width:100%;">
-          <div><span style="color:brown;padding-right:10px;">Failed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT1.2875673S</span><br></div>
-          </div>
-    ErrorMessage: <span style="color:brown;">Assert.AreEqual failed. Expected:&lt;5&gt;. Actual:&lt;4&gt;. </span><br>
-    ErrorStackTrace: <span style="color:brown;">   at UnitTestProject3.UnitTest1.TestMethod2(Int32 a, Int32 b) in C:\Users\havineet\source\repos\UnitTestProject3\UnitTestProject3\UnitTest1.cs:line 19
-</span><br><br></div>
-        <div onclick="ToggleClass('ID0EBB')" style="border:3px solid grey;cursor:pointer; width:100%;">
-          <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest1.TestMethod2</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT0.0000059S</span><br></div>
-          </div><br></div></a><br></div>
-    <div onclick="ToggleClass('ID0ENB')" style="border:3px solid grey;cursor:pointer; width:100%;">
-      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest2.TestMethod1</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT0.000227S</span><br></div>
-      </div><br></div>
-    <div onclick="ToggleClass('ID0EYB')" style="border:3px solid grey;cursor:pointer; width:100%;">
-      <div><span style="color:brown;padding-right:10px;">Passed</span><span style="color:brown">UnitTestProject3.UnitTest2.TestMethod2</span><div style="float:right;">
-    Duration:<span style="color:brown;">PT0.0000478S</span><br></div>
-      </div><br></div>
-  </body><script language="javascript">
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      </script><style>
-        #testtable {
-        border-collapse: collapse;
-        }
-
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-      </style>
-</html>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
deleted file mode 100644
index 19165bd29a..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/sample.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<TestResults xmlns="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Results><TestResult><DisplayName>TestMethod1</DisplayName><Duration>PT0.0058002S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod1</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod2</DisplayName><Duration>PT1.288131S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults><TestResult><DisplayName>Sequential numbers</DisplayName><Duration>PT1.2875673S</Duration><ErrorMessage>Assert.AreEqual failed. Expected:&lt;5&gt;. Actual:&lt;4&gt;. </ErrorMessage><ErrorStackTrace>   at UnitTestProject3.UnitTest1.TestMethod2(Int32 a, Int32 b) in C:\Users\havineet\source\repos\UnitTestProject3\UnitTestProject3\UnitTest1.cs:line 19&#xD;
-</ErrorStackTrace><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Failed</resultOutcome></TestResult><TestResult><DisplayName>equal numbers</DisplayName><Duration>PT0.0000059S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest1.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult></innerTestResults><resultOutcome>Failed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod1</DisplayName><Duration>PT0.000227S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest2.TestMethod1</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult><TestResult><DisplayName>TestMethod2</DisplayName><Duration>PT0.0000478S</Duration><ErrorMessage i:nil="true"/><ErrorStackTrace i:nil="true"/><FullyQualifiedName>UnitTestProject3.UnitTest2.TestMethod2</FullyQualifiedName><innerTestResults i:nil="true"/><resultOutcome>Passed</resultOutcome></TestResult></Results><Summary><FailedTests>2</FailedTests><PassedTests>4</PassedTests><TotalTests>6</TotalTests></Summary></TestResults>
\ No newline at end of file
diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj
index 082f23c5fa..4b39d1211e 100644
--- a/src/package/package/package.csproj
+++ b/src/package/package/package.csproj
@@ -39,6 +39,7 @@
     <ProjectReference Include="$(TestPlatformRoot)src\vstest.console\vstest.console.csproj" />
     <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
     <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
+    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
     <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
     <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
       <FromP2P>true</FromP2P>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
index 7eb8b5e08b..21b80b8064 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
@@ -8,6 +8,7 @@
 namespace Microsoft.TestPlatform.AcceptanceTests
 {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Text;
 
     [TestClass]
     public class LoggerTests : AcceptanceTestBase
@@ -32,6 +33,27 @@ public void TrxLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runn
             Assert.IsTrue(IsValidXml(trxLogFilePath), "Invalid content in Trx log file");
         }
 
+        [TestMethod]
+        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+        public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+        {
+            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
+
+            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
+            var htmlFileName = "TestResults.html";
+            arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
+            this.InvokeVsTest(arguments);
+
+            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
+            arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
+            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+            this.InvokeVsTest(arguments);
+
+            var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
+            var expectedHtmlFilePath = @"D:\Code\vstest\test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html";
+            Assert.IsTrue(IsFileAndContentEqual(htmlLogFilePath, expectedHtmlFilePath), "Invalid content in Html log file");
+        }
+
         [TestMethod]
         [NetCoreTargetFrameworkDataSource]
         public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
@@ -52,6 +74,27 @@ public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runne
             Assert.IsTrue(IsValidXml(trxLogFilePath), "Invalid content in Trx log file");
         }
 
+        [TestMethod]
+        [NetCoreTargetFrameworkDataSource]
+        public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+        {
+            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
+
+            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
+            var htmlFileName = "TestResults.html";
+            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName{htmlFileName}\"");
+            this.InvokeVsTest(arguments);
+
+            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
+            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName={htmlFileName}\"");
+            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+            this.InvokeVsTest(arguments);
+
+            var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
+            var expectedHtmlFilePath = @"D:\Code\vstest\test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html";
+            Assert.IsTrue(IsFileAndContentEqual(htmlLogFilePath, expectedHtmlFilePath), "Invalid content in Html log file");
+        }
+
         private bool IsValidXml(string xmlFilePath)
         {
             var reader = System.Xml.XmlReader.Create(File.OpenRead(xmlFilePath));
@@ -67,5 +110,28 @@ private bool IsValidXml(string xmlFilePath)
                 return false;
             }
         }
+
+        private bool IsFileAndContentEqual(string filePath,string expectedFilePath)
+        {
+            StringBuilder sb = new StringBuilder();
+            using (var sr = new StreamReader(filePath))
+            {
+                sb.Append(sr.ReadToEnd());
+            }
+            string filePathContent = sb.ToString();
+
+            StringBuilder sbExpected = new StringBuilder();
+            using (var sr = new StreamReader(filePath))
+            {
+                sbExpected.Append(sr.ReadToEnd());
+            }
+
+            string expectedFilePathContent = sb.ToString();
+
+            if (expectedFilePathContent == filePathContent)
+                return true;
+            else
+                return false;
+        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj
index a938d9ac78..928f62332f 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Microsoft.TestPlatform.AcceptanceTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
     <PackageReference Include="Chutzpah">
       <Version>$(ChutzpahAdapterVersion)</Version>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html b/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
new file mode 100644
index 0000000000..1cc7587dc5
--- /dev/null
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
@@ -0,0 +1,61 @@
+<html xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+  <body>
+    <h1>TestResults</h1>
+    <div class="summary">
+      <h2>Summary</h2><span>
+      TotalTests:  
+  </span><span class="totalTests">1</span><br><span>
+      FailedTests: 
+    </span><span class="failedTests">0</span><br><span>
+      PassedTests: 
+    </span><span class="passedTests">1</span><br><span>
+      SkippedTests:
+    </span><span class="skippedTests">0</span><br><br></div>
+    <h2>Results</h2>
+    <div class="row" onclick="ToggleClass('ID0EE')">
+      <div><span class="pass">
+        ✔
+      </span><span>SampleUnitTestProject.UnitTest1.PassingTest</span><div class="duration"><span>6ms</span><br></div>
+      </div><br></div>
+  </body><script language="javascript">
+        function ToggleClass(id) {
+        var elem = document.getElementById(id);
+        if (elem.style.display == "none") {
+        elem.style.display = "block";
+        }
+        else {
+        elem.style.display = "none";
+        }
+        }
+      </script><style>
+        #testtable {
+        border-collapse: collapse;
+        }
+        #testtable, th, td {
+        border: 1px solid black;
+        }
+        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+        h2 {
+        margin-top: 0;
+        }
+        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .row {
+        background-color: #f0f5fa;
+        cursor:pointer;
+        width:100%;
+        border:3px solid grey;
+        }
+        .innerRow{
+        background-color :#e9e1f4;
+        cursor:pointer;
+        width:100%;
+        border:3px solid grey;
+        }
+        .pass { color: #0c0; }
+        .fail { color: #c00; }
+        .errorMessage{ color : brown; }
+        .errorStackTrace{ color: brown; }
+        .duration{float:right;}
+
+      </style>
+</html>
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
index 621dc40853..f4a541a1d3 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
@@ -10,7 +10,6 @@
   <PropertyGroup>
     <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
     <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <!--<AssemblyName>Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests</AssemblyName>-->
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />

From 29aed06b1e163cce0efb1088669465337c486114 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 9 Aug 2019 10:18:21 +0530
Subject: [PATCH 05/20] incresed the file count in Tesplatform.portable and
 Testplatform nuspec files

---
 .../nuspec/Microsoft.TestPlatform.Portable.nuspec  | 14 ++++++++++++++
 src/package/nuspec/Microsoft.TestPlatform.nuspec   | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
index 81d63e9f40..a85e963bf6 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
@@ -90,6 +90,20 @@
     <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll"	target="tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll" />
+    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
     <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
     <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index de164d2d71..7401293268 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -187,6 +187,7 @@
     <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -199,6 +200,7 @@
     <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -211,6 +213,7 @@
     <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -223,6 +226,7 @@
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+        <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
@@ -277,6 +281,7 @@
     <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -289,6 +294,7 @@
     <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -301,6 +307,7 @@
     <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -313,6 +320,7 @@
     <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -325,6 +333,7 @@
     <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -337,6 +346,7 @@
     <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -349,6 +359,7 @@
     <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -361,6 +372,7 @@
     <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -377,6 +389,7 @@
     <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />
@@ -389,6 +402,7 @@
     <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.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" />

From 49ee322ec5c4b2b8e93ee490020e32e11bed0820 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 9 Aug 2019 10:55:55 +0530
Subject: [PATCH 06/20] Adding xlf files

---
 scripts/build.ps1                             |  6 ++-
 scripts/verify-nupkgs.ps1                     |  6 +--
 .../Html.xslt                                 | 40 +++++++++----------
 .../HtmlTransformer.cs                        |  2 +-
 .../Resources/Html.xslt                       | 40 +++++++++----------
 .../Resources/xlf/Resources.cs.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.de.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.es.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.fr.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.it.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.ja.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.ko.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.pl.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.pt-BR.xlf         | 40 +++++++++----------
 .../Resources/xlf/Resources.ru.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.tr.xlf            | 40 +++++++++----------
 .../Resources/xlf/Resources.xlf               | 40 +++++++++----------
 .../Resources/xlf/Resources.zh-Hans.xlf       | 40 +++++++++----------
 .../Resources/xlf/Resources.zh-Hant.xlf       | 40 +++++++++----------
 19 files changed, 328 insertions(+), 326 deletions(-)

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index c68528a0ed..032a0e57f4 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -298,7 +298,7 @@ function Publish-Package
 
     # If there are some dependencies for the logger assemblies, those need to be moved too.
     # Ideally we should just be publishing the loggers to the Extensions folder.
-    $loggers = @("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb")
+    $loggers = @("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb", "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb")
     foreach($file in $loggers) {
         Write-Verbose "Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force"
         Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force
@@ -311,6 +311,8 @@ function Publish-Package
     if($TPB_LocalizedBuild) {
         Move-Loc-Files $fullCLRPackageDir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
         Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
+        Move-Loc-Files $fullCLRPackageDir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"
+        Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"
     }
 
     # Copy Blame Datacollector to Extensions folder.
@@ -867,7 +869,7 @@ Write-Log "Test platform environment variables: "
 Get-ChildItem env: | Where-Object -FilterScript { $_.Name.StartsWith("TP_") } | Format-Table
 Write-Log "Test platform build variables: "
 Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPB_") } | Format-Table
-Install-DotNetCli
+#Install-DotNetCli
 Restore-Package
 Update-LocalizedResources
 Invoke-Build
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 84ed4d6a4e..f62fe3ae46 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -14,12 +14,12 @@ function Verify-Nuget-Packages($packageDirectory)
     Write-Log "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{"Microsoft.CodeCoverage" = 29;
                      "Microsoft.NET.Test.Sdk" = 13;
-                     "Microsoft.TestPlatform" = 422;
+                     "Microsoft.TestPlatform" = 436;
                      "Microsoft.TestPlatform.Build" = 19;
-                     "Microsoft.TestPlatform.CLI" = 301;
+                     "Microsoft.TestPlatform.CLI" = 315;
                      "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
                      "Microsoft.TestPlatform.ObjectModel" = 62;
-                     "Microsoft.TestPlatform.Portable" = 471;
+                     "Microsoft.TestPlatform.Portable" = 485;
                      "Microsoft.TestPlatform.TestHost" = 140;
                      "Microsoft.TestPlatform.TranslationLayer" = 121}
 
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index f225e90613..e7d3dedd26 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"    
+<xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
@@ -36,7 +36,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -65,15 +65,15 @@
 
   <xsl:template match="tp:TestResults/tp:Summary">
     <div class ="summary">
-    <h2>Summary</h2>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
-    <br/>
+      <h2>Summary</h2>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
+      <br/>
     </div>
   </xsl:template>
-  
+
   <xsl:template match="tp:TestResult">
     <div class ="row" onclick="ToggleClass('{generate-id()}')">
       <div >
@@ -98,7 +98,7 @@
       <br />
     </div>
   </xsl:template>
-  
+
   <xsl:template match="tp:innerTestResults/tp:TestResult">
     <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
       <div>
@@ -123,21 +123,21 @@
       <br />
     </div>
   </xsl:template>
-  
+
   <xsl:template match = "tp:ErrorMessage">
     ErrorMessage: <span class="errorMessage">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:ErrorStackTrace">
     ErrorStackTrace: <span class="errorStackTrace">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:FailedTests">
     <span>
       FailedTests:&#160;
@@ -147,7 +147,7 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:PassedTests">
     <span >
       PassedTests:&#160;
@@ -157,7 +157,7 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:SkippedTests">
     <span >
       SkippedTests:
@@ -167,24 +167,24 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:TotalTests">
     <span >
       TotalTests:&#160;&#160;
-  </span>
+    </span>
     <span class="totalTests">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:DisplayName">
     DisplayName:<span >
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:resultOutcome">
     <xsl:if test =" . = 'Passed' ">
       <span class="pass">
@@ -197,7 +197,7 @@
       </span>
     </xsl:if>
   </xsl:template>
-  
+
   <xsl:template match = "tp:Duration">
     <span >
       <xsl:value-of select = "." />
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index 5627bf4569..941d2661f3 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 
     class HtmlTransformer : IHtmlTransformer
     {
-        StringReader xsltStringReader = new StringReader(@"D:\Code\vstest\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Html.xslt");//HtmlResources.Html);
+        StringReader xsltStringReader = new StringReader(HtmlResources.Html);
         XslCompiledTransform myXslTransform;
 
         /// <summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
index f225e90613..e7d3dedd26 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"    
+<xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
@@ -36,7 +36,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -65,15 +65,15 @@
 
   <xsl:template match="tp:TestResults/tp:Summary">
     <div class ="summary">
-    <h2>Summary</h2>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
-    <br/>
+      <h2>Summary</h2>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
+      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
+      <br/>
     </div>
   </xsl:template>
-  
+
   <xsl:template match="tp:TestResult">
     <div class ="row" onclick="ToggleClass('{generate-id()}')">
       <div >
@@ -98,7 +98,7 @@
       <br />
     </div>
   </xsl:template>
-  
+
   <xsl:template match="tp:innerTestResults/tp:TestResult">
     <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
       <div>
@@ -123,21 +123,21 @@
       <br />
     </div>
   </xsl:template>
-  
+
   <xsl:template match = "tp:ErrorMessage">
     ErrorMessage: <span class="errorMessage">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:ErrorStackTrace">
     ErrorStackTrace: <span class="errorStackTrace">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:FailedTests">
     <span>
       FailedTests:&#160;
@@ -147,7 +147,7 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:PassedTests">
     <span >
       PassedTests:&#160;
@@ -157,7 +157,7 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:SkippedTests">
     <span >
       SkippedTests:
@@ -167,24 +167,24 @@
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:TotalTests">
     <span >
       TotalTests:&#160;&#160;
-  </span>
+    </span>
     <span class="totalTests">
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:DisplayName">
     DisplayName:<span >
       <xsl:value-of select = "." />
     </span>
     <br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:resultOutcome">
     <xsl:if test =" . = 'Passed' ">
       <span class="pass">
@@ -197,7 +197,7 @@
       </span>
     </xsl:if>
   </xsl:template>
-  
+
   <xsl:template match = "tp:Duration">
     <span >
       <xsl:value-of select = "." />
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
index 37ad7298e8..28d5860f8c 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
index a8eb8b6cc7..2e0749c8b0 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
index ea13cbd968..6d874d3483 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
index 1cbe8db38d..ee1c3dd6cf 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
index 3bdf08f07a..7cfac7a8be 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
index b1d2688720..8fee1e14c7 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
index d07e1689a9..f91479cead 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
index c4e8c3c438..6db6f7ba53 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
index 59f3c0518d..33884cc28f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
index 6be5537af4..79e3526cd3 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
index e771b21219..e002cea6eb 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
index 8849b35ba5..82fdc8cfae 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
@@ -9,7 +9,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -46,7 +46,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -75,15 +75,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -108,7 +108,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -133,21 +133,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -157,7 +157,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -167,7 +167,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -177,24 +177,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -207,7 +207,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
index d5cb94a9ea..0cfcdd45df 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
index 1d86779d13..05d23abc85 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
@@ -27,7 +27,7 @@
       </trans-unit>
       <trans-unit id="Html">
         <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
+&lt;xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
@@ -64,7 +64,7 @@
         .row {
         background-color: #f0f5fa;
         cursor:pointer;
-        width:100%; 
+        width:100%;
         }
         .innerRow{
         background-color :#e9e1f4;
@@ -93,15 +93,15 @@
 
   &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
     &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
+      &lt;h2&gt;Summary&lt;/h2&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
+      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
+      &lt;br/&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:TestResult"&gt;
     &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
       &lt;div &gt;
@@ -126,7 +126,7 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
     &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
       &lt;div&gt;
@@ -151,21 +151,21 @@
       &lt;br /&gt;
     &lt;/div&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorMessage"&gt;
     ErrorMessage: &lt;span class="errorMessage"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
     ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:FailedTests"&gt;
     &lt;span&gt;
       FailedTests:&amp;#160;
@@ -175,7 +175,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:PassedTests"&gt;
     &lt;span &gt;
       PassedTests:&amp;#160;
@@ -185,7 +185,7 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:SkippedTests"&gt;
     &lt;span &gt;
       SkippedTests:
@@ -195,24 +195,24 @@
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:TotalTests"&gt;
     &lt;span &gt;
       TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
+    &lt;/span&gt;
     &lt;span class="totalTests"&gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:DisplayName"&gt;
     DisplayName:&lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;
     &lt;/span&gt;
     &lt;br /&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:resultOutcome"&gt;
     &lt;xsl:if test =" . = 'Passed' "&gt;
       &lt;span class="pass"&gt;
@@ -225,7 +225,7 @@
       &lt;/span&gt;
     &lt;/xsl:if&gt;
   &lt;/xsl:template&gt;
-  
+
   &lt;xsl:template match = "tp:Duration"&gt;
     &lt;span &gt;
       &lt;xsl:value-of select = "." /&gt;

From e34d3dfd902efff64fda221fec402fbdb2bef88b Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 9 Aug 2019 11:03:25 +0530
Subject: [PATCH 07/20] Added installing dotnet-cli in build

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

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 032a0e57f4..d7aa8ef4fd 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -869,7 +869,7 @@ Write-Log "Test platform environment variables: "
 Get-ChildItem env: | Where-Object -FilterScript { $_.Name.StartsWith("TP_") } | Format-Table
 Write-Log "Test platform build variables: "
 Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPB_") } | Format-Table
-#Install-DotNetCli
+Install-DotNetCli
 Restore-Package
 Update-LocalizedResources
 Invoke-Build

From 203a717b6161e4e2399f7295764c8cb365d0086f Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 9 Aug 2019 12:27:10 +0530
Subject: [PATCH 08/20] Corrected defaultParamter:Logfile on HtmlLoggerTests

---
 .../HtmlLoggerTests.cs                                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index bc09f77677..58160c891c 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -27,7 +27,7 @@ public class HtmlLoggerTests
         private Htmllogger htmlLogger;
         private Dictionary<string, string> parameters;
         private static string DefaultTestRunDirectory = Path.GetTempPath();
-        private static string DefaultLogFileNameParameterValue = "logfilevalue.trx";
+        private static string DefaultLogFileNameParameterValue = "logfilevalue.html";
 
         private Mock<IFileHelper> mockFileHelper;
         private Mock<XmlObjectSerializer> mockXmlSerializer ;

From 62011eeb81ae4a18dd5dca9549ae75af2568f16f Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 9 Aug 2019 15:41:49 +0530
Subject: [PATCH 09/20] Changed the hardcoded folder name of testresults

---
 TestPlatform.sln                                            | 3 +++
 test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs  | 2 +-
 .../Microsoft.TestPlatform.AcceptanceTests/TestResults.html | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/TestPlatform.sln b/TestPlatform.sln
index fb47dab9d9..2e140d8990 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -42,6 +42,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{46250E12-4CF1-4051-B4A7-80C8C06E0068}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{020E15EA-731F-4667-95AF-226671E0C3AE}"
+	ProjectSection(SolutionItems) = preProject
+		test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html = test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{595BE9C1-E10F-4E50-938A-E6C248D3F950}"
 EndProject
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
index 21b80b8064..0a36b616d4 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
@@ -50,7 +50,7 @@ public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo run
             this.InvokeVsTest(arguments);
 
             var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
-            var expectedHtmlFilePath = @"D:\Code\vstest\test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html";
+            var expectedHtmlFilePath = @".\TestResults.html";
             Assert.IsTrue(IsFileAndContentEqual(htmlLogFilePath, expectedHtmlFilePath), "Invalid content in Html log file");
         }
 
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html b/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
index 1cc7587dc5..fe5d919771 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
@@ -4,7 +4,7 @@ <h1>TestResults</h1>
     <div class="summary">
       <h2>Summary</h2><span>
       TotalTests:  
-  </span><span class="totalTests">1</span><br><span>
+    </span><span class="totalTests">1</span><br><span>
       FailedTests: 
     </span><span class="failedTests">0</span><br><span>
       PassedTests: 
@@ -15,7 +15,7 @@ <h2>Results</h2>
     <div class="row" onclick="ToggleClass('ID0EE')">
       <div><span class="pass">
         ✔
-      </span><span>SampleUnitTestProject.UnitTest1.PassingTest</span><div class="duration"><span>6ms</span><br></div>
+      </span><span>SampleUnitTestProject.UnitTest1.PassingTest</span><div class="duration"><span>7ms</span><br></div>
       </div><br></div>
   </body><script language="javascript">
         function ToggleClass(id) {
@@ -43,13 +43,11 @@ <h2>Results</h2>
         background-color: #f0f5fa;
         cursor:pointer;
         width:100%;
-        border:3px solid grey;
         }
         .innerRow{
         background-color :#e9e1f4;
         cursor:pointer;
         width:100%;
-        border:3px solid grey;
         }
         .pass { color: #0c0; }
         .fail { color: #c00; }

From ff3d43d469e3111895d9e43a1d0ee83d4bf54bd5 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Mon, 12 Aug 2019 18:30:08 +0530
Subject: [PATCH 10/20] Html.xslt is added to dll

---
 scripts/build.ps1                             |   4 +-
 scripts/build.sh                              |   2 +-
 .../build/TestPlatform.Localization.targets   |   9 +-
 scripts/verify-nupkgs.ps1                     |   2 +-
 .../Microsoft.TestPlatform.Build.csproj       |   1 +
 .../HtmlLogger.cs                             |  20 +-
 .../HtmlTransformer.cs                        |   2 +-
 ....TestPlatform.Extensions.HtmlLogger.csproj |  80 ++--
 .../Resources/Resources.Designer.cs           |  21 +-
 .../Resources/Resources.resx                  |   6 +-
 .../Resources/xlf/Resources.cs.xlf            | 429 ------------------
 .../Resources/xlf/Resources.de.xlf            | 429 ------------------
 .../Resources/xlf/Resources.es.xlf            | 429 ------------------
 .../Resources/xlf/Resources.fr.xlf            | 429 ------------------
 .../Resources/xlf/Resources.it.xlf            | 429 ------------------
 .../Resources/xlf/Resources.ja.xlf            | 429 ------------------
 .../Resources/xlf/Resources.ko.xlf            | 429 ------------------
 .../Resources/xlf/Resources.pl.xlf            | 429 ------------------
 .../Resources/xlf/Resources.pt-BR.xlf         | 429 ------------------
 .../Resources/xlf/Resources.ru.xlf            | 429 ------------------
 .../Resources/xlf/Resources.tr.xlf            | 429 ------------------
 .../Resources/xlf/Resources.xlf               | 429 ------------------
 .../Resources/xlf/Resources.zh-Hans.xlf       | 429 ------------------
 .../Resources/xlf/Resources.zh-Hant.xlf       | 429 ------------------
 .../Utility/Constants.cs                      |   4 +
 .../Microsoft.TestPlatform.Portable.nuspec    |  44 +-
 .../nuspec/Microsoft.TestPlatform.nuspec      |  30 +-
 .../HtmlLoggerTests.cs                        |   4 +-
 28 files changed, 112 insertions(+), 6123 deletions(-)

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index d7aa8ef4fd..ee4471e121 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -307,7 +307,7 @@ function Publish-Package
         Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force
     }
 
-    # Move trx logger resource dlls
+    # Move logger resource dlls
     if($TPB_LocalizedBuild) {
         Move-Loc-Files $fullCLRPackageDir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
         Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
@@ -356,7 +356,7 @@ function Publish-Package
     }
 
     # Move TestHostRuntimeProvider resource dlls
-    if($TPB_LocalizedBuild) {
+    if ($TPB_LocalizedBuild) {
         Move-Loc-Files $fullCLRPackageDir $fullCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"
         Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"
     }
diff --git a/scripts/build.sh b/scripts/build.sh
index 575a9810c1..2a04c38732 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -314,7 +314,7 @@ function publish_package()
 
         # Note Note: If there are some dependencies for the logger assemblies, those need to be moved too. 
         # Ideally we should just be publishing the loggers to the Extensions folder.
-        loggers=("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb")
+        loggers=("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb" "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb")
         for i in ${loggers[@]}; do
             mv $packageDir/${i} $extensionsDir
         done
diff --git a/scripts/build/TestPlatform.Localization.targets b/scripts/build/TestPlatform.Localization.targets
index b3af85662c..4ee9a56219 100644
--- a/scripts/build/TestPlatform.Localization.targets
+++ b/scripts/build/TestPlatform.Localization.targets
@@ -29,18 +29,21 @@
   </ItemGroup>
 
   <Target Name="Localize" Condition="'$(ProductProject)' == 'true' and @(EmbeddedResource) != ''" DependsOnTargets="_CreateLocalizeXLF;_CreateLocalizeResx" />
+    <!--<Message Importance="High" Text="resources are @(EmbeddedResource)" />
+  </Target>-->
 
   <Target Name="_CreateLocalizeXLF">
+    <!--Condition="$('EmbeddedResource.EndsWith('resx')') != 'true'">-->
     <Message Importance="High" Text="Create localized xlf for '$(AssemblyName)'" />
     <CreateItem Include="@(EmbeddedResource)" AdditionalMetadata="Language=%(ResxLang.Identity)">
       <Output ItemName="LocResourceFile" TaskParameter="Include"/>
     </CreateItem>
 
     <!-- Create language based xlf files -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig'"/>
+    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig' and %(LocResourceFile.Filename) != 'html'"/>
 
     <!-- Create neutral xlf -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(EmbeddedResource.Identity) -Xlf $(ResourceDirectory)\xlf\%(EmbeddedResource.Filename).xlf" Condition="%(EmbeddedResource.Filename) != 'DefaultCodeCoverageConfig'"/>
+    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(EmbeddedResource.Identity) -Xlf $(ResourceDirectory)\xlf\%(EmbeddedResource.Filename).xlf" Condition="%(EmbeddedResource.Filename) != 'DefaultCodeCoverageConfig' and %(EmbeddedResource.Filename) != 'html'"/>
   </Target>
 
   <Target Name="_CreateLocalizeResx">
@@ -50,7 +53,7 @@
     </CreateItem>
 
     <!-- Convert language specific xlf files to resx -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe  writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig'"/>
+    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe  writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig' and %(LocResourceFile.Filename) != 'html'"/>
     <ItemGroup>
       <EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
     </ItemGroup>
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index f62fe3ae46..1901b3553e 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -19,7 +19,7 @@ function Verify-Nuget-Packages($packageDirectory)
                      "Microsoft.TestPlatform.CLI" = 315;
                      "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
                      "Microsoft.TestPlatform.ObjectModel" = 62;
-                     "Microsoft.TestPlatform.Portable" = 485;
+                     "Microsoft.TestPlatform.Portable" = 495;
                      "Microsoft.TestPlatform.TestHost" = 140;
                      "Microsoft.TestPlatform.TranslationLayer" = 121}
 
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
index d89ff11ad2..55258c0977 100644
--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
@@ -37,3 +37,4 @@
   </ItemGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
+  
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 4bc1220472..4d675760e7 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -82,8 +82,8 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
         /// Total SkippedTests in the Results
         /// </summary>
         public int SkippedTests { get; private set; }
-        public string xmlFilePath { get; private set; }
-        public string htmlFilePath { get; private set; }
+        public string XmlFilePath { get; private set; }
+        public string HtmlFilePath { get; private set; }
 
         public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
         {
@@ -229,7 +229,7 @@ internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                 var isLogFileNameParameterExists = this.parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string logFileNameValue);
                 if (isLogFileNameParameterExists && !string.IsNullOrWhiteSpace(logFileNameValue))
                 {
-                    this.htmlFilePath = Path.Combine(this.TestResultsDirPath, logFileNameValue);
+                    HtmlFilePath = Path.Combine(this.TestResultsDirPath, logFileNameValue);
                 }
             }
 
@@ -239,20 +239,20 @@ internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
         private void PopulateHtmlFile()
         {
             fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
-            xmlFilePath = this.GetFilePath("xml",this.fileName);
+            XmlFilePath = this.GetFilePath("xml",this.fileName);
             Stream xmlStream = null;
 
             try
             {
-                xmlStream = this.filehelper.GetStream(xmlFilePath, FileMode.Create);
+                xmlStream = this.filehelper.GetStream(XmlFilePath, FileMode.Create);
                 xmlSerializer.WriteObject(xmlStream, TestResults);
                 xmlStream.Close();
 
-                if (htmlFilePath == null)
+                if (HtmlFilePath == null)
                 {
-                    htmlFilePath = this.GetFilePath("html", this.fileName);
+                    HtmlFilePath = this.GetFilePath("html", this.fileName);
                 }
-                htmlTransformer.Transform(xmlFilePath, htmlFilePath);
+                htmlTransformer.Transform(XmlFilePath, HtmlFilePath);
             }
             catch (IOException ioEx)
             {
@@ -265,9 +265,9 @@ private void PopulateHtmlFile()
                 EqtTrace.Error(xslteMessage);
             }
 
-            string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, this.htmlFilePath);
+            string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
             EqtTrace.Info(htmlfilePathMessage);
-            ConsoleOutput.Instance.Information(false, this.htmlFilePath);
+            ConsoleOutput.Instance.Information(false, HtmlFilePath);
         }
 
         private string GetFilePath(string fileFormat,string FileName)
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index 941d2661f3..bfe5d971f3 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 
     class HtmlTransformer : IHtmlTransformer
     {
-        StringReader xsltStringReader = new StringReader(HtmlResources.Html);
+        StringReader xsltStringReader = new StringReader("html.xslt");
         XslCompiledTransform myXslTransform;
 
         /// <summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
index 9b369c50dc..df78c90b47 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -1,46 +1,44 @@
 <?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>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Resources\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+    <PropertyGroup>
+        <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
+    </PropertyGroup>
+    <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+    <PropertyGroup>
+        <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
+        <WarningsAsErrors>true</WarningsAsErrors>
+        <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0</TargetFrameworks>
+    </PropertyGroup>
   <ItemGroup>
-    <None Update="Resources\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </None>
+    <EmbeddedResource Include="Resources\Resources.resx" />
+    <EmbeddedResource Include="html.xslt" />
   </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+        <Reference Include="System" />
+        <Reference Include="System.Runtime" />
+        <Reference Include="System.Xml" />
+        <Reference Include="Microsoft.CSharp" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+        <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+    </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>
+    <PropertyGroup Label="Configuration">
+        <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
+    </PropertyGroup>
+    <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
index dbe68194a2..bee6e31556 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
@@ -61,26 +61,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-        ///&lt;xsl:stylesheet version=&quot;2.0&quot;    
-        ///    xmlns:tp=&quot;http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger&quot;
-        ///    xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;
-        ///    xmlns:msxsl=&quot;urn:schemas-microsoft-com:xslt&quot; exclude-result-prefixes=&quot;msxs tp&quot;&gt;
-        ///  &lt;xsl:output method=&quot;html&quot; indent=&quot;yes&quot;/&gt;
-        ///  &lt;xsl:template match=&quot;/&quot;&gt;
-        ///    &lt;html&gt;
-        ///      &lt;body&gt;
-        ///        &lt;h1&gt;TestResults&lt;/h1&gt;
-        ///        &lt;xsl:apply-templates select =&quot;/tp:TestResults&quot;/&gt; [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string Html {
-            get {
-                return ResourceManager.GetString("Html", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Path to generated html test results file : {0}.
+        ///   Looks up a localized string similar to Html test results file : {0}.
         /// </summary>
         internal static string HtmlFilePath {
             get {
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
index d93ad05628..fbd6c56715 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
@@ -117,11 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Html" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>html.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="HtmlFilePath" xml:space="preserve">
-    <value>Path to generated html test results file : {0}</value>
+    <value>Html test results file : {0}</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
index 28d5860f8c..b273dc36e9 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
index 2e0749c8b0..bf4efb143f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
index 6d874d3483..a8641bca3d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
index ee1c3dd6cf..1445b11507 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
index 7cfac7a8be..b3341aba3e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
index 8fee1e14c7..2dbb73f06f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
index f91479cead..16df6f68c1 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
index 6db6f7ba53..1db9c1341e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
index 33884cc28f..52e817d5cf 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
index 79e3526cd3..7317d6c537 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
index e002cea6eb..5c2f77585e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
index 82fdc8cfae..2fa7ff50ea 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
@@ -7,435 +7,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
index 0cfcdd45df..a50cac652b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
index 05d23abc85..0f60eb7dea 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
@@ -25,435 +25,6 @@
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="Html">
-        <source>&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-      &lt;h2&gt;Summary&lt;/h2&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-      &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-      &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</source>
-        <target state="new">&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;xsl:stylesheet version="2.0"    
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp"&gt;
-  &lt;xsl:output method="html" indent="yes"/&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;body&gt;
-        &lt;h1&gt;TestResults&lt;/h1&gt;
-        &lt;xsl:apply-templates select ="/tp:TestResults"/&gt;
-      &lt;/body&gt;
-      &lt;script language="javascript"&gt;
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      &lt;/script&gt;
-      &lt;style&gt;
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%; 
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      &lt;/style&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary"/&gt;
-    &lt;h2&gt;Results&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="/tp:TestResults/tp:Results"&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/&gt;
-  &lt;/xsl:template&gt;
-
-  &lt;xsl:template match="tp:TestResults/tp:Summary"&gt;
-    &lt;div class ="summary"&gt;
-    &lt;h2&gt;Summary&lt;/h2&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/&gt;
-    &lt;xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/&gt;
-    &lt;br/&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:TestResult"&gt;
-    &lt;div class ="row" onclick="ToggleClass('{generate-id()}')"&gt;
-      &lt;div &gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div class="duration"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match="tp:innerTestResults/tp:TestResult"&gt;
-    &lt;div class="innerRow" onclick="ToggleClass('{generate-id()}')" &gt;
-      &lt;div&gt;
-        &lt;xsl:apply-templates select = "tp:resultOutcome" /&gt;
-        &lt;xsl:apply-templates select = "tp:FullyQualifiedName" /&gt;
-        &lt;div  style="float:right;"&gt;
-          &lt;xsl:apply-templates select = "tp:Duration" /&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-      &lt;xsl:if test ="tp:ErrorMessage!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorMessage" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:ErrorStackTrace!=''"&gt;
-        &lt;xsl:apply-templates select = "tp:ErrorStackTrace" /&gt;
-      &lt;/xsl:if&gt;
-      &lt;xsl:if test ="tp:innerTestResults!=''"&gt;
-        &lt;a Id="{generate-id()}" style="display:none;"&gt;
-          &lt;h3&gt;Child Test Results:&lt;/h3&gt;
-          &lt;xsl:apply-templates select = "tp:innerTestResults" /&gt;
-        &lt;/a&gt;
-      &lt;/xsl:if&gt;
-      &lt;br /&gt;
-    &lt;/div&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorMessage"&gt;
-    ErrorMessage: &lt;span class="errorMessage"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:ErrorStackTrace"&gt;
-    ErrorStackTrace: &lt;span class="errorStackTrace"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:FailedTests"&gt;
-    &lt;span&gt;
-      FailedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="failedTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:PassedTests"&gt;
-    &lt;span &gt;
-      PassedTests:&amp;#160;
-    &lt;/span&gt;
-    &lt;span class="passedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:SkippedTests"&gt;
-    &lt;span &gt;
-      SkippedTests:
-    &lt;/span&gt;
-    &lt;span class="skippedTests" &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:TotalTests"&gt;
-    &lt;span &gt;
-      TotalTests:&amp;#160;&amp;#160;
-  &lt;/span&gt;
-    &lt;span class="totalTests"&gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:DisplayName"&gt;
-    DisplayName:&lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:resultOutcome"&gt;
-    &lt;xsl:if test =" . = 'Passed' "&gt;
-      &lt;span class="pass"&gt;
-        &amp;#x2714;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-    &lt;xsl:if test =" . = 'Failed'"&gt;
-      &lt;span class="fail"&gt;
-        &amp;#x2718;
-      &lt;/span&gt;
-    &lt;/xsl:if&gt;
-  &lt;/xsl:template&gt;
-  
-  &lt;xsl:template match = "tp:Duration"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-    &lt;br /&gt;
-  &lt;/xsl:template&gt;
-  &lt;xsl:template match = "tp:FullyQualifiedName"&gt;
-    &lt;span &gt;
-      &lt;xsl:value-of select = "." /&gt;
-    &lt;/span&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
index 86b574cdeb..e804761a5f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
@@ -18,6 +18,10 @@ internal static class Constants
         /// </summary>
         public const string FriendlyName = "Html";
 
+        public const string Xml = "xml";
+
+        public const string Html = "html";
+
         ///  /// <summary>
         /// Property Id storing the TestType.
         /// </summary>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
index a85e963bf6..4f7b4f7b13 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
@@ -90,20 +90,20 @@
     <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll"	target="tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
     <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
     <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
@@ -266,6 +266,7 @@
     <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\cs\vstest.console.resources.dll"	target="tools\netcoreapp2.1\cs\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -277,6 +278,7 @@
     <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\de\vstest.console.resources.dll"	target="tools\netcoreapp2.1\de\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -288,6 +290,7 @@
     <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\es\vstest.console.resources.dll"	target="tools\netcoreapp2.1\es\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
@@ -302,6 +305,7 @@
     <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\fr\vstest.console.resources.dll"	target="tools\netcoreapp2.1\fr\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -313,6 +317,7 @@
     <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\it\vstest.console.resources.dll"	target="tools\netcoreapp2.1\it\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -324,6 +329,7 @@
     <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\ja\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ja\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -335,6 +341,7 @@
     <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\ko\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ko\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -346,6 +353,7 @@
     <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\pl\vstest.console.resources.dll"	target="tools\netcoreapp2.1\pl\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -357,6 +365,7 @@
     <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\pt-BR\vstest.console.resources.dll"	target="tools\netcoreapp2.1\pt-BR\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -367,7 +376,8 @@
     <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\ru\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ru\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\TestHost\datacollector.exe"	target="tools\netcoreapp2.1\TestHost\datacollector.exe" />
@@ -478,6 +488,7 @@
     <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\tr\vstest.console.resources.dll"	target="tools\netcoreapp2.1\tr\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -489,6 +500,7 @@
     <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <file src="netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\zh-Hans\vstest.console.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
@@ -499,7 +511,7 @@
     <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\vstest.console.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\vstest.console.resources.dll" />
 
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index 7401293268..8fc4931941 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -64,7 +64,7 @@
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\msvcp140.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\msvcp140.dll" />
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vccorlib140.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vccorlib140.dll" />
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vcruntime140.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vcruntime140.dll" />
-    <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.html"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.html" />
+    <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.Html"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.Html" />
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.js"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.js" />
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.manifest.json"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\CallDurationView.manifest.json" />
     <file src="Intellitrace\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\plugin.js"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\WebViews\plugin.js" />
@@ -187,7 +187,7 @@
     <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -200,7 +200,7 @@
     <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -213,7 +213,7 @@
     <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+ <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -226,7 +226,7 @@
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-        <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.dll" />
+        <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
@@ -281,7 +281,7 @@
     <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+<file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -294,7 +294,7 @@
     <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+ <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -307,7 +307,7 @@
     <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+<file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -320,7 +320,7 @@
     <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+<file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -333,7 +333,7 @@
     <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+<file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -346,7 +346,7 @@
     <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -359,7 +359,7 @@
     <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -372,7 +372,7 @@
     <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+<file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -389,7 +389,7 @@
     <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
@@ -402,7 +402,7 @@
     <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
     <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$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.html.TestLogger.resources.dll" />
+    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.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" />
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 58160c891c..bf049f9f82 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -393,8 +393,8 @@ public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
             this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestResults>()), Times.Once);
-            Assert.IsTrue(htmlLogger.xmlFilePath.Contains(".xml"));
-            Assert.IsTrue(htmlLogger.htmlFilePath.Contains(".html"));
+            Assert.IsTrue(htmlLogger.XmlFilePath.Contains(".xml"));
+            Assert.IsTrue(htmlLogger.HtmlFilePath.Contains(".html"));
         }
 
         private HtmlLogger.TestResult CreateTestResult(TestOutcome testoutcome, string displayName)

From ed1fdc9593f616bdf54f0663f782fc9a2ee8aed0 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Tue, 13 Aug 2019 14:58:02 +0530
Subject: [PATCH 11/20] Changed the file name html.xslt to Html.xslt and Added
 styling in xslt

---
 .../Html.xslt                                 | 20 +++++------
 .../HtmlLogger.cs                             | 34 +++++++++----------
 .../HtmlTransformer.cs                        | 10 +++---
 ....TestPlatform.Extensions.HtmlLogger.csproj |  2 +-
 .../{TestResults.cs => TestRunDetails.cs}     |  4 +--
 .../ObjectModel/TestRunSummary.cs             |  1 +
 .../Resources/xlf/Resources.cs.xlf            |  2 +-
 .../Resources/xlf/Resources.de.xlf            |  2 +-
 .../Resources/xlf/Resources.es.xlf            |  2 +-
 .../Resources/xlf/Resources.fr.xlf            |  2 +-
 .../Resources/xlf/Resources.it.xlf            |  2 +-
 .../Resources/xlf/Resources.ja.xlf            |  2 +-
 .../Resources/xlf/Resources.ko.xlf            |  2 +-
 .../Resources/xlf/Resources.pl.xlf            |  2 +-
 .../Resources/xlf/Resources.pt-BR.xlf         |  2 +-
 .../Resources/xlf/Resources.ru.xlf            |  2 +-
 .../Resources/xlf/Resources.tr.xlf            |  2 +-
 .../Resources/xlf/Resources.xlf               |  2 +-
 .../Resources/xlf/Resources.zh-Hans.xlf       |  2 +-
 .../Resources/xlf/Resources.zh-Hant.xlf       |  2 +-
 .../Utility/Constants.cs                      |  6 ++--
 .../HtmlLoggerTests.cs                        |  6 ++--
 22 files changed, 52 insertions(+), 59 deletions(-)
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/{TestResults.cs => TestRunDetails.cs} (95%)

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index e7d3dedd26..4f5f3d2846 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -22,33 +22,29 @@
         }
       </script>
       <style>
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
         body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
         h2 {
         margin-top: 0;
         }
         .summary {background-color: #f4f4e1;font-family:monospace; }
         .row {
+        border: 3px solid #ffffff;
         background-color: #f0f5fa;
         cursor:pointer;
         width:100%;
         }
         .innerRow{
+        border: 2px solid #ffffff;
+        padding-left:1%;
+        margin-left:1%;
         background-color :#e9e1f4;
         cursor:pointer;
-        width:100%;
         }
         .pass { color: #0c0; }
         .fail { color: #c00; }
         .errorMessage{ color : brown; }
         .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
+        .duration{float:right;padding-right:1%;}
       </style>
     </html>
   </xsl:template>
@@ -91,7 +87,6 @@
       </xsl:if>
       <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <h3>Child Test Results:</h3>
           <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
       </xsl:if>
@@ -104,7 +99,7 @@
       <div>
         <xsl:apply-templates select = "tp:resultOutcome" />
         <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div  style="float:right;">
+        <div class="duration">
           <xsl:apply-templates select = "tp:Duration" />
         </div>
       </div>
@@ -116,7 +111,6 @@
       </xsl:if>
       <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <h3>Child Test Results:</h3>
           <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
       </xsl:if>
@@ -125,6 +119,7 @@
   </xsl:template>
 
   <xsl:template match = "tp:ErrorMessage">
+    &#160;&#160;
     ErrorMessage: <span class="errorMessage">
       <xsl:value-of select = "." />
     </span>
@@ -132,6 +127,7 @@
   </xsl:template>
 
   <xsl:template match = "tp:ErrorStackTrace">
+    &#160;&#160;
     ErrorStackTrace: <span class="errorStackTrace">
       <xsl:value-of select = "." />
     </span>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 4d675760e7..c32b91408d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -35,7 +35,7 @@ public class Htmllogger : ITestLoggerWithParameters
         private Dictionary<string, string> parametersDictionary;
 
         public Htmllogger()
-        : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestResults)))
+        : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestRunDetails)))
         {
         }
 
@@ -61,7 +61,7 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
         /// <summary>
         /// TestResults Stores all the Summary and the details of evrey Results in Hiearachial order.
         /// </summary>
-        public TestResults TestResults { get; private set; }
+        public TestRunDetails TestResults { get; private set; }
 
         /// <summary>
         /// Total Passed Tests in the TestResults
@@ -103,7 +103,7 @@ public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
             events.TestRunComplete += this.TestRunCompleteHandler;
 
             this.TestResultsDirPath = TestResultsDirPath;
-            this.TestResults = new TestResults();
+            this.TestResults = new TestRunDetails();
             this.Results = new ConcurrentDictionary<Guid, TestResult>();
         }
 
@@ -145,7 +145,7 @@ internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
                     TestResults.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 default:
-                    Debug.Fail("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
+                    EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
                     break;
             }
         }
@@ -201,13 +201,13 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
         private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         {
             // Needs to be tested!
-            TestResult ParentTestResult;
-            this.Results.TryGetValue(parentExecutionId, out ParentTestResult);
+            TestResult parentTestResult;
+            this.Results.TryGetValue(parentExecutionId, out parentTestResult);
 
-            if (ParentTestResult.innerTestResults == null)
-                ParentTestResult.innerTestResults = new List<TestResult>();
+            if (parentTestResult.innerTestResults == null)
+                parentTestResult.innerTestResults = new List<TestResult>();
 
-            ParentTestResult.innerTestResults.Add(testResult);
+            parentTestResult.innerTestResults.Add(testResult);
         }
 
         /// <summary>
@@ -238,8 +238,8 @@ internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
 
         private void PopulateHtmlFile()
         {
-            fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
-            XmlFilePath = this.GetFilePath("xml",this.fileName);
+            this.fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
+            XmlFilePath = this.GetFilePath(HtmlLoggerConstants.Xml,this.fileName);
             Stream xmlStream = null;
 
             try
@@ -248,26 +248,24 @@ private void PopulateHtmlFile()
                 xmlSerializer.WriteObject(xmlStream, TestResults);
                 xmlStream.Close();
 
-                if (HtmlFilePath == null)
+                if (string.IsNullOrEmpty(HtmlFilePath))
                 {
-                    HtmlFilePath = this.GetFilePath("html", this.fileName);
+                    HtmlFilePath = this.GetFilePath(HtmlLoggerConstants.Html, this.fileName);
                 }
                 htmlTransformer.Transform(XmlFilePath, HtmlFilePath);
             }
             catch (IOException ioEx)
             {
-                string ioexMessage = string.Format("HtmlLogger : Failed to create a xml file. Exception : {0}", ioEx.ToString());
-                EqtTrace.Error(ioexMessage);
+                EqtTrace.Error(string.Format("HtmlLogger : Failed to create a xml file. Exception : {0}", ioEx.ToString()));
             }
             catch (XsltCompileException xslte)
             {
-                string xslteMessage = string.Format("HtmlLogger : Failed to convert xml file to html file. Exception : {0}", xslte.ToString());
-                EqtTrace.Error(xslteMessage);
+                EqtTrace.Error(string.Format("HtmlLogger : Failed to convert xml file to html file. Exception : {0}", xslte.ToString()));
             }
 
             string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
             EqtTrace.Info(htmlfilePathMessage);
-            ConsoleOutput.Instance.Information(false, HtmlFilePath);
+            ConsoleOutput.Instance.Information(false, htmlfilePathMessage);
         }
 
         private string GetFilePath(string fileFormat,string FileName)
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index bfe5d971f3..dbba6abe80 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -3,23 +3,21 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
-    using System.IO;
     using System.Xml;
     using System.Xml.Xsl;
     using HtmlResources = Resources.Resources;
 
     class HtmlTransformer : IHtmlTransformer
     {
-        StringReader xsltStringReader = new StringReader("html.xslt");
-        XslCompiledTransform myXslTransform;
+        XslCompiledTransform xslTransform;
 
         /// <summary>
         /// The following function invokes the compiled tranform and Loads the xslt file.
         /// </summary>
         public HtmlTransformer()
         {
-            myXslTransform = new XslCompiledTransform();
-            myXslTransform.Load(XmlReader.Create(xsltStringReader));
+            xslTransform = new XslCompiledTransform();
+            xslTransform.Load(XmlReader.Create(this.GetType().Assembly.GetManifestResourceStream("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Html.xslt")));
         }
 
         /// <summary>
@@ -27,7 +25,7 @@ public HtmlTransformer()
         /// </summary>
         public void Transform(string xmlfile, string htmlfile)
         {
-            myXslTransform.Transform(xmlfile, htmlfile);
+            xslTransform.Transform(xmlfile, htmlfile);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
index df78c90b47..9025a0d8c1 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Resources.resx" />
-    <EmbeddedResource Include="html.xslt" />
+    <EmbeddedResource Include="Html.xslt" />
   </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
         <Reference Include="System" />
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
similarity index 95%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index dccd2e85f4..1c61e1c635 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResults.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -8,12 +8,12 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
     [DataContract]
     [KnownType(typeof(TestResult))]
-    public sealed class TestResults
+    public sealed class TestRunDetails
     {
         /// <summary>
         /// Constructor Class for testResults
         /// </summary>
-        public TestResults()
+        public TestRunDetails()
         {
         }
 
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index 78dd2cabf7..1c4aeb8316 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -1,5 +1,6 @@
 // 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.Extensions.HtmlLogger
 {
     public class TestRunSummary
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
index b273dc36e9..a56978a9ee 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
index bf4efb143f..5ff9cfca7f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
index a8641bca3d..fe7cdbe5db 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
index 1445b11507..93bddc0de2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
index b3341aba3e..ab6dbcd720 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
index 2dbb73f06f..896b79f62d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
index 16df6f68c1..92f75efbc2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
index 1db9c1341e..92c1eb2c85 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
index 52e817d5cf..34172d94cc 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
index 7317d6c537..b4629668c5 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
index 5c2f77585e..c5e02cd5dd 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
index 2fa7ff50ea..9c1fa7577b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
@@ -3,7 +3,7 @@
   <file datatype="xml" source-language="en" original="../Resources.resx">
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
index a50cac652b..f12b190c4e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
index 0f60eb7dea..e2b04eaeb2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
@@ -21,7 +21,7 @@
     </header>
     <body>
       <trans-unit id="HtmlFilePath">
-        <source>Path to generated html test results file : {0}</source>
+        <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
         <note></note>
       </trans-unit>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
index e804761a5f..a71c72f75b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
@@ -47,13 +47,13 @@ internal static class Constants
         /// </summary>
         public const string LogFileNameKey = "LogFileName"; 
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+      //  [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+       // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
+      //  [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index bf049f9f82..e81fc86ad9 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -392,7 +392,7 @@ public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
 
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
-            this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestResults>()), Times.Once);
+            this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestRunDetails>()), Times.Once);
             Assert.IsTrue(htmlLogger.XmlFilePath.Contains(".xml"));
             Assert.IsTrue(htmlLogger.HtmlFilePath.Contains(".html"));
         }
@@ -406,9 +406,9 @@ private HtmlLogger.TestResult CreateTestResult(TestOutcome testoutcome, string d
             return testResult;
         }
 
-        private TestResults CreateTestResults()
+        private TestRunDetails CreateTestResults()
         {
-            TestResults testresults = new TestResults();
+            TestRunDetails testresults = new TestRunDetails();
             return testresults;
         }
 

From b29505ca6fa8ec9f93dff047b2671d5168864a85 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Tue, 13 Aug 2019 18:26:05 +0530
Subject: [PATCH 12/20] TestResults changed to TestRunDetails and summary
 comments corrected

---
 .../Html.xslt                                 | 34 ++++++++--------
 .../HtmlLogger.cs                             | 38 +++++++++---------
 .../ObjectModel/TestRunDetails.cs             | 18 ++++-----
 .../ObjectModel/TestRunSummary.cs             |  8 ++--
 .../ObjectModel/Testresult.cs                 | 26 ++++++------
 .../Utility/Constants.cs                      |  3 --
 .../HtmlLoggerTests.cs                        | 40 +------------------
 ...orm.Extensions.HtmlLogger.UnitTests.csproj |  3 +-
 8 files changed, 64 insertions(+), 106 deletions(-)

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 4f5f3d2846..34871a6510 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -7,8 +7,8 @@
   <xsl:template match="/">
     <html>
       <body>
-        <h1>TestResults</h1>
-        <xsl:apply-templates select ="/tp:TestResults"/>
+        <h1>TestRunDetails</h1>
+        <xsl:apply-templates select ="/tp:TestRunDetails"/>
       </body>
       <script language="javascript">
         function ToggleClass(id) {
@@ -49,23 +49,23 @@
     </html>
   </xsl:template>
 
-  <xsl:template match="/tp:TestResults">
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
+  <xsl:template match="/tp:TestRunDetails">
+    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary"/>
     <h2>Results</h2>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
+    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results"/>
   </xsl:template>
 
-  <xsl:template match="/tp:TestResults/tp:Results">
-    <xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/>
+  <xsl:template match="/tp:TestRunDetails/tp:Results">
+    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results/tp:TestResult"/>
   </xsl:template>
 
-  <xsl:template match="tp:TestResults/tp:Summary">
+  <xsl:template match="tp:TestRunDetails/tp:Summary">
     <div class ="summary">
       <h2>Summary</h2>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
+      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalTests"/>
+      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:FailedTests"/>
+      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassedTests"/>
+      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:SkippedTests"/>
       <br/>
     </div>
   </xsl:template>
@@ -85,16 +85,16 @@
       <xsl:if test ="tp:ErrorStackTrace!=''">
         <xsl:apply-templates select = "tp:ErrorStackTrace" />
       </xsl:if>
-      <xsl:if test ="tp:innerTestResults!=''">
+      <xsl:if test ="tp:innerTestRunDetails!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestResults" />
+          <xsl:apply-templates select = "tp:innerTestRunDetails" />
         </a>
       </xsl:if>
       <br />
     </div>
   </xsl:template>
 
-  <xsl:template match="tp:innerTestResults/tp:TestResult">
+  <xsl:template match="tp:innerTestRunDetails/tp:TestResult">
     <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
       <div>
         <xsl:apply-templates select = "tp:resultOutcome" />
@@ -109,9 +109,9 @@
       <xsl:if test ="tp:ErrorStackTrace!=''">
         <xsl:apply-templates select = "tp:ErrorStackTrace" />
       </xsl:if>
-      <xsl:if test ="tp:innerTestResults!=''">
+      <xsl:if test ="tp:innerTestRunDetails!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestResults" />
+          <xsl:apply-templates select = "tp:innerTestRunDetails" />
         </a>
       </xsl:if>
       <br />
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index c32b91408d..0d6769c420 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -22,7 +22,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
 
     /// <summary>
-    /// Logger for generating Html log
+    /// Logger for generating Html.
     /// </summary>
     [FriendlyName(HtmlLoggerConstants.FriendlyName)]
     [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
@@ -46,40 +46,39 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
             this.xmlSerializer = dataContractSerializer;
         }
 
-        public string FilePath { get; private set; }
         /// <summary>
         /// Gets the directory under which default html file and test results attachements should be saved.
         /// </summary>
         public string TestResultsDirPath { get; private set; }
 
         /// <summary>
-        /// Total Results are stored in sequential order
+        /// Total results are stored in sequential order
         /// </summary>
         /// <returns></returns>
         public ConcurrentDictionary<Guid, TestResult> Results { get; private set; }
 
         /// <summary>
-        /// TestResults Stores all the Summary and the details of evrey Results in Hiearachial order.
+        /// Test results stores all the summary and the details of evrey results in hiearachial order.
         /// </summary>
         public TestRunDetails TestResults { get; private set; }
 
         /// <summary>
-        /// Total Passed Tests in the TestResults
+        /// Total passed tests in the test results.
         /// </summary>
         public int PassedTests { get; private set; }
 
         /// <summary>
-        /// Total FailedTests in the Results
+        /// Total failed tests in the test results.
         /// </summary>
         public int FailedTests { get; private set; }
 
         /// <summary>
-        /// Total Tests in the Results
+        /// Total tests in the results.
         /// </summary>
         public int TotalTests { get; private set; }
 
         /// <summary>
-        /// Total SkippedTests in the Results
+        /// Total skipped tests in the results.
         /// </summary>
         public int SkippedTests { get; private set; }
         public string XmlFilePath { get; private set; }
@@ -124,7 +123,7 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
         }
 
         /// <summary>
-        /// Handles the Message level information like warnings errors etc..
+        /// Handles the message level information like warnings, errors etc..
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -151,7 +150,7 @@ internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
         }
 
         /// <summary>
-        /// Handles the Result coming from vstest and store it in testresults 
+        /// Handles the result coming from vstest and store it in test results.
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -200,7 +199,6 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
 
         private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         {
-            // Needs to be tested!
             TestResult parentTestResult;
             this.Results.TryGetValue(parentExecutionId, out parentTestResult);
 
@@ -211,7 +209,7 @@ private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         }
 
         /// <summary>
-        /// Creates a Summary of tests and Popultes the html file by transforming the xml file with help of xslt file
+        /// Creates a summary of tests and popultes the html file by transforming the xml file with help of xslt file.
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -240,13 +238,13 @@ private void PopulateHtmlFile()
         {
             this.fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
             XmlFilePath = this.GetFilePath(HtmlLoggerConstants.Xml,this.fileName);
-            Stream xmlStream = null;
 
             try
             {
-                xmlStream = this.filehelper.GetStream(XmlFilePath, FileMode.Create);
-                xmlSerializer.WriteObject(xmlStream, TestResults);
-                xmlStream.Close();
+                using (Stream xmlStream = this.filehelper.GetStream(XmlFilePath, FileMode.Create))
+                {
+                    xmlSerializer.WriteObject(xmlStream, TestResults);
+                }
 
                 if (string.IsNullOrEmpty(HtmlFilePath))
                 {
@@ -257,10 +255,12 @@ private void PopulateHtmlFile()
             catch (IOException ioEx)
             {
                 EqtTrace.Error(string.Format("HtmlLogger : Failed to create a xml file. Exception : {0}", ioEx.ToString()));
+                return;
             }
             catch (XsltCompileException xslte)
             {
                 EqtTrace.Error(string.Format("HtmlLogger : Failed to convert xml file to html file. Exception : {0}", xslte.ToString()));
+                return;
             }
 
             string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
@@ -280,7 +280,7 @@ private static string FormatDateTimeForRunName(DateTime timeStamp)
         }
 
         /// <summary>
-        /// Gives the parent execution id of a TestResult
+        /// Gives the parent execution id of a TestResult.
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
@@ -291,7 +291,7 @@ private Guid GetParentExecutionId(ObjectModel.TestResult testResult)
         }
 
         /// <summary>
-        /// Gives the execution id of a TestResult
+        /// Gives the execution id of a TestResult.
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
@@ -309,7 +309,7 @@ private Guid GetExecutionId(ObjectModel.TestResult testResult)
         }
 
         /// <summary>
-        /// Converts the timespan format to readable string 
+        /// Converts the time span format to readable string.
         /// </summary>
         /// <param name="duration"></param>
         /// <returns></returns>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index 1c61e1c635..546496d0e5 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -1,48 +1,48 @@
 // 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.Collections.Generic;
-using System.Runtime.Serialization;
-
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+
     [DataContract]
     [KnownType(typeof(TestResult))]
     public sealed class TestRunDetails
     {
         /// <summary>
-        /// Constructor Class for testResults
+        /// Constructor Class for TestRunDetails.
         /// </summary>
         public TestRunDetails()
         {
         }
 
         /// <summary>
-        /// It has the test run summary of all test results
+        /// It has the test run summary of all TestResults.
         /// </summary>
         [DataMember]
         internal TestRunSummary Summary { get; set; }
 
         /// <summary>
-        /// List of Run Level Message that is Informational 
+        /// List of Run level message that is Informational.
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageInformational = new List<string>();
 
         /// <summary>
-        /// List of Run Level MessageError and warnings
+        /// List of Run level message error and warnings
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
 
         /// <summary>
-        /// List of all results in Hierachal model
+        /// List of all results in hierarchical model.
         /// </summary>
         [DataMember]
         internal List<TestResult> Results = new List<TestResult>();
 
         /// <summary>
-        /// Gives the count of elements that Present in the Results List
+        /// Gives the count of elements that Present in the results list.
         /// </summary>
         /// <returns></returns>
         internal int GetTestResultscount()
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index 1c4aeb8316..bea9f7af54 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -6,22 +6,22 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public class TestRunSummary
     {
         /// <summary>
-        /// Total tests of a test run
+        /// Total tests of a test run.
         /// </summary>
         public int TotalTests { get; set; }
 
         /// <summary>
-        /// Passed tests of test run
+        /// Passed tests of test run.
         /// </summary>
         public int PassedTests { get; set; }
 
         /// <summary>
-        /// Failed Tests of test run
+        /// Failed Tests of test run.
         /// </summary>
         public int FailedTests { get; set; }
 
         /// <summary>
-        /// Skipped Tests of test run
+        /// Skipped Tests of test run.
         /// </summary>
         public int SkippedTests { get; set; }
     }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
index d93adcfca6..e8440dfc21 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
@@ -1,51 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using System;
-using System.Collections.Generic;
-
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
+
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using System.Collections.Generic;
+
     public class TestResult
     {
         /// <summary>
-        /// Fully Qualified name of test result
+        /// Fully Qualified name of TestResult.
         /// </summary>
         public string FullyQualifiedName;
 
         /// <summary>
-        /// DisplayName for the Particular TestResult.It is unique for each Testresult
+        /// DisplayName for the Particular TestResult.It is unique for each TestResult.
         /// </summary>
         public string DisplayName;
 
         /// <summary>
-        /// the error stact trace of the testResult
+        /// The error stack trace of the TestResult.
         /// </summary>
         public string ErrorStackTrace;
 
         /// <summary>
-        /// error message of the testresult
+        /// Error message of the TestResult.
         /// </summary>
         public string ErrorMessage;
 
         /// <summary>
-        /// it is enum whether the testresult is passed failed or skipped  
+        /// It is enum whether the TestResult is passed failed or skipped.
         /// </summary>
         public TestOutcome resultOutcome;
 
         /// <summary>
-        /// total timespan of the testresult
+        /// Total timespan of the TestResult
         /// </summary>
         public string Duration { get; set; }
 
         /// <summary>
-        /// the list of testresults that are chioldren to the current TestResults
+        /// The list of TestResults that are children to the current TestResult.
         /// </summary>
         public List<TestResult> innerTestResults;
 
         /// <summary>
-        /// get the count of inner testresults count
+        /// Get the count of inner TestResults count.
         /// </summary>
         /// <returns></returns>
         internal int GetInnerTestResultscount()
@@ -54,7 +54,7 @@ internal int GetInnerTestResultscount()
         }
 
         /// <summary>
-        /// givest the current testresult
+        /// Gives the current TestResult.
         /// </summary>
         /// <returns></returns>
         internal TestResult GetTestResult()
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
index a71c72f75b..ae95f1d86d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
@@ -47,13 +47,10 @@ internal static class Constants
         /// </summary>
         public const string LogFileNameKey = "LogFileName"; 
 
-      //  [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
 
-       // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
 
-      //  [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index e81fc86ad9..ebe6bf5912 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -47,9 +47,6 @@ public void Initialize()
             this.htmlLogger.Initialize(this.events.Object, this.parameters);
         }
 
-        /// <summary>
-        /// if events is null initialize should throw exception
-        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfEventsIsNull()
         {
@@ -60,9 +57,6 @@ public void InitializeShouldThrowExceptionIfEventsIsNull()
                 });
         }
 
-        /// <summary>
-        /// initilaize should initialize all Properties
-        /// </summary>
         [TestMethod]
         public void InitializeShouldInitializeAllProperties()
         {
@@ -76,9 +70,6 @@ public void InitializeShouldInitializeAllProperties()
             Assert.IsNotNull(this.htmlLogger.Results);
         }
 
-        /// <summary>
-        /// if test run directory is null the initialize should throw exception
-        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
         {
@@ -91,9 +82,6 @@ public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
                 });
         }
 
-        /// <summary>
-        /// initialize should throw exception if parameters are empty
-        /// </summary>
         [TestMethod]
         public void InitializeShouldThrowExceptionIfParametersAreEmpty()
         {
@@ -101,9 +89,6 @@ public void InitializeShouldThrowExceptionIfParametersAreEmpty()
             Assert.ThrowsException<ArgumentException>(() => this.htmlLogger.Initialize(events.Object, new Dictionary<string, string>()));
         }
 
-        /// <summary>
-        /// if event args is null test message handler should throw exception
-        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
         {
@@ -113,9 +98,6 @@ public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
             });
         }
 
-        /// <summary>
-        /// Test message handler should add informational messages to list of informational strings in test results
-        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
         {
@@ -128,9 +110,6 @@ public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
             Assert.AreEqual(message, actualMessage.ToString());   
         }
 
-        /// <summary>
-        /// Test message handler should add ierror and warning messages to list of error and warning strings in test results
-        /// </summary>
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
         {
@@ -146,9 +125,6 @@ public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
             Assert.AreEqual(2, this.htmlLogger.TestResults.RunLevelMessageErrorAndWarning.Count());
         }
 
-        /// <summary>
-        /// Test result handler should keep track of passed failed total skipped tests summary
-        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldKeepTrackofSummary()
         {
@@ -185,9 +161,6 @@ public void TestResultHandlerShouldKeepTrackofSummary()
             Assert.AreEqual(this.htmlLogger.TotalTests, 4, "Total Tests");
         }
 
-        /// <summary>
-        /// Test Result handler should set dispaly name in test result Properly
-        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
         {
@@ -223,9 +196,6 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
             Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestResults.Results.Last().DisplayName);           
         }
 
-        /// <summary>
-        /// Test Result Handler should create test result  properly
-        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldCreateTestResultProperly()
         {
@@ -254,9 +224,6 @@ public void TestResultHandlerShouldCreateTestResultProperly()
             Assert.AreEqual(result.Duration, null);
         }
 
-        /// <summary>
-        /// test result should create one test result for one resutlt event args 
-        /// </summary>
         [TestMethod]
         public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
         {
@@ -317,9 +284,6 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             Assert.AreEqual(this.htmlLogger.TestResults.Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
         }
 
-        /// <summary>
-        /// Test comple handler should set summary property in test results properly
-        /// </summary>
         [TestMethod]
         public void TestCompleteHandlerShouldKeepTackOfSummary()
         {
@@ -361,9 +325,6 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             Assert.AreEqual(this.htmlLogger.TestResults.Summary.PassedTests, 2, "summary should keep track of passedtests");
         }
 
-        /// <summary>
-        /// Test complete handle should create file correctly
-        /// </summary>
         [TestMethod]
         public void TestCompleteHandlerShouldCreateFileCorrectly()
         {
@@ -375,6 +336,7 @@ public void TestCompleteHandlerShouldCreateFileCorrectly()
             this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
         }
 
+
         [TestMethod]
         public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         {
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
index f4a541a1d3..9b61960acb 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
@@ -13,8 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
-  </ItemGroup>
-  
+  </ItemGroup> 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />

From 35fcc2aa0d3c0a45fc373176958b1118870cfb91 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Wed, 14 Aug 2019 16:22:33 +0530
Subject: [PATCH 13/20] Added clickability and added test run duration and
 passing percentage

---
 .../Html.xslt                                 | 196 +++++++++++-----
 .../HtmlLogger.cs                             |  25 ++-
 .../ObjectModel/TestRunSummary.cs             |  11 +
 .../Resources/Html.xslt                       | 212 ------------------
 .../HtmlLoggerTests.cs                        |  33 +--
 5 files changed, 185 insertions(+), 292 deletions(-)
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 34871a6510..2fd3064685 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -2,12 +2,13 @@
 <xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays"            
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
   <xsl:output method="html" indent="yes"/>
   <xsl:template match="/">
     <html>
       <body>
-        <h1>TestRunDetails</h1>
+        <h1>Test run details</h1>
         <xsl:apply-templates select ="/tp:TestRunDetails"/>
       </body>
       <script language="javascript">
@@ -26,25 +27,39 @@
         h2 {
         margin-top: 0;
         }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
+        .summary {font-family:monospace;
+        display: -webkit-flex; /* Safari */
+        -webkit-flex-wrap: wrap; /* Safari 6.1+ */
+        display: flex;
+        flex-wrap: wrap;
+        }
         .row {
         border: 3px solid #ffffff;
-        background-color: #f0f5fa;
-        cursor:pointer;
         width:100%;
         }
         .innerRow{
         border: 2px solid #ffffff;
         padding-left:1%;
         margin-left:1%;
-        background-color :#e9e1f4;
+        }
+        .block{
+        width : 150px;
+        }
+        .division{
         cursor:pointer;
+        background-color:#bcdaf7;
+        }
+        .innerDivision{
+        background-color:#f0f5fa;
         }
         .pass { color: #0c0; }
         .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;padding-right:1%;}
+        .errorMessage { color : brown; }
+        .errorStackTrace { color: brown; }
+        .duration {float:right;padding-right:1%;}
+        .totalTests { font-size : 30px}
+        .testRunTime { font-size : 30px}
+        .passPercentage { font-size : 30px}
       </style>
     </html>
   </xsl:template>
@@ -58,69 +73,120 @@
   <xsl:template match="/tp:TestRunDetails/tp:Results">
     <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results/tp:TestResult"/>
   </xsl:template>
-
+  
   <xsl:template match="tp:TestRunDetails/tp:Summary">
     <div class ="summary">
-      <h2>Summary</h2>
-      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalTests"/>
-      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:FailedTests"/>
-      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassedTests"/>
-      <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:SkippedTests"/>
+      <div class ="block">
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalTests"/>
+      </div>
+      <div class ="block">
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassedTests"/>
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:FailedTests"/>
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:SkippedTests"/>
+      </div>
+      <div class ="block">
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassPercentage"/>
+      </div>
+      <div class ="block">
+        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalRunTime"/>
+      </div>
       <br/>
     </div>
   </xsl:template>
 
   <xsl:template match="tp:TestResult">
-    <div class ="row" onclick="ToggleClass('{generate-id()}')">
-      <div >
-        <xsl:apply-templates select = "tp:resultOutcome" />
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div class="duration">
-          <xsl:apply-templates select = "tp:Duration" />
-        </div>
-      </div>
-      <xsl:if test ="tp:ErrorMessage!=''">
-        <xsl:apply-templates select = "tp:ErrorMessage" />
+    <div class ="row" onclick="ToggleClass('{generate-id()}')">  
+      <xsl:if test ="tp:innerTestResults!=''">
+        <div class="division">
+          <div >
+            <xsl:apply-templates select = "tp:resultOutcome" />
+            <xsl:apply-templates select = "tp:FullyQualifiedName" />
+            <div class="duration">
+              <xsl:apply-templates select = "tp:Duration" />
+            </div>
+          </div>
+          <xsl:if test ="tp:ErrorMessage!=''">
+            <xsl:apply-templates select = "tp:ErrorMessage" />
+          </xsl:if>
+          <xsl:if test ="tp:ErrorStackTrace!=''">
+            <xsl:apply-templates select = "tp:ErrorStackTrace" />
+          </xsl:if>      
+        </div>  
       </xsl:if>
-      <xsl:if test ="tp:ErrorStackTrace!=''">
-        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+
+      <xsl:if test ="tp:innerTestResults =''">
+        <div class="innerDivision">
+          <div >
+            <xsl:apply-templates select = "tp:resultOutcome" />
+            <xsl:apply-templates select = "tp:FullyQualifiedName" />
+            <div class="duration">
+              <xsl:apply-templates select = "tp:Duration" />
+            </div>
+          </div>
+          <xsl:if test ="tp:ErrorMessage!=''">
+            <xsl:apply-templates select = "tp:ErrorMessage" />
+          </xsl:if>
+          <xsl:if test ="tp:ErrorStackTrace!=''">
+            <xsl:apply-templates select = "tp:ErrorStackTrace" />
+          </xsl:if>
+        </div>
       </xsl:if>
-      <xsl:if test ="tp:innerTestRunDetails!=''">
+    </div>  
+      <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestRunDetails" />
+          <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
       </xsl:if>
-      <br />
-    </div>
   </xsl:template>
 
-  <xsl:template match="tp:innerTestRunDetails/tp:TestResult">
-    <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
-      <div>
-        <xsl:apply-templates select = "tp:resultOutcome" />
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div class="duration">
-          <xsl:apply-templates select = "tp:Duration" />
+  <xsl:template match="tp:innerTestResults/tp:TestResult">
+    <div class ="innerRow" onclick="ToggleClass('{generate-id()}')">
+      <xsl:if test ="tp:innerTestResults!=''">
+        <div class="division">
+          <div >
+            <xsl:apply-templates select = "tp:resultOutcome" />
+            <xsl:apply-templates select = "tp:FullyQualifiedName" />
+            <div class="duration">
+              <xsl:apply-templates select = "tp:Duration" />
+            </div>
+          </div>
+          <xsl:if test ="tp:ErrorMessage!=''">
+            <xsl:apply-templates select = "tp:ErrorMessage" />
+          </xsl:if>
+          <xsl:if test ="tp:ErrorStackTrace!=''">
+            <xsl:apply-templates select = "tp:ErrorStackTrace" />
+          </xsl:if>
         </div>
-      </div>
-      <xsl:if test ="tp:ErrorMessage!=''">
-        <xsl:apply-templates select = "tp:ErrorMessage" />
       </xsl:if>
-      <xsl:if test ="tp:ErrorStackTrace!=''">
-        <xsl:apply-templates select = "tp:ErrorStackTrace" />
+
+      <xsl:if test ="tp:innerTestResults =''">
+        <div class="innerDivision">
+          <div >
+            <xsl:apply-templates select = "tp:resultOutcome" />
+            <xsl:apply-templates select = "tp:FullyQualifiedName" />
+            <div class="duration">
+              <xsl:apply-templates select = "tp:Duration" />
+            </div>
+          </div>
+          <xsl:if test ="tp:ErrorMessage!=''">
+            <xsl:apply-templates select = "tp:ErrorMessage" />
+          </xsl:if>
+          <xsl:if test ="tp:ErrorStackTrace!=''">
+            <xsl:apply-templates select = "tp:ErrorStackTrace" />
+          </xsl:if>
+        </div>
       </xsl:if>
-      <xsl:if test ="tp:innerTestRunDetails!=''">
+    </div>
+      <xsl:if test ="tp:innerTestResults!=''">
         <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestRunDetails" />
+          <xsl:apply-templates select = "tp:innerTestResults" />
         </a>
       </xsl:if>
-      <br />
-    </div>
   </xsl:template>
 
   <xsl:template match = "tp:ErrorMessage">
     &#160;&#160;
-    ErrorMessage: <span class="errorMessage">
+    Error: <span class="errorMessage">
       <xsl:value-of select = "." />
     </span>
     <br />
@@ -128,7 +194,7 @@
 
   <xsl:template match = "tp:ErrorStackTrace">
     &#160;&#160;
-    ErrorStackTrace: <span class="errorStackTrace">
+   Stack trace: <span class="errorStackTrace">
       <xsl:value-of select = "." />
     </span>
     <br />
@@ -136,7 +202,7 @@
 
   <xsl:template match = "tp:FailedTests">
     <span>
-      FailedTests:&#160;
+      Failed &#160;:&#160;
     </span>
     <span class="failedTests">
       <xsl:value-of select = "." />
@@ -146,7 +212,7 @@
 
   <xsl:template match = "tp:PassedTests">
     <span >
-      PassedTests:&#160;
+      Passed &#160;:&#160;
     </span>
     <span class="passedTests" >
       <xsl:value-of select = "." />
@@ -156,7 +222,7 @@
 
   <xsl:template match = "tp:SkippedTests">
     <span >
-      SkippedTests:
+      Skipped :&#160;
     </span>
     <span class="skippedTests" >
       <xsl:value-of select = "." />
@@ -166,18 +232,31 @@
 
   <xsl:template match = "tp:TotalTests">
     <span >
-      TotalTests:&#160;&#160;
+      Total tests
     </span>
-    <span class="totalTests">
+    <div  class="totalTests">
       <xsl:value-of select = "." />
-    </span>
+    </div>
     <br />
   </xsl:template>
 
-  <xsl:template match = "tp:DisplayName">
-    DisplayName:<span >
+  <xsl:template match = "tp:TotalRunTime">
+    <span >
+      Run duration 
+    </span>
+    <div  class="testRunTime" >
       <xsl:value-of select = "." />
+    </div>
+    <br />
+  </xsl:template>
+
+  <xsl:template match = "tp:PassPercentage">
+    <span >
+      Pass percentage
     </span>
+    <div  class="passPercentage" >
+      <xsl:value-of select = "." /> &#37;
+    </div>
     <br />
   </xsl:template>
 
@@ -192,6 +271,11 @@
         &#x2718;
       </span>
     </xsl:if>
+    <xsl:if test =" . = 'Skipped'">
+      <span class="skip">
+        &#33;
+      </span>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match = "tp:Duration">
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 0d6769c420..efdf2f2e41 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -60,7 +60,7 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
         /// <summary>
         /// Test results stores all the summary and the details of evrey results in hiearachial order.
         /// </summary>
-        public TestRunDetails TestResults { get; private set; }
+        public TestRunDetails TestRunDetails { get; private set; }
 
         /// <summary>
         /// Total passed tests in the test results.
@@ -102,7 +102,7 @@ public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
             events.TestRunComplete += this.TestRunCompleteHandler;
 
             this.TestResultsDirPath = TestResultsDirPath;
-            this.TestResults = new TestRunDetails();
+            this.TestRunDetails = new TestRunDetails();
             this.Results = new ConcurrentDictionary<Guid, TestResult>();
         }
 
@@ -135,13 +135,17 @@ internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
             switch (e.Level)
             {
                 case TestMessageLevel.Informational:
-                    TestResults.RunLevelMessageInformational.Add(e.Message);
+                    if (TestRunDetails.RunLevelMessageInformational == null)
+                    {
+                        TestRunDetails.RunLevelMessageInformational = new List<string>();
+                    }
+                    TestRunDetails.RunLevelMessageInformational.Add(e.Message);
                     break;
                 case TestMessageLevel.Warning:
-                    TestResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    TestRunDetails.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 case TestMessageLevel.Error:
-                    TestResults.RunLevelMessageErrorAndWarning.Add(e.Message);
+                    TestRunDetails.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 default:
                     EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
@@ -187,7 +191,7 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
 
             if (parentExecutionId == Guid.Empty)
             {
-                TestResults.Results.Add(testResult);
+                TestRunDetails.Results.Add(testResult);
             }
 
             Results.TryAdd(executionId, testResult);
@@ -215,12 +219,15 @@ private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
         /// <param name="e"></param>
         internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
         {
-            TestResults.Summary = new TestRunSummary
+            TestRunDetails.Summary = new TestRunSummary
             {
                 FailedTests = this.FailedTests,
                 PassedTests = this.PassedTests,
-                TotalTests = this.TotalTests
+                TotalTests = this.TotalTests,
+                SkippedTests = this.SkippedTests,
+                PassPercentage = (PassedTests * 100)/ TotalTests ,
             };
+            TestRunDetails.Summary.TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests); 
 
             if (this.parametersDictionary != null)
             {
@@ -243,7 +250,7 @@ private void PopulateHtmlFile()
             {
                 using (Stream xmlStream = this.filehelper.GetStream(XmlFilePath, FileMode.Create))
                 {
-                    xmlSerializer.WriteObject(xmlStream, TestResults);
+                    xmlSerializer.WriteObject(xmlStream, TestRunDetails);
                 }
 
                 if (string.IsNullOrEmpty(HtmlFilePath))
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index bea9f7af54..c0b4cd2b63 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -1,10 +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.
 
+using System.Runtime.Serialization;
+
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
     public class TestRunSummary
     {
+        /// <summary>
+        /// Indicates the pass percentage
+        /// </summary>
+        public int PassPercentage { get; set; }
+
+        /// <summary>
+        /// Total test run time.
+        /// </summary>
+        public string TotalRunTime { get; set; }
         /// <summary>
         /// Total tests of a test run.
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
deleted file mode 100644
index e7d3dedd26..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Html.xslt
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
-  <xsl:output method="html" indent="yes"/>
-  <xsl:template match="/">
-    <html>
-      <body>
-        <h1>TestResults</h1>
-        <xsl:apply-templates select ="/tp:TestResults"/>
-      </body>
-      <script language="javascript">
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      </script>
-      <style>
-        #testtable {
-        border-collapse: collapse;
-        }
-        #testtable, th, td {
-        border: 1px solid black;
-        }
-        body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
-        h2 {
-        margin-top: 0;
-        }
-        .summary {background-color: #f4f4e1;font-family:monospace; }
-        .row {
-        background-color: #f0f5fa;
-        cursor:pointer;
-        width:100%;
-        }
-        .innerRow{
-        background-color :#e9e1f4;
-        cursor:pointer;
-        width:100%;
-        }
-        .pass { color: #0c0; }
-        .fail { color: #c00; }
-        .errorMessage{ color : brown; }
-        .errorStackTrace{ color: brown; }
-        .duration{float:right;}
-
-      </style>
-    </html>
-  </xsl:template>
-
-  <xsl:template match="/tp:TestResults">
-    <xsl:apply-templates select ="/tp:TestResults/tp:Summary"/>
-    <h2>Results</h2>
-    <xsl:apply-templates select ="/tp:TestResults/tp:Results"/>
-  </xsl:template>
-
-  <xsl:template match="/tp:TestResults/tp:Results">
-    <xsl:apply-templates select ="/tp:TestResults/tp:Results/tp:TestResult"/>
-  </xsl:template>
-
-  <xsl:template match="tp:TestResults/tp:Summary">
-    <div class ="summary">
-      <h2>Summary</h2>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:TotalTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:FailedTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:PassedTests"/>
-      <xsl:apply-templates select ="/tp:TestResults/tp:Summary/tp:SkippedTests"/>
-      <br/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="tp:TestResult">
-    <div class ="row" onclick="ToggleClass('{generate-id()}')">
-      <div >
-        <xsl:apply-templates select = "tp:resultOutcome" />
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div class="duration">
-          <xsl:apply-templates select = "tp:Duration" />
-        </div>
-      </div>
-      <xsl:if test ="tp:ErrorMessage!=''">
-        <xsl:apply-templates select = "tp:ErrorMessage" />
-      </xsl:if>
-      <xsl:if test ="tp:ErrorStackTrace!=''">
-        <xsl:apply-templates select = "tp:ErrorStackTrace" />
-      </xsl:if>
-      <xsl:if test ="tp:innerTestResults!=''">
-        <a Id="{generate-id()}" style="display:none;">
-          <h3>Child Test Results:</h3>
-          <xsl:apply-templates select = "tp:innerTestResults" />
-        </a>
-      </xsl:if>
-      <br />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="tp:innerTestResults/tp:TestResult">
-    <div class="innerRow" onclick="ToggleClass('{generate-id()}')" >
-      <div>
-        <xsl:apply-templates select = "tp:resultOutcome" />
-        <xsl:apply-templates select = "tp:FullyQualifiedName" />
-        <div  style="float:right;">
-          <xsl:apply-templates select = "tp:Duration" />
-        </div>
-      </div>
-      <xsl:if test ="tp:ErrorMessage!=''">
-        <xsl:apply-templates select = "tp:ErrorMessage" />
-      </xsl:if>
-      <xsl:if test ="tp:ErrorStackTrace!=''">
-        <xsl:apply-templates select = "tp:ErrorStackTrace" />
-      </xsl:if>
-      <xsl:if test ="tp:innerTestResults!=''">
-        <a Id="{generate-id()}" style="display:none;">
-          <h3>Child Test Results:</h3>
-          <xsl:apply-templates select = "tp:innerTestResults" />
-        </a>
-      </xsl:if>
-      <br />
-    </div>
-  </xsl:template>
-
-  <xsl:template match = "tp:ErrorMessage">
-    ErrorMessage: <span class="errorMessage">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:ErrorStackTrace">
-    ErrorStackTrace: <span class="errorStackTrace">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:FailedTests">
-    <span>
-      FailedTests:&#160;
-    </span>
-    <span class="failedTests">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:PassedTests">
-    <span >
-      PassedTests:&#160;
-    </span>
-    <span class="passedTests" >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:SkippedTests">
-    <span >
-      SkippedTests:
-    </span>
-    <span class="skippedTests" >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:TotalTests">
-    <span >
-      TotalTests:&#160;&#160;
-    </span>
-    <span class="totalTests">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:DisplayName">
-    DisplayName:<span >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-
-  <xsl:template match = "tp:resultOutcome">
-    <xsl:if test =" . = 'Passed' ">
-      <span class="pass">
-        &#x2714;
-      </span>
-    </xsl:if>
-    <xsl:if test =" . = 'Failed'">
-      <span class="fail">
-        &#x2718;
-      </span>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match = "tp:Duration">
-    <span >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
-  </xsl:template>
-  <xsl:template match = "tp:FullyQualifiedName">
-    <span >
-      <xsl:value-of select = "." />
-    </span>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index ebe6bf5912..2a14fa1af3 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -66,7 +66,7 @@ public void InitializeShouldInitializeAllProperties()
             this.htmlLogger.Initialize(events.Object, testResultDir);
 
             Assert.AreEqual(this.htmlLogger.TestResultsDirPath, testResultDir);
-            Assert.IsNotNull(this.htmlLogger.TestResults);
+            Assert.IsNotNull(this.htmlLogger.TestRunDetails);
             Assert.IsNotNull(this.htmlLogger.Results);
         }
 
@@ -106,7 +106,7 @@ public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
             
             this.htmlLogger.TestMessageHandler(new object(), trme);
  
-            string actualMessage = this.htmlLogger.TestResults.RunLevelMessageInformational.First();
+            string actualMessage = this.htmlLogger.TestRunDetails.RunLevelMessageInformational.First();
             Assert.AreEqual(message, actualMessage.ToString());   
         }
 
@@ -121,8 +121,8 @@ public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
             TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
             this.htmlLogger.TestMessageHandler(new object(), trme2);
             
-            Assert.AreEqual(message, this.htmlLogger.TestResults.RunLevelMessageErrorAndWarning.First());
-            Assert.AreEqual(2, this.htmlLogger.TestResults.RunLevelMessageErrorAndWarning.Count());
+            Assert.AreEqual(message, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.First());
+            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.Count());
         }
 
         [TestMethod]
@@ -179,7 +179,7 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
             passTestResultActual.resultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "abc";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestResults.Results.First().DisplayName);
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.First().DisplayName);
        
             TestCase passTestCase2 = CreateTestCase("Pass1");
             ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase1);
@@ -193,7 +193,7 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
             passTestResultActual.resultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "def";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestResults.Results.Last().DisplayName);           
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.Last().DisplayName);           
         }
 
         [TestMethod]
@@ -215,7 +215,7 @@ public void TestResultHandlerShouldCreateTestResultProperly()
 
             this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
 
-            var result = this.htmlLogger.TestResults.Results.First();
+            var result = this.htmlLogger.TestRunDetails.Results.First();
            
             Assert.AreEqual(result.DisplayName, "def");
             Assert.AreEqual(result.ErrorMessage, "error message");
@@ -242,7 +242,7 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
         }
 
         [TestMethod]
@@ -262,8 +262,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestResults.Results[0].innerTestResults,  "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
+            Assert.IsNull(this.htmlLogger.TestRunDetails.Results[0].innerTestResults,  "testhandler is adding child result correctly");
 
             ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
             result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
@@ -280,8 +280,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestResults.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
-            Assert.AreEqual(this.htmlLogger.TestResults.Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
         }
 
         [TestMethod]
@@ -320,9 +320,12 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
 
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
-            Assert.AreEqual(this.htmlLogger.TestResults.Summary.TotalTests, 4, "summary should keep track of totaltests");
-            Assert.AreEqual(this.htmlLogger.TestResults.Summary.FailedTests, 1, "summary should keep track of failedtests");
-            Assert.AreEqual(this.htmlLogger.TestResults.Summary.PassedTests, 2, "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalTests, 4, "summary should keep track of totaltests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.FailedTests, 1, "summary should keep track of failedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassedTests, 2, "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.SkippedTests, 1, "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassPercentage, 50, "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, null , "summary should keep track of passedtests");
         }
 
         [TestMethod]

From 7fdf5e452c3c3a427b28d4d7ebcc0eaeb433a435 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Mon, 19 Aug 2019 22:14:35 +0530
Subject: [PATCH 14/20] redundant code in xslt is removed and acceptanece test
 is corrected

---
 .../Html.xslt                                 | 212 ++++--------------
 .../HtmlLogger.cs                             |   8 +-
 .../ObjectModel/TestRunDetails.cs             |  17 +-
 .../ObjectModel/TestRunSummary.cs             |   1 +
 .../ObjectModel/Testresult.cs                 |  42 +---
 .../LoggerTests.cs                            |  24 +-
 .../HtmlLoggerTests.cs                        |  38 +++-
 7 files changed, 105 insertions(+), 237 deletions(-)

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 2fd3064685..04e44f1f53 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -34,13 +34,16 @@
         flex-wrap: wrap;
         }
         .row {
-        border: 3px solid #ffffff;
+        border: 2px solid #ffffff;
         width:100%;
+        cursor:pointer;
+        background-color:#bcdaf7;
         }
         .innerRow{
         border: 2px solid #ffffff;
         padding-left:1%;
         margin-left:1%;
+        background-color:#ffffff;
         }
         .block{
         width : 150px;
@@ -50,7 +53,8 @@
         background-color:#bcdaf7;
         }
         .innerDivision{
-        background-color:#f0f5fa;
+        border: 2px solid #ffffff;
+        background-color:#e0f0ff;
         }
         .pass { color: #0c0; }
         .fail { color: #c00; }
@@ -70,10 +74,6 @@
     <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results"/>
   </xsl:template>
 
-  <xsl:template match="/tp:TestRunDetails/tp:Results">
-    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results/tp:TestResult"/>
-  </xsl:template>
-  
   <xsl:template match="tp:TestRunDetails/tp:Summary">
     <div class ="summary">
       <div class ="block">
@@ -94,199 +94,79 @@
     </div>
   </xsl:template>
 
-  <xsl:template match="tp:TestResult">
-    <div class ="row" onclick="ToggleClass('{generate-id()}')">  
-      <xsl:if test ="tp:innerTestResults!=''">
-        <div class="division">
-          <div >
-            <xsl:apply-templates select = "tp:resultOutcome" />
-            <xsl:apply-templates select = "tp:FullyQualifiedName" />
-            <div class="duration">
-              <xsl:apply-templates select = "tp:Duration" />
-            </div>
-          </div>
-          <xsl:if test ="tp:ErrorMessage!=''">
-            <xsl:apply-templates select = "tp:ErrorMessage" />
-          </xsl:if>
-          <xsl:if test ="tp:ErrorStackTrace!=''">
-            <xsl:apply-templates select = "tp:ErrorStackTrace" />
-          </xsl:if>      
-        </div>  
-      </xsl:if>
-
-      <xsl:if test ="tp:innerTestResults =''">
-        <div class="innerDivision">
-          <div >
-            <xsl:apply-templates select = "tp:resultOutcome" />
-            <xsl:apply-templates select = "tp:FullyQualifiedName" />
-            <div class="duration">
-              <xsl:apply-templates select = "tp:Duration" />
-            </div>
-          </div>
-          <xsl:if test ="tp:ErrorMessage!=''">
-            <xsl:apply-templates select = "tp:ErrorMessage" />
-          </xsl:if>
-          <xsl:if test ="tp:ErrorStackTrace!=''">
-            <xsl:apply-templates select = "tp:ErrorStackTrace" />
-          </xsl:if>
-        </div>
-      </xsl:if>
-    </div>  
-      <xsl:if test ="tp:innerTestResults!=''">
-        <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestResults" />
-        </a>
-      </xsl:if>
+  <xsl:template match="/tp:TestRunDetails/tp:Results">
+    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results/tp:TestResult"/>
   </xsl:template>
 
-  <xsl:template match="tp:innerTestResults/tp:TestResult">
-    <div class ="innerRow" onclick="ToggleClass('{generate-id()}')">
-      <xsl:if test ="tp:innerTestResults!=''">
-        <div class="division">
-          <div >
-            <xsl:apply-templates select = "tp:resultOutcome" />
-            <xsl:apply-templates select = "tp:FullyQualifiedName" />
-            <div class="duration">
-              <xsl:apply-templates select = "tp:Duration" />
-            </div>
-          </div>
-          <xsl:if test ="tp:ErrorMessage!=''">
-            <xsl:apply-templates select = "tp:ErrorMessage" />
-          </xsl:if>
-          <xsl:if test ="tp:ErrorStackTrace!=''">
-            <xsl:apply-templates select = "tp:ErrorStackTrace" />
-          </xsl:if>
-        </div>
-      </xsl:if>
+  <xsl:template match="tp:TestResult">  
+    <xsl:if test ="tp:InnerTestResults!=''">
+      <div class ="row" onclick="ToggleClass('{generate-id()}')"><xsl:call-template name = "Result" /></div>
+      <a Id="{generate-id()}" style="display:none;"><xsl:apply-templates select = "tp:InnerTestResults" /></a>
+    </xsl:if> 
+    
+    <xsl:if test ="tp:InnerTestResults=''">
+      <div class ="innerDivision"><xsl:call-template name = "Result" /></div>
+    </xsl:if>   
+    
+  </xsl:template>
+  
+  <xsl:template match="tp:InnerTestResults">
+    <div class ="innerRow"><xsl:apply-templates select = "tp:TestResult" /></div>
+  </xsl:template>
 
-      <xsl:if test ="tp:innerTestResults =''">
-        <div class="innerDivision">
-          <div >
-            <xsl:apply-templates select = "tp:resultOutcome" />
-            <xsl:apply-templates select = "tp:FullyQualifiedName" />
-            <div class="duration">
-              <xsl:apply-templates select = "tp:Duration" />
-            </div>
-          </div>
-          <xsl:if test ="tp:ErrorMessage!=''">
-            <xsl:apply-templates select = "tp:ErrorMessage" />
-          </xsl:if>
-          <xsl:if test ="tp:ErrorStackTrace!=''">
-            <xsl:apply-templates select = "tp:ErrorStackTrace" />
-          </xsl:if>
-        </div>
-      </xsl:if>
+<xsl:template name="Result" >
+    <div >
+      <xsl:apply-templates select = "tp:ResultOutcome"/>
+      <xsl:apply-templates select = "tp:FullyQualifiedName" />
+      <div class="duration"><xsl:apply-templates select = "tp:Duration" /></div>
     </div>
-      <xsl:if test ="tp:innerTestResults!=''">
-        <a Id="{generate-id()}" style="display:none;">
-          <xsl:apply-templates select = "tp:innerTestResults" />
-        </a>
-      </xsl:if>
+    <xsl:if test ="tp:ErrorMessage!=''"><xsl:apply-templates select = "tp:ErrorMessage" /></xsl:if>
+    <xsl:if test ="tp:ErrorStackTrace!=''"><xsl:apply-templates select = "tp:ErrorStackTrace" /></xsl:if>
   </xsl:template>
-
+  
   <xsl:template match = "tp:ErrorMessage">
-    &#160;&#160;
-    Error: <span class="errorMessage">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    &#160;&#160;&#160;&#160;Error: <span class="errorMessage"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:ErrorStackTrace">
-    &#160;&#160;
-   Stack trace: <span class="errorStackTrace">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    &#160;&#160;&#160;&#160;Stack trace: <span class="errorStackTrace"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:FailedTests">
-    <span>
-      Failed &#160;:&#160;
-    </span>
-    <span class="failedTests">
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    <span>Failed &#160;:&#160;</span><span class="failedTests"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:PassedTests">
-    <span >
-      Passed &#160;:&#160;
-    </span>
-    <span class="passedTests" >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    <span>Passed &#160;:&#160;</span><span class="passedTests" ><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:SkippedTests">
-    <span >
-      Skipped :&#160;
-    </span>
-    <span class="skippedTests" >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    <span>Skipped :&#160;</span><span class="skippedTests" ><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:TotalTests">
-    <span >
-      Total tests
-    </span>
-    <div  class="totalTests">
-      <xsl:value-of select = "." />
-    </div>
-    <br />
+    <span>Total tests</span><div  class="totalTests"><xsl:value-of select = "." /></div><br />
   </xsl:template>
 
   <xsl:template match = "tp:TotalRunTime">
-    <span >
-      Run duration 
-    </span>
-    <div  class="testRunTime" >
-      <xsl:value-of select = "." />
-    </div>
-    <br />
+    <span>Run duration</span><div  class="testRunTime" ><xsl:value-of select = "." /></div><br />
   </xsl:template>
 
   <xsl:template match = "tp:PassPercentage">
-    <span >
-      Pass percentage
-    </span>
-    <div  class="passPercentage" >
-      <xsl:value-of select = "." /> &#37;
-    </div>
-    <br />
+    <span>Pass percentage</span><div  class="passPercentage" ><xsl:value-of select = "." /> &#37;</div><br />
   </xsl:template>
 
-  <xsl:template match = "tp:resultOutcome">
-    <xsl:if test =" . = 'Passed' ">
-      <span class="pass">
-        &#x2714;
-      </span>
-    </xsl:if>
-    <xsl:if test =" . = 'Failed'">
-      <span class="fail">
-        &#x2718;
-      </span>
-    </xsl:if>
-    <xsl:if test =" . = 'Skipped'">
-      <span class="skip">
-        &#33;
-      </span>
-    </xsl:if>
+  <xsl:template match = "tp:ResultOutcome">
+    <xsl:if test =" . = 'Passed' "><span class="pass">&#x2714;</span></xsl:if>
+    <xsl:if test =" . = 'Failed'"><span class="fail">&#x2718;</span></xsl:if>
+    <xsl:if test =" . = 'Skipped'"><span class="skip">&#33;</span></xsl:if>
   </xsl:template>
 
   <xsl:template match = "tp:Duration">
-    <span >
-      <xsl:value-of select = "." />
-    </span>
-    <br />
+    <span><xsl:value-of select = "." /></span><br />
   </xsl:template>
+  
   <xsl:template match = "tp:FullyQualifiedName">
-    <span >
-      <xsl:value-of select = "." />
-    </span>
+    <span>&#160;<xsl:value-of select = "." /></span>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index efdf2f2e41..30263255c0 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -175,7 +175,7 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             var parentExecutionId = this.GetParentExecutionId(e.Result);
 
             this.TotalTests++;
-            testResult.resultOutcome = e.Result.Outcome;
+            testResult.ResultOutcome = e.Result.Outcome;
             if (e.Result.Outcome == TestOutcome.Failed)
             {
                 this.FailedTests++;
@@ -206,10 +206,10 @@ private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
             TestResult parentTestResult;
             this.Results.TryGetValue(parentExecutionId, out parentTestResult);
 
-            if (parentTestResult.innerTestResults == null)
-                parentTestResult.innerTestResults = new List<TestResult>();
+            if (parentTestResult.InnerTestResults == null)
+                parentTestResult.InnerTestResults = new List<TestResult>();
 
-            parentTestResult.innerTestResults.Add(testResult);
+            parentTestResult.InnerTestResults.Add(testResult);
         }
 
         /// <summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index 546496d0e5..b639795a0b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -18,36 +18,27 @@ public TestRunDetails()
         }
 
         /// <summary>
-        /// It has the test run summary of all TestResults.
+        /// Test run summary of all test results.
         /// </summary>
         [DataMember]
         internal TestRunSummary Summary { get; set; }
 
         /// <summary>
-        /// List of Run level message that is Informational.
+        /// List of informational run level messages.
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageInformational = new List<string>();
 
         /// <summary>
-        /// List of Run level message error and warnings
+        /// List of error and warning messages 
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
 
         /// <summary>
-        /// List of all results in hierarchical model.
+        /// List of all the results
         /// </summary>
         [DataMember]
         internal List<TestResult> Results = new List<TestResult>();
-
-        /// <summary>
-        /// Gives the count of elements that Present in the results list.
-        /// </summary>
-        /// <returns></returns>
-        internal int GetTestResultscount()
-        {
-            return Results.Count;
-        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index c0b4cd2b63..b10df8d273 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -16,6 +16,7 @@ public class TestRunSummary
         /// Total test run time.
         /// </summary>
         public string TotalRunTime { get; set; }
+
         /// <summary>
         /// Total tests of a test run.
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
index e8440dfc21..b0de51fcc6 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
@@ -10,29 +10,29 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public class TestResult
     {
         /// <summary>
-        /// Fully Qualified name of TestResult.
+        /// Fully qualified name of the Test Result.
         /// </summary>
-        public string FullyQualifiedName;
+        public string FullyQualifiedName { get; set; }
 
         /// <summary>
-        /// DisplayName for the Particular TestResult.It is unique for each TestResult.
+        /// Display Name for the particular Test Result
         /// </summary>
-        public string DisplayName;
+        public string DisplayName { get; set; }
 
         /// <summary>
-        /// The error stack trace of the TestResult.
+        /// The error stack trace of the Test Result.
         /// </summary>
-        public string ErrorStackTrace;
+        public string ErrorStackTrace { get; set; }
 
         /// <summary>
-        /// Error message of the TestResult.
+        /// Error message of the Test Result.
         /// </summary>
-        public string ErrorMessage;
+        public string ErrorMessage { get; set; }
 
         /// <summary>
-        /// It is enum whether the TestResult is passed failed or skipped.
+        /// Enum that deteremines the outcome of the test case
         /// </summary>
-        public TestOutcome resultOutcome;
+        public TestOutcome ResultOutcome { get; set; }
 
         /// <summary>
         /// Total timespan of the TestResult
@@ -40,26 +40,8 @@ public class TestResult
         public string Duration { get; set; }
 
         /// <summary>
-        /// The list of TestResults that are children to the current TestResult.
+        /// The list of TestResults that are children to the current Test Result.
         /// </summary>
-        public List<TestResult> innerTestResults;
-
-        /// <summary>
-        /// Get the count of inner TestResults count.
-        /// </summary>
-        /// <returns></returns>
-        internal int GetInnerTestResultscount()
-        {
-            return this.innerTestResults.Count;
-        }
-
-        /// <summary>
-        /// Gives the current TestResult.
-        /// </summary>
-        /// <returns></returns>
-        internal TestResult GetTestResult()
-        {
-            return this;
-        }
+        public List<TestResult> InnerTestResults { get; set; }
     }
 }
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
index 0a36b616d4..60fd2fce25 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
@@ -50,8 +50,7 @@ public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo run
             this.InvokeVsTest(arguments);
 
             var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
-            var expectedHtmlFilePath = @".\TestResults.html";
-            Assert.IsTrue(IsFileAndContentEqual(htmlLogFilePath, expectedHtmlFilePath), "Invalid content in Html log file");
+            IsFileAndContentEqual(htmlLogFilePath);
         }
 
         [TestMethod]
@@ -91,8 +90,8 @@ public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runn
             this.InvokeVsTest(arguments);
 
             var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
-            var expectedHtmlFilePath = @"D:\Code\vstest\test\Microsoft.TestPlatform.AcceptanceTests\TestResults.html";
-            Assert.IsTrue(IsFileAndContentEqual(htmlLogFilePath, expectedHtmlFilePath), "Invalid content in Html log file");
+            // var expectedHtmlFilePath = @".\TestResults.html";
+            IsFileAndContentEqual(htmlLogFilePath);
         }
 
         private bool IsValidXml(string xmlFilePath)
@@ -111,7 +110,7 @@ private bool IsValidXml(string xmlFilePath)
             }
         }
 
-        private bool IsFileAndContentEqual(string filePath,string expectedFilePath)
+        private void IsFileAndContentEqual(string filePath)
         {
             StringBuilder sb = new StringBuilder();
             using (var sr = new StreamReader(filePath))
@@ -120,18 +119,13 @@ private bool IsFileAndContentEqual(string filePath,string expectedFilePath)
             }
             string filePathContent = sb.ToString();
 
-            StringBuilder sbExpected = new StringBuilder();
-            using (var sr = new StreamReader(filePath))
+            string[] divs = { "Total tests", "Passed", "Failed", "Skipped", "Run duration", "Pass percentage", "SampleUnitTestProject.UnitTest1.PassingTest" };
+            
+
+            foreach (string str in divs)
             {
-                sbExpected.Append(sr.ReadToEnd());
+                StringAssert.Contains(filePathContent, str);
             }
-
-            string expectedFilePathContent = sb.ToString();
-
-            if (expectedFilePathContent == filePathContent)
-                return true;
-            else
-                return false;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 2a14fa1af3..463ab2189c 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -176,7 +176,7 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
 
             HtmlLogger.TestResult passTestResultActual = new HtmlLogger.TestResult();
             
-            passTestResultActual.resultOutcome = TestOutcome.Passed;
+            passTestResultActual.ResultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "abc";
 
             Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.First().DisplayName);
@@ -190,7 +190,7 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
 
             HtmlLogger.TestResult passTestResultActual1 = new HtmlLogger.TestResult();
-            passTestResultActual.resultOutcome = TestOutcome.Passed;
+            passTestResultActual.ResultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "def";
 
             Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.Last().DisplayName);           
@@ -242,7 +242,7 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 2, "TestResultHandler is not creating test result entry for each test case");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 2, "TestResultHandler is not creating test result entry for each test case");
         }
 
         [TestMethod]
@@ -262,8 +262,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.Results[0].innerTestResults,  "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 1, "testhandler is adding parent result correctly");
+            Assert.IsNull(this.htmlLogger.TestRunDetails.Results[0].InnerTestResults,  "testhandler is adding child result correctly");
 
             ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
             result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
@@ -280,8 +280,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.GetTestResultscount(), 1, "testhandler is adding parent result correctly");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results[0].GetInnerTestResultscount(), 2, "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 1, "testhandler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results[0].InnerTestResults.Count, 2, "testhandler is adding child result correctly");
         }
 
         [TestMethod]
@@ -332,8 +332,15 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
         public void TestCompleteHandlerShouldCreateFileCorrectly()
         {
             string fileName;
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = TestOutcome.Failed;
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+           
+
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
 
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
             this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
@@ -344,8 +351,16 @@ public void TestCompleteHandlerShouldCreateFileCorrectly()
         public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         {
             string fileName;
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = TestOutcome.Failed;
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+
             this.mockHtmlTransformer.Verify(x => x.Transform(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
@@ -353,8 +368,13 @@ public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
         {
             string fileName;
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);          
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = TestOutcome.Failed;
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
 
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
             this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestRunDetails>()), Times.Once);
@@ -366,7 +386,7 @@ private HtmlLogger.TestResult CreateTestResult(TestOutcome testoutcome, string d
         {
 
             HtmlLogger.TestResult testResult = new HtmlLogger.TestResult();
-            testResult.resultOutcome = testoutcome;
+            testResult.ResultOutcome = testoutcome;
             testResult.DisplayName = displayName;
             return testResult;
         }

From df250ee4fc3be07fb21bc7b4663529efb21ebd26 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Thu, 22 Aug 2019 20:38:29 +0530
Subject: [PATCH 15/20] added failed results

---
 .../Html.xslt                                 | 98 +++++++++++++------
 .../HtmlLogger.cs                             | 67 ++++++++-----
 .../HtmlTransformer.cs                        |  1 -
 .../ObjectModel/TestResultCollection.cs       | 30 ++++++
 .../ObjectModel/TestRunDetails.cs             |  8 +-
 .../ObjectModel/TestRunSummary.cs             |  4 +-
 .../ObjectModel/Testresult.cs                 |  8 +-
 .../LoggerTests.cs                            |  5 -
 .../HtmlLoggerTests.cs                        | 90 ++++++++++-------
 9 files changed, 210 insertions(+), 101 deletions(-)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 04e44f1f53..daba087b14 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="2.0"
-    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger"
+    xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays"            
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
@@ -25,7 +25,8 @@
       <style>
         body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
         h2 {
-        margin-top: 0;
+        margin-top: 15px;
+        margin-bottom:10px;
         }
         .summary {font-family:monospace;
         display: -webkit-flex; /* Safari */
@@ -39,6 +40,12 @@
         cursor:pointer;
         background-color:#bcdaf7;
         }
+        .listRow {
+        border: 2px solid #ffffff;
+        width:100%;
+        cursor:pointer;
+        background-color:#ffffff;
+        }
         .innerRow{
         border: 2px solid #ffffff;
         padding-left:1%;
@@ -48,14 +55,16 @@
         .block{
         width : 150px;
         }
-        .division{
-        cursor:pointer;
-        background-color:#bcdaf7;
-        }
-        .innerDivision{
+        .leafDivision{
         border: 2px solid #ffffff;
         background-color:#e0f0ff;
         }
+        .resultDivision{
+        border: 2px solid #ffffff;
+        padding-left:1%;
+        margin-left:1%;
+        background-color:#ffffff;
+        }
         .pass { color: #0c0; }
         .fail { color: #c00; }
         .errorMessage { color : brown; }
@@ -64,48 +73,71 @@
         .totalTests { font-size : 30px}
         .testRunTime { font-size : 30px}
         .passPercentage { font-size : 30px}
+        .errorInfo{
+        margin-left:16px;
+        }
       </style>
     </html>
   </xsl:template>
 
   <xsl:template match="/tp:TestRunDetails">
     <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary"/>
-    <h2>Results</h2>
-    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results"/>
+    <xsl:apply-templates select ="/tp:TestRunDetails/tp:ResultCollectionList"/>
   </xsl:template>
 
   <xsl:template match="tp:TestRunDetails/tp:Summary">
     <div class ="summary">
-      <div class ="block">
-        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalTests"/>
-      </div>
+      <div class ="block"><xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalTests"/></div>
       <div class ="block">
         <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassedTests"/>
         <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:FailedTests"/>
         <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:SkippedTests"/>
       </div>
-      <div class ="block">
-        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassPercentage"/>
-      </div>
-      <div class ="block">
-        <xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalRunTime"/>
-      </div>
+      <div class ="block"><xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:PassPercentage"/></div>
+      <div class ="block"><xsl:apply-templates select ="/tp:TestRunDetails/tp:Summary/tp:TotalRunTime"/></div>
       <br/>
     </div>
   </xsl:template>
 
-  <xsl:template match="/tp:TestRunDetails/tp:Results">
-    <xsl:apply-templates select ="/tp:TestRunDetails/tp:Results/tp:TestResult"/>
+  <xsl:template match="/tp:TestRunDetails/tp:ResultCollectionList">
+    <h2>Failed Results</h2><xsl:call-template name ="FailedResults"/>
+    <h2>All Results</h2><xsl:call-template name ="Results"/>
+  </xsl:template>
+
+  <xsl:template name ="Results">
+    <xsl:for-each select ="tp:TestResultCollection">
+      <xsl:variable name="Source" select="tp:Id" />
+      <xsl:if test="tp:ResultList!=''">
+        <div class ="listRow" onclick="ToggleClass('{$Source}')"><xsl:value-of select = "tp:Source" /></div>
+        <div class ="resultDivision" Id="{$Source}" style="display:none;">
+          <xsl:for-each select ="tp:ResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
+        </div>
+      </xsl:if>
+    </xsl:for-each>
   </xsl:template>
 
-  <xsl:template match="tp:TestResult">  
+  <xsl:template name = "FailedResults">
+    <xsl:for-each select ="tp:TestResultCollection">
+      <xsl:variable name="Source" select="tp:Id" />
+      <xsl:if test="tp:FailedResultList!=''">
+        <div class ="listRow" onclick="ToggleClass('{concat($Source,'-failedResult')}')"><xsl:value-of select = "tp:Source" /> </div>
+        <div class ="resultDivision" Id="{concat($Source,'-failedResult')}" style="display:none;">
+          <xsl:for-each select ="tp:FailedResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
+        </div>
+      </xsl:if>
+    </xsl:for-each>    
+  </xsl:template>  
+  
+  <xsl:template name="TestResult" match="tp:TestResult">
+    <xsl:variable name="TestResultId" select="tp:TestResultId" />
+    
     <xsl:if test ="tp:InnerTestResults!=''">
-      <div class ="row" onclick="ToggleClass('{generate-id()}')"><xsl:call-template name = "Result" /></div>
-      <a Id="{generate-id()}" style="display:none;"><xsl:apply-templates select = "tp:InnerTestResults" /></a>
+      <div class ="row" onclick="ToggleClass('{concat($TestResultId,'-',name(..))}')"><xsl:call-template name = "Result" /></div>
+      <a Id="{concat($TestResultId,'-',name(..))}" style="display:none;"><xsl:apply-templates select = "tp:InnerTestResults" /></a>
     </xsl:if> 
     
     <xsl:if test ="tp:InnerTestResults=''">
-      <div class ="innerDivision"><xsl:call-template name = "Result" /></div>
+      <div class ="leafDivision"><xsl:call-template name = "Result" /></div>
     </xsl:if>   
     
   </xsl:template>
@@ -115,21 +147,23 @@
   </xsl:template>
 
 <xsl:template name="Result" >
-    <div >
+    <div>
       <xsl:apply-templates select = "tp:ResultOutcome"/>
-      <xsl:apply-templates select = "tp:FullyQualifiedName" />
+      <xsl:apply-templates select = "tp:DisplayName" />
       <div class="duration"><xsl:apply-templates select = "tp:Duration" /></div>
     </div>
-    <xsl:if test ="tp:ErrorMessage!=''"><xsl:apply-templates select = "tp:ErrorMessage" /></xsl:if>
-    <xsl:if test ="tp:ErrorStackTrace!=''"><xsl:apply-templates select = "tp:ErrorStackTrace" /></xsl:if>
+   <div class="errorInfo"> 
+     <xsl:if test ="tp:ErrorMessage!=''"><xsl:apply-templates select = "tp:ErrorMessage" /></xsl:if>
+     <xsl:if test ="tp:ErrorStackTrace!=''"><xsl:apply-templates select = "tp:ErrorStackTrace" /></xsl:if>
+   </div>
   </xsl:template>
   
   <xsl:template match = "tp:ErrorMessage">
-    &#160;&#160;&#160;&#160;Error: <span class="errorMessage"><xsl:value-of select = "." /></span><br />
+    Error: <span class="errorMessage"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:ErrorStackTrace">
-    &#160;&#160;&#160;&#160;Stack trace: <span class="errorStackTrace"><xsl:value-of select = "." /></span><br />
+    Stack trace: <span class="errorStackTrace"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:FailedTests">
@@ -159,14 +193,14 @@
   <xsl:template match = "tp:ResultOutcome">
     <xsl:if test =" . = 'Passed' "><span class="pass">&#x2714;</span></xsl:if>
     <xsl:if test =" . = 'Failed'"><span class="fail">&#x2718;</span></xsl:if>
-    <xsl:if test =" . = 'Skipped'"><span class="skip">&#33;</span></xsl:if>
+    <xsl:if test =" . = 'Skipped'"><span class="skip">&#x2762;</span></xsl:if>
   </xsl:template>
 
   <xsl:template match = "tp:Duration">
     <span><xsl:value-of select = "." /></span><br />
   </xsl:template>
   
-  <xsl:template match = "tp:FullyQualifiedName">
+  <xsl:template match = "tp:DisplayName">
     <span>&#160;<xsl:value-of select = "." /></span>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 30263255c0..f2911e67dd 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -12,7 +12,6 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.Globalization;
     using System.IO;
     using System.Linq;
@@ -20,6 +19,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using System.Xml.Xsl;
     using HtmlResource = Resources.Resources;
     using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
+    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
 
     /// <summary>
     /// Logger for generating Html.
@@ -28,7 +28,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
     public class Htmllogger : ITestLoggerWithParameters
     {
-        private IFileHelper filehelper;
+        private IFileHelper fileHelper;
         private XmlObjectSerializer xmlSerializer;
         private IHtmlTransformer htmlTransformer;
         private string fileName;
@@ -39,9 +39,9 @@ public Htmllogger()
         {
         }
 
-        public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlObjectSerializer dataContractSerializer)
+        public Htmllogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer, XmlObjectSerializer dataContractSerializer)
         {
-            this.filehelper = filehelper;
+            this.fileHelper = fileHelper;
             this.htmlTransformer = htmlTransformer;
             this.xmlSerializer = dataContractSerializer;
         }
@@ -55,7 +55,9 @@ public Htmllogger(IFileHelper filehelper, IHtmlTransformer htmlTransformer, XmlO
         /// Total results are stored in sequential order
         /// </summary>
         /// <returns></returns>
-        public ConcurrentDictionary<Guid, TestResult> Results { get; private set; }
+        public ConcurrentDictionary<Guid, ObjectModel.TestResult> Results { get; private set; }
+
+        public ConcurrentDictionary<string,TestResultCollection> ResultCollectionDictionary { get; private set; }
 
         /// <summary>
         /// Test results stores all the summary and the details of evrey results in hiearachial order.
@@ -103,7 +105,8 @@ public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
 
             this.TestResultsDirPath = TestResultsDirPath;
             this.TestRunDetails = new TestRunDetails();
-            this.Results = new ConcurrentDictionary<Guid, TestResult>();
+            this.Results = new ConcurrentDictionary<Guid, ObjectModel.TestResult>();
+            this.ResultCollectionDictionary = new ConcurrentDictionary<string, TestResultCollection>();
         }
 
         /// <inheritdoc/>
@@ -163,22 +166,37 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             ValidateArg.NotNull<object>(sender, "sender");
             ValidateArg.NotNull<TestResultEventArgs>(e, "e");
 
-            TestResult testResult = new TestResult();
-            testResult.DisplayName = e.Result.DisplayName ?? e.Result.TestCase.DisplayName;
+            ObjectModel.TestResult testResult = new ObjectModel.TestResult();
+            testResult.DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName;
 
             testResult.FullyQualifiedName = e.Result.TestCase.FullyQualifiedName;
             testResult.Duration = GetFormattedDurationString(e.Result.Duration);
             testResult.ErrorStackTrace = e.Result.ErrorStackTrace;
             testResult.ErrorMessage = e.Result.ErrorMessage;
+            testResult.TestResultId = e.Result.TestCase.Id;
+            testResult.ResultOutcome = e.Result.Outcome;
 
             var executionId = this.GetExecutionId(e.Result);
             var parentExecutionId = this.GetParentExecutionId(e.Result);
 
+            ResultCollectionDictionary.TryGetValue(e.Result.TestCase.Source, out TestResultCollection testResultCollection);
+            if (testResultCollection == null)
+            {
+                testResultCollection = new TestResultCollection
+                {
+                    Source = e.Result.TestCase.Source,
+                    ResultList = new List<ObjectModel.TestResult>(),
+                    FailedResultList = new List<ObjectModel.TestResult>(),
+                };
+                ResultCollectionDictionary.TryAdd(e.Result.TestCase.Source, testResultCollection);
+                TestRunDetails.ResultCollectionList.Add(testResultCollection);
+            }
+            testResultCollection.Id= testResultCollection.Source.GetHashCode();
+
             this.TotalTests++;
-            testResult.ResultOutcome = e.Result.Outcome;
             if (e.Result.Outcome == TestOutcome.Failed)
             {
-                this.FailedTests++;
+                this.FailedTests++;   
             }
             else if (e.Result.Outcome == TestOutcome.Passed)
             {
@@ -191,7 +209,12 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
 
             if (parentExecutionId == Guid.Empty)
             {
-                TestRunDetails.Results.Add(testResult);
+                if (e.Result.Outcome == TestOutcome.Failed)
+                {
+                    testResultCollection.FailedResultList.Add(testResult);
+                }
+
+                testResultCollection.ResultList.Add(testResult);
             }
 
             Results.TryAdd(executionId, testResult);
@@ -201,13 +224,13 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
             }
         }
 
-        private void AddToParentResult( Guid parentExecutionId, TestResult testResult)
+        private void AddToParentResult( Guid parentExecutionId, ObjectModel.TestResult testResult)
         {
-            TestResult parentTestResult;
+            ObjectModel.TestResult parentTestResult;
             this.Results.TryGetValue(parentExecutionId, out parentTestResult);
 
             if (parentTestResult.InnerTestResults == null)
-                parentTestResult.InnerTestResults = new List<TestResult>();
+                parentTestResult.InnerTestResults = new List<ObjectModel.TestResult>();
 
             parentTestResult.InnerTestResults.Add(testResult);
         }
@@ -248,7 +271,7 @@ private void PopulateHtmlFile()
 
             try
             {
-                using (Stream xmlStream = this.filehelper.GetStream(XmlFilePath, FileMode.Create))
+                using (Stream xmlStream = this.fileHelper.GetStream(XmlFilePath, FileMode.Create))
                 {
                     xmlSerializer.WriteObject(xmlStream, TestRunDetails);
                 }
@@ -270,15 +293,15 @@ private void PopulateHtmlFile()
                 return;
             }
 
-            string htmlfilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
-            EqtTrace.Info(htmlfilePathMessage);
-            ConsoleOutput.Instance.Information(false, htmlfilePathMessage);
+            string htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
+            EqtTrace.Info(htmlFilePathMessage);
+            ConsoleOutput.Instance.Information(false, htmlFilePathMessage);
         }
 
         private string GetFilePath(string fileFormat,string FileName)
         {  
-            var fullfileformat = string.Concat("." + fileFormat);
-            return Path.Combine(this.TestResultsDirPath, string.Concat("TestResult_", FileName, fullfileformat));
+            var fullFileFormat = string.Concat("." + fileFormat);
+            return Path.Combine(this.TestResultsDirPath, string.Concat("TestResult_", FileName, fullFileFormat));
         }
 
         private static string FormatDateTimeForRunName(DateTime timeStamp)
@@ -291,7 +314,7 @@ private static string FormatDateTimeForRunName(DateTime timeStamp)
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private Guid GetParentExecutionId(ObjectModel.TestResult testResult)
+        private Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         {
             TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
             return parentExecutionIdProperty == null ? Guid.Empty : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
@@ -302,7 +325,7 @@ private Guid GetParentExecutionId(ObjectModel.TestResult testResult)
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private Guid GetExecutionId(ObjectModel.TestResult testResult)
+        private Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         {
             TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
             var executionId = Guid.Empty;
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index dbba6abe80..e4eb374dbd 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -5,7 +5,6 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
     using System.Xml;
     using System.Xml.Xsl;
-    using HtmlResources = Resources.Resources;
 
     class HtmlTransformer : IHtmlTransformer
     {
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
new file mode 100644
index 0000000000..56f0559c84
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
@@ -0,0 +1,30 @@
+// 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.Extensions.HtmlLogger.ObjectModel
+{
+    using System.Collections.Generic;
+
+    public class TestResultCollection
+    {
+        /// <summary>
+        /// Source of the test dll.
+        /// </summary>
+        public string Source { get; set; }
+
+        /// <summary>
+        /// Hash id of source.
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// List of test results.
+        /// </summary>
+        public List<TestResult> ResultList { get; set; }
+
+        /// <summary>
+        /// list of failed test results.
+        /// </summary>
+        public List<TestResult> FailedResultList { get; set; }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index b639795a0b..14a5809c5b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -1,13 +1,13 @@
 // 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.Extensions.HtmlLogger
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
+    using System.Collections.Concurrent;
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
     [DataContract]
-    [KnownType(typeof(TestResult))]
     public sealed class TestRunDetails
     {
         /// <summary>
@@ -30,7 +30,7 @@ public TestRunDetails()
         internal List<string> RunLevelMessageInformational = new List<string>();
 
         /// <summary>
-        /// List of error and warning messages 
+        /// List of error and warning messages.
         /// </summary>
         [DataMember]
         internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
@@ -39,6 +39,6 @@ public TestRunDetails()
         /// List of all the results
         /// </summary>
         [DataMember]
-        internal List<TestResult> Results = new List<TestResult>();
+        internal List<TestResultCollection> ResultCollectionList = new List<TestResultCollection>();
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index b10df8d273..4b30d25232 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -1,9 +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.
 
-using System.Runtime.Serialization;
-
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
     public class TestRunSummary
     {
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
index b0de51fcc6..88bc22f2b3 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
@@ -1,10 +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.Extensions.HtmlLogger
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
 
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using System;
     using System.Collections.Generic;
 
     public class TestResult
@@ -14,6 +15,11 @@ public class TestResult
         /// </summary>
         public string FullyQualifiedName { get; set; }
 
+        /// <summary>
+        /// Unique identifier for test result
+        /// </summary>
+        public Guid TestResultId { get; set; }
+
         /// <summary>
         /// Display Name for the particular Test Result
         /// </summary>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
index 60fd2fce25..9c86723df4 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
@@ -1,7 +1,6 @@
 // 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;
 
@@ -90,7 +89,6 @@ public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runn
             this.InvokeVsTest(arguments);
 
             var htmlLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", htmlFileName);
-            // var expectedHtmlFilePath = @".\TestResults.html";
             IsFileAndContentEqual(htmlLogFilePath);
         }
 
@@ -118,10 +116,7 @@ private void IsFileAndContentEqual(string filePath)
                 sb.Append(sr.ReadToEnd());
             }
             string filePathContent = sb.ToString();
-
             string[] divs = { "Total tests", "Passed", "Failed", "Skipped", "Run duration", "Pass percentage", "SampleUnitTestProject.UnitTest1.PassingTest" };
-            
-
             foreach (string str in divs)
             {
                 StringAssert.Contains(filePathContent, str);
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 463ab2189c..d2385f1049 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -19,6 +19,7 @@ namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
     using System.Linq;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
     using System.Runtime.Serialization;
+    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
 
     [TestClass]
     public class HtmlLoggerTests
@@ -168,42 +169,42 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
             TestCase passTestCase1 = CreateTestCase("Pass1");
             ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase1);
             PassTestResultExpected.DisplayName = null;
-            PassTestResultExpected.TestCase.DisplayName = "abc";
+            PassTestResultExpected.TestCase.FullyQualifiedName = "abc";
          
 
             Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(PassTestResultExpected);
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
 
-            HtmlLogger.TestResult passTestResultActual = new HtmlLogger.TestResult();
-            
+            HtmlLogger.ObjectModel.TestResult passTestResultActual = new HtmlLogger.ObjectModel.TestResult();
+
             passTestResultActual.ResultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "abc";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.First().DisplayName);
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().DisplayName);
        
             TestCase passTestCase2 = CreateTestCase("Pass1");
             ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase1);
             PassTestResultExpected.DisplayName = "def";
-            PassTestResultExpected.TestCase.DisplayName = "abc";
+            PassTestResultExpected.TestCase.FullyQualifiedName = "abc";
 
             Mock<TestResultEventArgs> pass2= new Mock<TestResultEventArgs>(PassTestResultExpected);
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
 
-            HtmlLogger.TestResult passTestResultActual1 = new HtmlLogger.TestResult();
             passTestResultActual.ResultOutcome = TestOutcome.Passed;
             passTestResultActual.DisplayName = "def";
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.Results.Last().DisplayName);           
+            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Last().DisplayName);           
         }
 
         [TestMethod]
         public void TestResultHandlerShouldCreateTestResultProperly()
         {
-                TestCase passTestCase2 = CreateTestCase("Pass1");
-                passTestCase2.DisplayName = "abc";
-                passTestCase2.FullyQualifiedName = "fully";
+                TestCase passTestCase = CreateTestCase("Pass1");
+                passTestCase.DisplayName = "abc";
+                passTestCase.FullyQualifiedName = "fully";
+                passTestCase.Source = "abc/def.dll";
 
-            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase2)
+            ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase)
             {
                 DisplayName = "def",
                 ErrorMessage = "error message",
@@ -211,16 +212,17 @@ public void TestResultHandlerShouldCreateTestResultProperly()
                 Duration = TimeSpan.Zero
             };
 
-            Mock<TestResultEventArgs> eventArg = new Mock<TestResultEventArgs>(PassTestResultExpected1);
+            Mock<TestResultEventArgs> eventArg = new Mock<TestResultEventArgs>(PassTestResultExpected);
 
             this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
 
-            var result = this.htmlLogger.TestRunDetails.Results.First();
+            var result = this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First();
            
             Assert.AreEqual(result.DisplayName, "def");
             Assert.AreEqual(result.ErrorMessage, "error message");
             Assert.AreEqual(result.ErrorStackTrace, "Error strack trace");
             Assert.AreEqual(result.FullyQualifiedName, "fully");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source, "abc/def.dll");
             Assert.AreEqual(result.Duration, null);
         }
 
@@ -242,7 +244,44 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 2, "TestResultHandler is not creating test result entry for each test case");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 2, "TestResultHandler is not creating test result entry for each test case");
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
+        {
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            TestCase testCase2 = CreateTestCase("TestCase2");
+            testCase1.Source = "abc.dll";
+            testCase2.Source = "def.dll";
+
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = TestOutcome.Failed;
+
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
+            result2.Outcome = TestOutcome.Passed;
+
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
+
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.Count(), 2);
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldAddFailedResultToFailedResultListInTestResultCollection()
+        {
+            TestCase testCase1 = CreateTestCase("TestCase1");           
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+            result1.Outcome = TestOutcome.Failed;
+
+            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count(),1);
         }
 
         [TestMethod]
@@ -262,8 +301,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 1, "testhandler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.Results[0].InnerTestResults,  "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 1, "testhandler is adding parent result correctly");
+            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults,  "testhandler is adding child result correctly");
 
             ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
             result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
@@ -280,8 +319,8 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results.Count(), 1, "testhandler is adding parent result correctly");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Results[0].InnerTestResults.Count, 2, "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 1, "testhandler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults.Count(), 2, "testhandler is adding child result correctly");
         }
 
         [TestMethod]
@@ -382,21 +421,6 @@ public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
             Assert.IsTrue(htmlLogger.HtmlFilePath.Contains(".html"));
         }
 
-        private HtmlLogger.TestResult CreateTestResult(TestOutcome testoutcome, string displayName)
-        {
-
-            HtmlLogger.TestResult testResult = new HtmlLogger.TestResult();
-            testResult.ResultOutcome = testoutcome;
-            testResult.DisplayName = displayName;
-            return testResult;
-        }
-
-        private TestRunDetails CreateTestResults()
-        {
-            TestRunDetails testresults = new TestRunDetails();
-            return testresults;
-        }
-
         private static TestCase CreateTestCase(string testCaseName)
         {
             return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");

From 6b81048a004ba5f307757a76218b836ce6f02e73 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Fri, 23 Aug 2019 20:42:44 +0530
Subject: [PATCH 16/20] code refactoring using resharper

---
 .../Constants.cs                              |  62 ++++
 .../Html.xslt                                 |   2 +-
 .../HtmlLogger.cs                             | 247 ++++++++--------
 .../HtmlTransformer.cs                        |  19 +-
 .../IHtmlTransformer.cs                       |   8 +-
 .../ObjectModel/TestResultCollection.cs       |  15 +-
 .../ObjectModel/TestRunDetails.cs             |  22 +-
 .../ObjectModel/TestRunSummary.cs             |   3 +
 .../ObjectModel/Testresult.cs                 |   5 +-
 .../Resources/Resources.Designer.cs           |   9 +
 .../Resources/Resources.resx                  |   3 +
 .../HtmlLoggerTests.cs                        | 270 ++++++++----------
 12 files changed, 363 insertions(+), 302 deletions(-)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs
new file mode 100644
index 0000000000..fb91883432
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs
@@ -0,0 +1,62 @@
+// 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.Extensions.HtmlLogger
+{
+    using System;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+    public static class Constants
+    {
+        /// <summary>
+        /// Uri used to uniquely identify the Html logger.
+        /// </summary>
+        public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
+
+        /// <summary>
+        /// Alternate user friendly string to uniquely identify the console logger.
+        /// </summary>
+        public const string FriendlyName = "Html";
+
+        /// <summary>
+        /// The file extension of xml file
+        /// </summary>
+        public const string XmlFileExtension = "xml";
+
+        /// <summary>
+        /// The file extension of html file
+        /// </summary>
+        public const string HtmlFileExtension = "html";
+
+        ///  /// <summary>
+        /// Property Id storing the TestType.
+        /// </summary>
+        public const string TestTypePropertyIdentifier = "TestType";
+
+        /// <summary>
+        /// Ordered test type guid
+        /// </summary>
+        public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
+
+        /// <summary>
+        ///  Property Id storing the ParentExecutionId.
+        /// </summary>
+        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
+
+        /// <summary>
+        ///  Property Id storing the ExecutionId.
+        /// </summary>
+        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
+
+        /// <summary>
+        ///  Log file parameter key
+        /// </summary>
+        public const string LogFileNameKey = "LogFileName"; 
+
+        public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+
+        public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+
+        public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index daba087b14..8aa913fde4 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -121,7 +121,7 @@
       <xsl:variable name="Source" select="tp:Id" />
       <xsl:if test="tp:FailedResultList!=''">
         <div class ="listRow" onclick="ToggleClass('{concat($Source,'-failedResult')}')"><xsl:value-of select = "tp:Source" /> </div>
-        <div class ="resultDivision" Id="{concat($Source,'-failedResult')}" style="display:none;">
+        <div class ="resultDivision" Id="{concat($Source,'-failedResult')}" style="display:block;">
           <xsl:for-each select ="tp:FailedResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
         </div>
       </xsl:if>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index f2911e67dd..71b8a65001 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -6,9 +6,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
@@ -16,38 +14,42 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     using System.IO;
     using System.Linq;
     using System.Runtime.Serialization;
-    using System.Xml.Xsl;
+
+    using ObjectModel;
+    using Utilities;
+    using Utilities.Helpers;
+    using Utilities.Helpers.Interfaces;
+
     using HtmlResource = Resources.Resources;
-    using HtmlLoggerConstants = Microsoft.TestPlatform.Extensions.HtmlLogger.Utility.Constants;
-    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+    using HtmlLoggerConstants = Constants;
 
     /// <summary>
     /// Logger for generating Html.
     /// </summary>
     [FriendlyName(HtmlLoggerConstants.FriendlyName)]
     [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
-    public class Htmllogger : ITestLoggerWithParameters
+    public class HtmlLogger : ITestLoggerWithParameters
     {
-        private IFileHelper fileHelper;
-        private XmlObjectSerializer xmlSerializer;
-        private IHtmlTransformer htmlTransformer;
-        private string fileName;
+        private readonly IFileHelper fileHelper;
+        private readonly XmlObjectSerializer xmlSerializer;
+        private readonly IHtmlTransformer htmlTransformer;
         private Dictionary<string, string> parametersDictionary;
 
-        public Htmllogger()
-        : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestRunDetails)))
+        public HtmlLogger()
+            : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestRunDetails)))
         {
         }
 
-        public Htmllogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer, XmlObjectSerializer dataContractSerializer)
+        public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
+            XmlObjectSerializer dataContractSerializer)
         {
             this.fileHelper = fileHelper;
             this.htmlTransformer = htmlTransformer;
-            this.xmlSerializer = dataContractSerializer;
+            xmlSerializer = dataContractSerializer;
         }
 
         /// <summary>
-        /// Gets the directory under which default html file and test results attachements should be saved.
+        /// Gets the directory under which default html file and test results attachments should be saved.
         /// </summary>
         public string TestResultsDirPath { get; private set; }
 
@@ -57,10 +59,13 @@ public Htmllogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer, XmlO
         /// <returns></returns>
         public ConcurrentDictionary<Guid, ObjectModel.TestResult> Results { get; private set; }
 
-        public ConcurrentDictionary<string,TestResultCollection> ResultCollectionDictionary { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public ConcurrentDictionary<string, TestResultCollection> ResultCollectionDictionary { get; private set; }
 
         /// <summary>
-        /// Test results stores all the summary and the details of evrey results in hiearachial order.
+        /// Test results stores all the summary and the details of every results in hierarchical order.
         /// </summary>
         public TestRunDetails TestRunDetails { get; private set; }
 
@@ -83,30 +88,31 @@ public Htmllogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer, XmlO
         /// Total skipped tests in the results.
         /// </summary>
         public int SkippedTests { get; private set; }
+
         public string XmlFilePath { get; private set; }
         public string HtmlFilePath { get; private set; }
 
-        public void Initialize(TestLoggerEvents events, string TestResultsDirPath)
+        public void Initialize(TestLoggerEvents events, string testResultsDirPath)
         {
             if (events == null)
             {
                 throw new ArgumentNullException(nameof(events));
             }
 
-            if (string.IsNullOrEmpty(TestResultsDirPath))
+            if (string.IsNullOrEmpty(testResultsDirPath))
             {
-                throw new ArgumentNullException(nameof(TestResultsDirPath));
+                throw new ArgumentNullException(nameof(testResultsDirPath));
             }
 
             // Register for the events.
-            events.TestRunMessage += this.TestMessageHandler;
-            events.TestResult += this.TestResultHandler;
-            events.TestRunComplete += this.TestRunCompleteHandler;
-
-            this.TestResultsDirPath = TestResultsDirPath;
-            this.TestRunDetails = new TestRunDetails();
-            this.Results = new ConcurrentDictionary<Guid, ObjectModel.TestResult>();
-            this.ResultCollectionDictionary = new ConcurrentDictionary<string, TestResultCollection>();
+            events.TestRunMessage += TestMessageHandler;
+            events.TestResult += TestResultHandler;
+            events.TestRunComplete += TestRunCompleteHandler;
+
+            TestResultsDirPath = testResultsDirPath;
+            TestRunDetails = new TestRunDetails();
+            Results = new ConcurrentDictionary<Guid, ObjectModel.TestResult>();
+            ResultCollectionDictionary = new ConcurrentDictionary<string, TestResultCollection>();
         }
 
         /// <inheritdoc/>
@@ -121,8 +127,9 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
             {
                 throw new ArgumentException("No default parameters added", nameof(parameters));
             }
-            this.parametersDictionary = parameters;
-            this.Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
+
+            parametersDictionary = parameters;
+            Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
         }
 
         /// <summary>
@@ -130,18 +137,14 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
+        public void TestMessageHandler(object sender, TestRunMessageEventArgs e)
         {
-            ValidateArg.NotNull<object>(sender, "sender");
-            ValidateArg.NotNull<TestRunMessageEventArgs>(e, "e");
+            ValidateArg.NotNull(sender, "sender");
+            ValidateArg.NotNull(e, "e");
 
             switch (e.Level)
             {
                 case TestMessageLevel.Informational:
-                    if (TestRunDetails.RunLevelMessageInformational == null)
-                    {
-                        TestRunDetails.RunLevelMessageInformational = new List<string>();
-                    }
                     TestRunDetails.RunLevelMessageInformational.Add(e.Message);
                     break;
                 case TestMessageLevel.Warning:
@@ -151,62 +154,71 @@ internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
                     TestRunDetails.RunLevelMessageErrorAndWarning.Add(e.Message);
                     break;
                 default:
-                    EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
+                    EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}",
+                        e.Level.ToString());
                     break;
             }
         }
 
         /// <summary>
-        /// Handles the result coming from vstest and store it in test results.
+        /// Handles the result coming from vs test and store it in test results.
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        internal void TestResultHandler(object sender, TestResultEventArgs e)
-        {
-            ValidateArg.NotNull<object>(sender, "sender");
-            ValidateArg.NotNull<TestResultEventArgs>(e, "e");
-
-            ObjectModel.TestResult testResult = new ObjectModel.TestResult();
-            testResult.DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName;
+        public void TestResultHandler(object sender, TestResultEventArgs e)
+        { 
+            ValidateArg.NotNull(sender, "sender");
+            ValidateArg.NotNull(e, "e");
 
-            testResult.FullyQualifiedName = e.Result.TestCase.FullyQualifiedName;
-            testResult.Duration = GetFormattedDurationString(e.Result.Duration);
-            testResult.ErrorStackTrace = e.Result.ErrorStackTrace;
-            testResult.ErrorMessage = e.Result.ErrorMessage;
-            testResult.TestResultId = e.Result.TestCase.Id;
-            testResult.ResultOutcome = e.Result.Outcome;
+            var testResult = new ObjectModel.TestResult
+            {
+                DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName,
+                FullyQualifiedName = e.Result.TestCase.FullyQualifiedName,
+                Duration = GetFormattedDurationString(e.Result.Duration),
+                ErrorStackTrace = e.Result.ErrorStackTrace,
+                ErrorMessage = e.Result.ErrorMessage,
+                TestResultId = e.Result.TestCase.Id,
+                ResultOutcome = e.Result.Outcome
+            };
 
-            var executionId = this.GetExecutionId(e.Result);
-            var parentExecutionId = this.GetParentExecutionId(e.Result);
+            var executionId = GetExecutionId(e.Result);
+            var parentExecutionId = GetParentExecutionId(e.Result);
 
-            ResultCollectionDictionary.TryGetValue(e.Result.TestCase.Source, out TestResultCollection testResultCollection);
+            ResultCollectionDictionary.TryGetValue(e.Result.TestCase.Source, out var testResultCollection);
             if (testResultCollection == null)
             {
-                testResultCollection = new TestResultCollection
+                testResultCollection = new TestResultCollection(e.Result.TestCase.Source)
                 {
-                    Source = e.Result.TestCase.Source,
                     ResultList = new List<ObjectModel.TestResult>(),
                     FailedResultList = new List<ObjectModel.TestResult>(),
                 };
                 ResultCollectionDictionary.TryAdd(e.Result.TestCase.Source, testResultCollection);
                 TestRunDetails.ResultCollectionList.Add(testResultCollection);
             }
-            testResultCollection.Id= testResultCollection.Source.GetHashCode();
 
-            this.TotalTests++;
-            if (e.Result.Outcome == TestOutcome.Failed)
+            TotalTests++;
+            switch (e.Result.Outcome)
             {
-                this.FailedTests++;   
-            }
-            else if (e.Result.Outcome == TestOutcome.Passed)
-            {
-                this.PassedTests++;
-            }
-            else if (e.Result.Outcome == TestOutcome.Skipped)
-            {
-                this.SkippedTests++;
+                case TestOutcome.Failed:
+                    FailedTests++;
+                    break;
+                case TestOutcome.Passed:
+                    PassedTests++;
+                    break;
+                case TestOutcome.Skipped:
+                    SkippedTests++;
+                    break;
+                case TestOutcome.None:
+                    break;
+                case TestOutcome.NotFound:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
 
+            Results.TryAdd(executionId, testResult);
+
+            // Check for parent execution id to store the test results in hierarchical way 
             if (parentExecutionId == Guid.Empty)
             {
                 if (e.Result.Outcome == TestOutcome.Failed)
@@ -216,92 +228,95 @@ internal void TestResultHandler(object sender, TestResultEventArgs e)
 
                 testResultCollection.ResultList.Add(testResult);
             }
-
-            Results.TryAdd(executionId, testResult);
-            if (parentExecutionId != Guid.Empty)
+            else
             {
-                this.AddToParentResult(parentExecutionId, testResult);
+                AddToParentResult(parentExecutionId, testResult);
             }
         }
 
-        private void AddToParentResult( Guid parentExecutionId, ObjectModel.TestResult testResult)
+        private void AddToParentResult(Guid parentExecutionId, ObjectModel.TestResult testResult)
         {
-            ObjectModel.TestResult parentTestResult;
-            this.Results.TryGetValue(parentExecutionId, out parentTestResult);
+            Results.TryGetValue(parentExecutionId, out var parentTestResult);
 
-            if (parentTestResult.InnerTestResults == null)
+            if (parentTestResult != null && parentTestResult.InnerTestResults == null)
                 parentTestResult.InnerTestResults = new List<ObjectModel.TestResult>();
 
-            parentTestResult.InnerTestResults.Add(testResult);
+            parentTestResult?.InnerTestResults.Add(testResult);
         }
 
         /// <summary>
-        /// Creates a summary of tests and popultes the html file by transforming the xml file with help of xslt file.
+        /// Creates a summary of tests and populates the html file by transforming the xml file with help of xslt file.
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
+        public void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
         {
             TestRunDetails.Summary = new TestRunSummary
             {
-                FailedTests = this.FailedTests,
-                PassedTests = this.PassedTests,
-                TotalTests = this.TotalTests,
-                SkippedTests = this.SkippedTests,
-                PassPercentage = (PassedTests * 100)/ TotalTests ,
+                FailedTests = FailedTests,
+                PassedTests = PassedTests,
+                TotalTests = TotalTests,
+                SkippedTests = SkippedTests,
+                PassPercentage = (PassedTests * 100) / TotalTests,
+                TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests),
             };
-            TestRunDetails.Summary.TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests); 
 
-            if (this.parametersDictionary != null)
+            if (parametersDictionary != null)
             {
-                var isLogFileNameParameterExists = this.parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string logFileNameValue);
+                var isLogFileNameParameterExists = parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey,
+                    out string logFileNameValue);
                 if (isLogFileNameParameterExists && !string.IsNullOrWhiteSpace(logFileNameValue))
                 {
-                    HtmlFilePath = Path.Combine(this.TestResultsDirPath, logFileNameValue);
+                    HtmlFilePath = Path.Combine(TestResultsDirPath, logFileNameValue);
                 }
             }
 
-            this.PopulateHtmlFile();
+            PopulateHtmlFile();
         }
 
         private void PopulateHtmlFile()
         {
-            this.fileName = String.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}", Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
-            XmlFilePath = this.GetFilePath(HtmlLoggerConstants.Xml,this.fileName);
-
             try
             {
-                using (Stream xmlStream = this.fileHelper.GetStream(XmlFilePath, FileMode.Create))
+                var fileName = string.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}",
+                    Environment.GetEnvironmentVariable("UserName"), Environment.MachineName,
+                    FormatDateTimeForRunName(DateTime.Now));
+                XmlFilePath = GetFilePath(HtmlLoggerConstants.XmlFileExtension, fileName);
+
+                using (var xmlStream = fileHelper.GetStream(XmlFilePath, FileMode.Create))
                 {
                     xmlSerializer.WriteObject(xmlStream, TestRunDetails);
                 }
 
                 if (string.IsNullOrEmpty(HtmlFilePath))
                 {
-                    HtmlFilePath = this.GetFilePath(HtmlLoggerConstants.Html, this.fileName);
+                    HtmlFilePath = GetFilePath(HtmlLoggerConstants.HtmlFileExtension, fileName);
                 }
+
                 htmlTransformer.Transform(XmlFilePath, HtmlFilePath);
             }
-            catch (IOException ioEx)
+            catch (Exception ex)
             {
-                EqtTrace.Error(string.Format("HtmlLogger : Failed to create a xml file. Exception : {0}", ioEx.ToString()));
-                return;
-            }
-            catch (XsltCompileException xslte)
-            {
-                EqtTrace.Error(string.Format("HtmlLogger : Failed to convert xml file to html file. Exception : {0}", xslte.ToString()));
+                EqtTrace.Error("HtmlLogger : Failed to populate html file. Exception : {0}",
+                    ex.ToString());
+                ConsoleOutput.Instance.Error(false, string.Concat(HtmlResource.HtmlLoggerError), ex.Message);
                 return;
             }
 
-            string htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
+            var htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
             EqtTrace.Info(htmlFilePathMessage);
             ConsoleOutput.Instance.Information(false, htmlFilePathMessage);
         }
 
-        private string GetFilePath(string fileFormat,string FileName)
-        {  
-            var fullFileFormat = string.Concat("." + fileFormat);
-            return Path.Combine(this.TestResultsDirPath, string.Concat("TestResult_", FileName, fullFileFormat));
+        private string GetFilePath(string fileExtension, string fileName)
+        {
+            if (fileExtension == null)
+            {
+                return null;
+            }
+
+            var fullFileFormat = $".{fileExtension}";
+            return Path.Combine(TestResultsDirPath, string.Concat("TestResult_", fileName, fullFileFormat));
         }
 
         private static string FormatDateTimeForRunName(DateTime timeStamp)
@@ -314,10 +329,13 @@ private static string FormatDateTimeForRunName(DateTime timeStamp)
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+        private static Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         {
-            TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
-            return parentExecutionIdProperty == null ? Guid.Empty : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+            var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
+                property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
+            return parentExecutionIdProperty == null
+                ? Guid.Empty
+                : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
         }
 
         /// <summary>
@@ -325,9 +343,10 @@ private Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+        private static Guid GetExecutionId(TestObject testResult)
         {
-            TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
+            var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
+                property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
             var executionId = Guid.Empty;
 
             if (executionIdProperty != null)
@@ -343,7 +362,7 @@ private Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         /// </summary>
         /// <param name="duration"></param>
         /// <returns></returns>
-        private string GetFormattedDurationString(TimeSpan duration)
+        private static string GetFormattedDurationString(TimeSpan duration)
         {
             if (duration == default(TimeSpan))
             {
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index e4eb374dbd..3eca547b4e 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -1,30 +1,35 @@
 // 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;
+
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
 {
     using System.Xml;
     using System.Xml.Xsl;
 
-    class HtmlTransformer : IHtmlTransformer
+    /// <summary>
+    /// Html transformer transforms the xml file to html file using xslt file.  
+    /// </summary>
+    internal class HtmlTransformer : IHtmlTransformer
     {
-        XslCompiledTransform xslTransform;
+        private readonly XslCompiledTransform xslTransform;
 
         /// <summary>
-        /// The following function invokes the compiled tranform and Loads the xslt file.
+        /// The following function invokes the compiled transform and Loads the xslt file.
         /// </summary>
         public HtmlTransformer()
         {
             xslTransform = new XslCompiledTransform();
-            xslTransform.Load(XmlReader.Create(this.GetType().Assembly.GetManifestResourceStream("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Html.xslt")));
+            xslTransform.Load(XmlReader.Create(this.GetType().Assembly.GetManifestResourceStream("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Html.xslt") ?? throw new InvalidOperationException()));
         }
 
         /// <summary>
-        /// It transforms the xmlfile to htmlfile.
+        /// It transforms the xml file to html file.
         /// </summary>
-        public void Transform(string xmlfile, string htmlfile)
+        public void Transform(string xmlFile, string htmlFile)
         {
-            xslTransform.Transform(xmlfile, htmlfile);
+            xslTransform.Transform(xmlFile, htmlFile);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
index d3a59034c1..225c56190d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
@@ -6,10 +6,10 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
     public interface IHtmlTransformer
     {
         /// <summary>
-        /// It transforms the xmlfile to htmlfile.
+        /// It transforms the xml file to html file.
         /// </summary>
-        /// <param name="xmlfile"></param>
-        /// <param name="htmlfile"></param>
-        void Transform(string xmlfile, string htmlfile);
+        /// <param name="xmlFile"></param>
+        /// <param name="htmlFile"></param>
+        void Transform(string xmlFile, string htmlFile);
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
index 56f0559c84..c3fc9b6e02 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
@@ -1,21 +1,30 @@
 // 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;
+
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
     using System.Collections.Generic;
 
+    /// <summary>
+    /// Stores the list of failed results and list of all results corresponding to the source.
+    /// </summary>
     public class TestResultCollection
     {
+        private readonly string source;
+
+        public TestResultCollection(string source) => this.source = source ?? throw new ArgumentNullException(nameof(source));
+
         /// <summary>
         /// Source of the test dll.
         /// </summary>
-        public string Source { get; set; }
+        public string Source => this.source;
 
         /// <summary>
         /// Hash id of source.
         /// </summary>
-        public int Id { get; set; }
+        public int Id => this.source.GetHashCode();
 
         /// <summary>
         /// List of test results.
@@ -23,7 +32,7 @@ public class TestResultCollection
         public List<TestResult> ResultList { get; set; }
 
         /// <summary>
-        /// list of failed test results.
+        /// List of failed test results.
         /// </summary>
         public List<TestResult> FailedResultList { get; set; }
     }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index 14a5809c5b..03fe226f46 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -3,42 +3,34 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
-    using System.Collections.Concurrent;
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
+    /// <summary>
+    /// It stores the all relevant information of the test run.
+    /// </summary>
     [DataContract]
     public sealed class TestRunDetails
     {
-        /// <summary>
-        /// Constructor Class for TestRunDetails.
-        /// </summary>
-        public TestRunDetails()
-        {
-        }
-
         /// <summary>
         /// Test run summary of all test results.
         /// </summary>
         [DataMember]
-        internal TestRunSummary Summary { get; set; }
+        public TestRunSummary Summary { get; set; }
 
         /// <summary>
         /// List of informational run level messages.
         /// </summary>
-        [DataMember]
-        internal List<string> RunLevelMessageInformational = new List<string>();
+        [DataMember] public List<string> RunLevelMessageInformational = new List<string>();
 
         /// <summary>
         /// List of error and warning messages.
         /// </summary>
-        [DataMember]
-        internal List<string> RunLevelMessageErrorAndWarning = new List<string>();
+        [DataMember] public List<string> RunLevelMessageErrorAndWarning = new List<string>();
 
         /// <summary>
         /// List of all the results
         /// </summary>
-        [DataMember]
-        internal List<TestResultCollection> ResultCollectionList = new List<TestResultCollection>();
+        [DataMember] public List<TestResultCollection> ResultCollectionList = new List<TestResultCollection>();
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index 4b30d25232..5f5dbc164c 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -3,6 +3,9 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
+    /// <summary>
+    /// Test run summary collects the relevant summary information.
+    /// </summary>
     public class TestRunSummary
     {
         /// <summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
index 88bc22f2b3..a7856c3b39 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
@@ -8,6 +8,9 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
     using System;
     using System.Collections.Generic;
 
+    /// <summary>
+    /// Test results stores the relevant information to show on html file
+    /// </summary>
     public class TestResult
     {
         /// <summary>
@@ -36,7 +39,7 @@ public class TestResult
         public string ErrorMessage { get; set; }
 
         /// <summary>
-        /// Enum that deteremines the outcome of the test case
+        /// Enum that determines the outcome of the test case
         /// </summary>
         public TestOutcome ResultOutcome { get; set; }
 
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
index bee6e31556..9c2bc33784 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
@@ -68,5 +68,14 @@ internal static string HtmlFilePath {
                 return ResourceManager.GetString("HtmlFilePath", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Html Logger Error : {0}.
+        /// </summary>
+        internal static string HtmlLoggerError {
+            get {
+                return ResourceManager.GetString("HtmlLoggerError", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
index fbd6c56715..a176fb3154 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
@@ -120,4 +120,7 @@
   <data name="HtmlFilePath" xml:space="preserve">
     <value>Html test results file : {0}</value>
   </data>
+  <data name="HtmlLoggerError" xml:space="preserve">
+    <value>Html Logger Error : {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index d2385f1049..8accef0dbf 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -6,15 +6,14 @@ namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using VisualStudio.TestTools.UnitTesting;
     using Moq;
     using ObjectModel = VisualStudio.TestPlatform.ObjectModel;
     using VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using HtmlLoggerConstants = Utility.Constants;
+    using HtmlLoggerConstants = VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using HtmlLogger = VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using System.Collections.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using System.Linq;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
@@ -25,11 +24,10 @@ namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
     public class HtmlLoggerTests
     {
         private Mock<TestLoggerEvents> events;
-        private Htmllogger htmlLogger;
+        private HtmlLogger.HtmlLogger htmlLogger;
         private Dictionary<string, string> parameters;
-        private static string DefaultTestRunDirectory = Path.GetTempPath();
-        private static string DefaultLogFileNameParameterValue = "logfilevalue.html";
-
+        private static readonly string DefaultTestRunDirectory = Path.GetTempPath();
+        private static readonly string DefaultLogFileNameParameterValue = "logfilevalue.html";
         private Mock<IFileHelper> mockFileHelper;
         private Mock<XmlObjectSerializer> mockXmlSerializer ;
         private Mock<IHtmlTransformer> mockHtmlTransformer;
@@ -41,10 +39,12 @@ public void Initialize()
             this.mockFileHelper = new Mock<IFileHelper>();
             this.mockHtmlTransformer = new Mock<IHtmlTransformer>();
             this.mockXmlSerializer = new Mock<XmlObjectSerializer>();
-            this.htmlLogger = new Htmllogger(this.mockFileHelper.Object, this.mockHtmlTransformer.Object, this.mockXmlSerializer.Object);
-            this.parameters = new Dictionary<string, string>(2);
-            this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory;
-            this.parameters[HtmlLoggerConstants.LogFileNameKey] = HtmlLoggerTests.DefaultLogFileNameParameterValue;
+            this.htmlLogger = new HtmlLogger.HtmlLogger(this.mockFileHelper.Object, this.mockHtmlTransformer.Object, this.mockXmlSerializer.Object);
+            this.parameters = new Dictionary<string, string>(2)
+            {
+                [DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory,
+                [HtmlLoggerConstants.LogFileNameKey] = HtmlLoggerTests.DefaultLogFileNameParameterValue
+            };
             this.htmlLogger.Initialize(this.events.Object, this.parameters);
         }
 
@@ -61,7 +61,7 @@ public void InitializeShouldThrowExceptionIfEventsIsNull()
         [TestMethod]
         public void InitializeShouldInitializeAllProperties()
         {
-            var testResultDir = @"C:\Code\abc";
+            const string testResultDir = @"C:\Code\abc";
             var events = new Mock<TestLoggerEvents>();
 
             this.htmlLogger.Initialize(events.Object, testResultDir);
@@ -78,7 +78,7 @@ public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
                 () =>
                 {
                     this.events = new Mock<TestLoggerEvents>();
-                    this.parameters[ObjectModel.DefaultLoggerParameterNames.TestRunDirectory] = null;
+                    this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = null;
                     this.htmlLogger.Initialize(events.Object, parameters);
                 });
         }
@@ -102,49 +102,45 @@ public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
         {
-            string message = "First message";
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
+            const string message = "First message";
+            var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
             
-            this.htmlLogger.TestMessageHandler(new object(), trme);
+            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
  
-            string actualMessage = this.htmlLogger.TestRunDetails.RunLevelMessageInformational.First();
-            Assert.AreEqual(message, actualMessage.ToString());   
+            var actualMessage = this.htmlLogger.TestRunDetails.RunLevelMessageInformational.First();
+            Assert.AreEqual(message, actualMessage);   
         }
 
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
         {
-            string message = "error message";
-            string message2 = "warning message";
+            const string message = "error message";
+            const string message2 = "warning message";
 
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
-            this.htmlLogger.TestMessageHandler(new object(), trme);
-            TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
-            this.htmlLogger.TestMessageHandler(new object(), trme2);
+            var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
+            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
+            var testRunMessageEventArgs2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
+            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs2);
             
             Assert.AreEqual(message, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.First());
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.Count());
+            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.Count);
         }
 
         [TestMethod]
-        public void TestResultHandlerShouldKeepTrackofSummary()
+        public void TestResultHandlerShouldKeepTrackOfSummary()
         {
-            TestCase passTestCase1 = CreateTestCase("Pass1");
-            TestCase passTestCase2 = CreateTestCase("Pass2");
-            TestCase failTestCase1 = CreateTestCase("Fail1");
-            TestCase skipTestCase1 = CreateTestCase("Skip1");
+            var passTestCase1 = CreateTestCase("Pass1");
+            var passTestCase2 = CreateTestCase("Pass2");
+            var failTestCase1 = CreateTestCase("Fail1");
+            var skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = TestOutcome.Passed;
+            var passResult1 = new ObjectModel.TestResult(passTestCase1) {Outcome = TestOutcome.Passed};
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = TestOutcome.Passed;
+            var passResult2 = new ObjectModel.TestResult(passTestCase2) {Outcome = TestOutcome.Passed};
 
-            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = TestOutcome.Failed;
+            var failResult1 = new ObjectModel.TestResult(failTestCase1) {Outcome = TestOutcome.Failed};
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = TestOutcome.Skipped;
+            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) {Outcome = TestOutcome.Skipped};
 
             Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
             Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
@@ -165,29 +161,29 @@ public void TestResultHandlerShouldKeepTrackofSummary()
         [TestMethod]
         public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
         {
-            //this assert is for checking result dispalyname equals to null
-            TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase1);
-            PassTestResultExpected.DisplayName = null;
-            PassTestResultExpected.TestCase.FullyQualifiedName = "abc";
-         
+            //this assert is for checking result display name equals to null
+            var passTestCase1 = CreateTestCase("Pass1");
+            var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
+            {
+                DisplayName = null, TestCase = {FullyQualifiedName = "abc"}
+            };
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(PassTestResultExpected);
+
+            var pass1 = new Mock<TestResultEventArgs>(passTestResultExpected);
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
 
-            HtmlLogger.ObjectModel.TestResult passTestResultActual = new HtmlLogger.ObjectModel.TestResult();
+            var passTestResultActual = new HtmlLogger.ObjectModel.TestResult
+            {
+                ResultOutcome = TestOutcome.Passed, DisplayName = "abc"
+            };
 
-            passTestResultActual.ResultOutcome = TestOutcome.Passed;
-            passTestResultActual.DisplayName = "abc";
 
             Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().DisplayName);
        
-            TestCase passTestCase2 = CreateTestCase("Pass1");
-            ObjectModel.TestResult PassTestResultExpected1 = new ObjectModel.TestResult(passTestCase1);
-            PassTestResultExpected.DisplayName = "def";
-            PassTestResultExpected.TestCase.FullyQualifiedName = "abc";
+            
+            passTestResultExpected.DisplayName = "def";
+            passTestResultExpected.TestCase.FullyQualifiedName = "abc";
 
-            Mock<TestResultEventArgs> pass2= new Mock<TestResultEventArgs>(PassTestResultExpected);
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
 
             passTestResultActual.ResultOutcome = TestOutcome.Passed;
@@ -199,20 +195,20 @@ public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
         [TestMethod]
         public void TestResultHandlerShouldCreateTestResultProperly()
         {
-                TestCase passTestCase = CreateTestCase("Pass1");
+                var passTestCase = CreateTestCase("Pass1");
                 passTestCase.DisplayName = "abc";
                 passTestCase.FullyQualifiedName = "fully";
                 passTestCase.Source = "abc/def.dll";
 
-            ObjectModel.TestResult PassTestResultExpected = new ObjectModel.TestResult(passTestCase)
+            var passTestResultExpected = new ObjectModel.TestResult(passTestCase)
             {
                 DisplayName = "def",
                 ErrorMessage = "error message",
-                ErrorStackTrace = "Error strack trace",
+                ErrorStackTrace = "Error stack trace",
                 Duration = TimeSpan.Zero
             };
 
-            Mock<TestResultEventArgs> eventArg = new Mock<TestResultEventArgs>(PassTestResultExpected);
+            var eventArg = new Mock<TestResultEventArgs>(passTestResultExpected);
 
             this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
 
@@ -220,7 +216,7 @@ public void TestResultHandlerShouldCreateTestResultProperly()
            
             Assert.AreEqual(result.DisplayName, "def");
             Assert.AreEqual(result.ErrorMessage, "error message");
-            Assert.AreEqual(result.ErrorStackTrace, "Error strack trace");
+            Assert.AreEqual(result.ErrorStackTrace, "Error stack trace");
             Assert.AreEqual(result.FullyQualifiedName, "fully");
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source, "abc/def.dll");
             Assert.AreEqual(result.Duration, null);
@@ -231,12 +227,10 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
         {
             TestCase testCase1 = CreateTestCase("TestCase1");
             TestCase testCase2 = CreateTestCase("TestCase2");
-            
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = TestOutcome.Passed;
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) {Outcome = TestOutcome.Passed};
 
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
@@ -244,7 +238,7 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 2, "TestResultHandler is not creating test result entry for each test case");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, 2, "TestResultHandler is not creating test result entry for each test case");
         }
 
         [TestMethod]
@@ -255,11 +249,9 @@ public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
             testCase1.Source = "abc.dll";
             testCase2.Source = "def.dll";
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = TestOutcome.Passed;
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) {Outcome = TestOutcome.Passed};
 
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
@@ -267,21 +259,20 @@ public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.Count(), 2);
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.Count, 2);
         }
 
         [TestMethod]
         public void TestResultHandlerShouldAddFailedResultToFailedResultListInTestResultCollection()
         {
-            TestCase testCase1 = CreateTestCase("TestCase1");           
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
 
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count(),1);
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count,1);
         }
 
         [TestMethod]
@@ -294,33 +285,32 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             Guid parentExecutionId = Guid.NewGuid();
 
             ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
-            result1.SetPropertyValue<Guid>(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
+            result1.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
+            result1.SetPropertyValue(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
 
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 1, "testhandler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults,  "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, 1, "test handler is adding parent result correctly");
+            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults,  "test handler is adding child result correctly");
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+            var result2 = new ObjectModel.TestResult(testCase2);
+            result2.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+            result2.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
-            result3.Outcome = TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+            var result3 = new ObjectModel.TestResult(testCase3) {Outcome = TestOutcome.Failed};
+            result3.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+            result3.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+            var resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+            var resultEventArg3 = new Mock<TestResultEventArgs>(result3);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count(), 1, "testhandler is adding parent result correctly");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults.Count(), 2, "testhandler is adding child result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, 1, "test handler is adding parent result correctly");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults.Count, 2, "test handler is adding child result correctly");
         }
 
         [TestMethod]
@@ -331,22 +321,18 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             TestCase failTestCase1 = CreateTestCase("Fail1");
             TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = TestOutcome.Passed;
+            var passResult1 = new ObjectModel.TestResult(passTestCase1) {Outcome = TestOutcome.Passed};
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = TestOutcome.Passed;
+            var passResult2 = new ObjectModel.TestResult(passTestCase2) {Outcome = TestOutcome.Passed};
 
-            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = TestOutcome.Failed;
+            var failResult1 = new ObjectModel.TestResult(failTestCase1) {Outcome = TestOutcome.Failed};
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = TestOutcome.Skipped;
+            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) {Outcome = TestOutcome.Skipped};
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+            var pass1 = new Mock<TestResultEventArgs>(passResult1);
+            var pass2 = new Mock<TestResultEventArgs>(passResult2);
+            var fail1 = new Mock<TestResultEventArgs>(failResult1);
+            var skip1 = new Mock<TestResultEventArgs>(skipResult1);
 
 
             this.htmlLogger.TestResultHandler(new object(), pass1.Object);
@@ -354,30 +340,31 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             this.htmlLogger.TestResultHandler(new object(), fail1.Object);
             this.htmlLogger.TestResultHandler(new object(), skip1.Object);
 
-            string fileName;
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+                {
+                }).Returns(new Mock<Stream>().Object);
 
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
 
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalTests, 4, "summary should keep track of totaltests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.FailedTests, 1, "summary should keep track of failedtests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassedTests, 2, "summary should keep track of passedtests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.SkippedTests, 1, "summary should keep track of passedtests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassPercentage, 50, "summary should keep track of passedtests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, null , "summary should keep track of passedtests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalTests, 4, "summary should keep track of total tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.FailedTests, 1, "summary should keep track of failed tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassedTests, 2, "summary should keep track of passed tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.SkippedTests, 1, "summary should keep track of passed tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassPercentage, 50, "summary should keep track of passed tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, null , "summary should keep track of passed tests");
         }
 
         [TestMethod]
         public void TestCompleteHandlerShouldCreateFileCorrectly()
         {
-            string fileName;
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            var testCase1 = CreateTestCase("TestCase1");
+            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
            
 
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+                {
+                }).Returns(new Mock<Stream>().Object);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
@@ -389,13 +376,13 @@ public void TestCompleteHandlerShouldCreateFileCorrectly()
         [TestMethod]
         public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         {
-            string fileName;
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            var testCase1 = CreateTestCase("TestCase1");
+            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+                {
+                }).Returns(new Mock<Stream>().Object);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
@@ -406,12 +393,12 @@ public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         [TestMethod]
         public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
         {
-            string fileName;
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = TestOutcome.Failed;
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) => fileName = x).Returns(new Mock<Stream>().Object);
+            var testCase1 = CreateTestCase("TestCase1") ?? throw new ArgumentNullException($"CreateTestCase(\"TestCase1\")");
+            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+                {
+                }).Returns(new Mock<Stream>().Object);
 
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
@@ -425,37 +412,6 @@ private static TestCase CreateTestCase(string testCaseName)
         {
             return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
         }
-
-        private static TestRunCompleteEventArgs CreateTestRunCompleteEventArgs()
-        {
-            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null,
-                new Collection<AttachmentSet>(), new TimeSpan(1, 0, 0, 0));
-            return testRunCompleteEventArgs;
-        }
-
-        private static Mock<TestResultEventArgs> CreatePassTestResultEventArgsMock(string testCaseName = "Pass1", List<TestResultMessage> testResultMessages = null)
-        {
-            TestCase passTestCase = CreateTestCase(testCaseName);
-            var passResult = new ObjectModel.TestResult(passTestCase);
-
-            if (testResultMessages != null && testResultMessages.Any())
-            {
-                foreach (var message in testResultMessages)
-                {
-                    passResult.Messages.Add(message);
-                }
-            }
-            return new Mock<TestResultEventArgs>(passResult);
-        }
-
-        private void MakeTestRunComplete()
-        {
-            var pass = HtmlLoggerTests.CreatePassTestResultEventArgsMock();
-            this.htmlLogger.TestResultHandler(new object(), pass.Object);
-            var testRunCompleteEventArgs = HtmlLoggerTests.CreateTestRunCompleteEventArgs();
-            this.htmlLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
-        }
-
     }
 }
 

From 4b0a936ff360ff118b30eb018693eff7df56a1a2 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Mon, 26 Aug 2019 18:09:45 +0530
Subject: [PATCH 17/20] Fixed the xslt issues and added comments.\ Fixed the
 Portable nuspec file

---
 .../build/TestPlatform.Localization.targets   |  1 -
 .../Helpers/FileHelper.cs                     |  6 ++
 .../Helpers/Interfaces/IFileHelper.cs         |  6 ++
 .../Friends.cs                                | 10 ----
 .../Html.xslt                                 | 57 +++++++++----------
 .../HtmlLogger.cs                             | 17 +++++-
 .../{Testresult.cs => HtmlTestResult.cs}      | 19 ++++---
 .../ObjectModel/TestResultCollection.cs       | 18 ++++--
 .../ObjectModel/TestRunDetails.cs             |  3 +-
 .../ObjectModel/TestRunSummary.cs             | 15 +++--
 .../Utility/Constants.cs                      | 56 ------------------
 .../Microsoft.TestPlatform.Portable.nuspec    |  6 +-
 12 files changed, 94 insertions(+), 120 deletions(-)
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
 rename src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/{Testresult.cs => HtmlTestResult.cs} (69%)
 delete mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs

diff --git a/scripts/build/TestPlatform.Localization.targets b/scripts/build/TestPlatform.Localization.targets
index 4ee9a56219..084c042101 100644
--- a/scripts/build/TestPlatform.Localization.targets
+++ b/scripts/build/TestPlatform.Localization.targets
@@ -33,7 +33,6 @@
   </Target>-->
 
   <Target Name="_CreateLocalizeXLF">
-    <!--Condition="$('EmbeddedResource.EndsWith('resx')') != 'true'">-->
     <Message Importance="High" Text="Create localized xlf for '$(AssemblyName)'" />
     <CreateItem Include="@(EmbeddedResource)" AdditionalMetadata="Language=%(ResxLang.Identity)">
       <Output ItemName="LocResourceFile" TaskParameter="Include"/>
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
index de8b1bac5b..461679f2de 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
@@ -132,5 +132,11 @@ public string[] GetFiles(string path, string searchPattern, SearchOption searchO
         {
             return Directory.GetFiles(path, searchPattern, searchOption);
         }
+
+        /// <inheritdoc/>
+        public void Delete(string path)
+        {
+            File.Delete(path);
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
index fa7393242e..4c73017044 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
@@ -134,5 +134,11 @@ public interface IFileHelper
         /// <param name="searchOption">Search option</param>
         /// <returns>string[]</returns>
         string[] GetFiles(string path, string searchPattern, SearchOption searchOption);
+
+        /// <summary>
+        /// Deletes the specified file
+        /// </summary>
+        /// <param name="path"></param>
+        void Delete(string path);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
deleted file mode 100644
index b110313624..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.Runtime.CompilerServices;
-
-#region Test Assemblies
-
-[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-
-#endregion
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index 8aa913fde4..8ecccc1626 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -38,15 +38,15 @@
         border: 2px solid #ffffff;
         width:100%;
         cursor:pointer;
-        background-color:#bcdaf7;
+        background-color:#d7e9fa;
         }
-        .listRow {
+        .list-row {
         border: 2px solid #ffffff;
         width:100%;
         cursor:pointer;
         background-color:#ffffff;
         }
-        .innerRow{
+        .inner-row{
         border: 2px solid #ffffff;
         padding-left:1%;
         margin-left:1%;
@@ -55,25 +55,19 @@
         .block{
         width : 150px;
         }
-        .leafDivision{
+        .leaf-division{
         border: 2px solid #ffffff;
-        background-color:#e0f0ff;
-        }
-        .resultDivision{
-        border: 2px solid #ffffff;
-        padding-left:1%;
-        margin-left:1%;
-        background-color:#ffffff;
+        background-color:#e6eff7;
         }
         .pass { color: #0c0; }
         .fail { color: #c00; }
-        .errorMessage { color : brown; }
-        .errorStackTrace { color: brown; }
+        .error-message { color : brown; }
+        .error-stack-trace { color: brown; }
         .duration {float:right;padding-right:1%;}
-        .totalTests { font-size : 30px}
-        .testRunTime { font-size : 30px}
-        .passPercentage { font-size : 30px}
-        .errorInfo{
+        .total-tests { font-size : 30px}
+        .test-run-time { font-size : 30px}
+        .pass-percentage { font-size : 30px}
+        .error-info{
         margin-left:16px;
         }
       </style>
@@ -100,7 +94,10 @@
   </xsl:template>
 
   <xsl:template match="/tp:TestRunDetails/tp:ResultCollectionList">
-    <h2>Failed Results</h2><xsl:call-template name ="FailedResults"/>
+    <xsl:if test="count(tp:TestResultCollection/tp:FailedResultList/tp:TestResult)>0">
+      <h2>Failed Results</h2>
+      <xsl:call-template name ="FailedResults"/>
+    </xsl:if>
     <h2>All Results</h2><xsl:call-template name ="Results"/>
   </xsl:template>
 
@@ -108,8 +105,8 @@
     <xsl:for-each select ="tp:TestResultCollection">
       <xsl:variable name="Source" select="tp:Id" />
       <xsl:if test="tp:ResultList!=''">
-        <div class ="listRow" onclick="ToggleClass('{$Source}')"><xsl:value-of select = "tp:Source" /></div>
-        <div class ="resultDivision" Id="{$Source}" style="display:none;">
+        <div class ="list-row" onclick="ToggleClass('{$Source}')"><xsl:value-of select = "tp:Source" /></div>
+        <div class ="inner-row" Id="{$Source}" style="display:none;">
           <xsl:for-each select ="tp:ResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
         </div>
       </xsl:if>
@@ -120,8 +117,8 @@
     <xsl:for-each select ="tp:TestResultCollection">
       <xsl:variable name="Source" select="tp:Id" />
       <xsl:if test="tp:FailedResultList!=''">
-        <div class ="listRow" onclick="ToggleClass('{concat($Source,'-failedResult')}')"><xsl:value-of select = "tp:Source" /> </div>
-        <div class ="resultDivision" Id="{concat($Source,'-failedResult')}" style="display:block;">
+        <div class ="list-row" onclick="ToggleClass('{concat($Source,'-failedResult')}')"><xsl:value-of select = "tp:Source" /> </div>
+        <div class ="inner-row" Id="{concat($Source,'-failedResult')}" style="display:block;">
           <xsl:for-each select ="tp:FailedResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
         </div>
       </xsl:if>
@@ -137,13 +134,13 @@
     </xsl:if> 
     
     <xsl:if test ="tp:InnerTestResults=''">
-      <div class ="leafDivision"><xsl:call-template name = "Result" /></div>
+      <div class ="leaf-division"><xsl:call-template name = "Result" /></div>
     </xsl:if>   
     
   </xsl:template>
   
   <xsl:template match="tp:InnerTestResults">
-    <div class ="innerRow"><xsl:apply-templates select = "tp:TestResult" /></div>
+    <div class ="inner-row"><xsl:apply-templates select = "tp:TestResult" /></div>
   </xsl:template>
 
 <xsl:template name="Result" >
@@ -152,18 +149,18 @@
       <xsl:apply-templates select = "tp:DisplayName" />
       <div class="duration"><xsl:apply-templates select = "tp:Duration" /></div>
     </div>
-   <div class="errorInfo"> 
+   <div class="error-info"> 
      <xsl:if test ="tp:ErrorMessage!=''"><xsl:apply-templates select = "tp:ErrorMessage" /></xsl:if>
      <xsl:if test ="tp:ErrorStackTrace!=''"><xsl:apply-templates select = "tp:ErrorStackTrace" /></xsl:if>
    </div>
   </xsl:template>
   
   <xsl:template match = "tp:ErrorMessage">
-    Error: <span class="errorMessage"><xsl:value-of select = "." /></span><br />
+    Error: <span class="error-message"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:ErrorStackTrace">
-    Stack trace: <span class="errorStackTrace"><xsl:value-of select = "." /></span><br />
+    Stack trace: <span class="error-stack-trace"><xsl:value-of select = "." /></span><br />
   </xsl:template>
 
   <xsl:template match = "tp:FailedTests">
@@ -179,15 +176,15 @@
   </xsl:template>
 
   <xsl:template match = "tp:TotalTests">
-    <span>Total tests</span><div  class="totalTests"><xsl:value-of select = "." /></div><br />
+    <span>Total tests</span><div  class="total-tests"><xsl:value-of select = "." /></div><br />
   </xsl:template>
 
   <xsl:template match = "tp:TotalRunTime">
-    <span>Run duration</span><div  class="testRunTime" ><xsl:value-of select = "." /></div><br />
+    <span>Run duration</span><div  class="test-run-time" ><xsl:value-of select = "." /></div><br />
   </xsl:template>
 
   <xsl:template match = "tp:PassPercentage">
-    <span>Pass percentage</span><div  class="passPercentage" ><xsl:value-of select = "." /> &#37;</div><br />
+    <span>Pass percentage</span><div  class="pass-percentage" ><xsl:value-of select = "." /> &#37;</div><br />
   </xsl:template>
 
   <xsl:template match = "tp:ResultOutcome">
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index 71b8a65001..f67db56df1 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -89,7 +89,14 @@ public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
         /// </summary>
         public int SkippedTests { get; private set; }
 
+        /// <summary>
+        /// Path to the xml file.
+        /// </summary>
         public string XmlFilePath { get; private set; }
+
+        /// <summary>
+        /// path to html file.
+        /// </summary>
         public string HtmlFilePath { get; private set; }
 
         public void Initialize(TestLoggerEvents events, string testResultsDirPath)
@@ -166,7 +173,7 @@ public void TestMessageHandler(object sender, TestRunMessageEventArgs e)
         /// <param name="sender"></param>
         /// <param name="e"></param>
         public void TestResultHandler(object sender, TestResultEventArgs e)
-        { 
+        {
             ValidateArg.NotNull(sender, "sender");
             ValidateArg.NotNull(e, "e");
 
@@ -281,6 +288,7 @@ private void PopulateHtmlFile()
                 var fileName = string.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}",
                     Environment.GetEnvironmentVariable("UserName"), Environment.MachineName,
                     FormatDateTimeForRunName(DateTime.Now));
+
                 XmlFilePath = GetFilePath(HtmlLoggerConstants.XmlFileExtension, fileName);
 
                 using (var xmlStream = fileHelper.GetStream(XmlFilePath, FileMode.Create))
@@ -302,6 +310,13 @@ private void PopulateHtmlFile()
                 ConsoleOutput.Instance.Error(false, string.Concat(HtmlResource.HtmlLoggerError), ex.Message);
                 return;
             }
+            finally
+            {
+                if (XmlFilePath != null)
+                {
+                    this.fileHelper.Delete(XmlFilePath);
+                }
+            }
 
             var htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
             EqtTrace.Info(htmlFilePathMessage);
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
similarity index 69%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
index a7856c3b39..0285f114e0 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/Testresult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
@@ -1,6 +1,8 @@
 // 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.Runtime.Serialization;
+
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
 
@@ -11,46 +13,47 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
     /// <summary>
     /// Test results stores the relevant information to show on html file
     /// </summary>
+    [DataContract]
     public class TestResult
     {
         /// <summary>
         /// Fully qualified name of the Test Result.
         /// </summary>
-        public string FullyQualifiedName { get; set; }
+        [DataMember] public string FullyQualifiedName { get; set; }
 
         /// <summary>
         /// Unique identifier for test result
         /// </summary>
-        public Guid TestResultId { get; set; }
+        [DataMember] public Guid TestResultId { get; set; }
 
         /// <summary>
         /// Display Name for the particular Test Result
         /// </summary>
-        public string DisplayName { get; set; }
+        [DataMember] public string DisplayName { get; set; }
 
         /// <summary>
         /// The error stack trace of the Test Result.
         /// </summary>
-        public string ErrorStackTrace { get; set; }
+        [DataMember] public string ErrorStackTrace { get; set; }
 
         /// <summary>
         /// Error message of the Test Result.
         /// </summary>
-        public string ErrorMessage { get; set; }
+        [DataMember] public string ErrorMessage { get; set; }
 
         /// <summary>
         /// Enum that determines the outcome of the test case
         /// </summary>
-        public TestOutcome ResultOutcome { get; set; }
+        [DataMember] public TestOutcome ResultOutcome { get; set; }
 
         /// <summary>
         /// Total timespan of the TestResult
         /// </summary>
-        public string Duration { get; set; }
+        [DataMember] public string Duration { get; set; }
 
         /// <summary>
         /// The list of TestResults that are children to the current Test Result.
         /// </summary>
-        public List<TestResult> InnerTestResults { get; set; }
+        [DataMember] public List<TestResult> InnerTestResults { get; set; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
index c3fc9b6e02..b2778d3e3c 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
@@ -10,6 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
     /// <summary>
     /// Stores the list of failed results and list of all results corresponding to the source.
     /// </summary>
+    [DataContract]
     public class TestResultCollection
     {
         private readonly string source;
@@ -19,21 +21,29 @@ public class TestResultCollection
         /// <summary>
         /// Source of the test dll.
         /// </summary>
-        public string Source => this.source;
+        [DataMember] public string Source
+        {
+            get => this.source;
+            private set { }
+        }
 
         /// <summary>
         /// Hash id of source.
         /// </summary>
-        public int Id => this.source.GetHashCode();
+        [DataMember] public int Id
+        {
+            get => this.source.GetHashCode();
+            private set { }
+        }
 
         /// <summary>
         /// List of test results.
         /// </summary>
-        public List<TestResult> ResultList { get; set; }
+        [DataMember] public List<TestResult> ResultList { get; set; }
 
         /// <summary>
         /// List of failed test results.
         /// </summary>
-        public List<TestResult> FailedResultList { get; set; }
+        [DataMember] public List<TestResult> FailedResultList { get; set; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index 03fe226f46..5edfbfd364 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -15,8 +15,7 @@ public sealed class TestRunDetails
         /// <summary>
         /// Test run summary of all test results.
         /// </summary>
-        [DataMember]
-        public TestRunSummary Summary { get; set; }
+        [DataMember] public TestRunSummary Summary { get; set; }
 
         /// <summary>
         /// List of informational run level messages.
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index 5f5dbc164c..fdd693946f 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -1,41 +1,44 @@
 // 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.Runtime.Serialization;
+
 namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
 {
     /// <summary>
     /// Test run summary collects the relevant summary information.
     /// </summary>
+    [DataContract]
     public class TestRunSummary
     {
         /// <summary>
         /// Indicates the pass percentage
         /// </summary>
-        public int PassPercentage { get; set; }
+        [DataMember] public int PassPercentage { get; set; }
 
         /// <summary>
         /// Total test run time.
         /// </summary>
-        public string TotalRunTime { get; set; }
+        [DataMember] public string TotalRunTime { get; set; }
 
         /// <summary>
         /// Total tests of a test run.
         /// </summary>
-        public int TotalTests { get; set; }
+        [DataMember] public int TotalTests { get; set; }
 
         /// <summary>
         /// Passed tests of test run.
         /// </summary>
-        public int PassedTests { get; set; }
+        [DataMember] public int PassedTests { get; set; }
 
         /// <summary>
         /// Failed Tests of test run.
         /// </summary>
-        public int FailedTests { get; set; }
+        [DataMember] public int FailedTests { get; set; }
 
         /// <summary>
         /// Skipped Tests of test run.
         /// </summary>
-        public int SkippedTests { get; set; }
+        [DataMember] public int SkippedTests { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
deleted file mode 100644
index ae95f1d86d..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Utility/Constants.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// 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.TestPlatform.Extensions.HtmlLogger.Utility
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    internal static class Constants
-    {
-        /// <summary>
-        /// Uri used to uniquely identify the Html logger.
-        /// </summary>
-        public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
-
-        /// <summary>
-        /// Alternate user friendly string to uniquely identify the console logger.
-        /// </summary>
-        public const string FriendlyName = "Html";
-
-        public const string Xml = "xml";
-
-        public const string Html = "html";
-
-        ///  /// <summary>
-        /// Property Id storing the TestType.
-        /// </summary>
-        public const string TestTypePropertyIdentifier = "TestType";
-
-        /// <summary>
-        /// Ordered test type guid
-        /// </summary>
-        public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
-
-        /// <summary>
-        ///  Property Id storing the ParentExecutionId.
-        /// </summary>
-        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
-
-        /// <summary>
-        ///  Property Id storing the ExecutionId.
-        /// </summary>
-        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
-
-        /// <summary>
-        ///  Log file parameter key
-        /// </summary>
-        public const string LogFileNameKey = "LogFileName"; 
-
-        public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
-
-        public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
-
-        public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(VisualStudio.TestPlatform.ObjectModel.TestResult));
-    }
-}
\ No newline at end of file
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
index 4f7b4f7b13..2b5534830b 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
@@ -296,6 +296,7 @@
     <file src="netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
     <file src="netcoreapp2.1\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
     <file src="netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+    <file src="netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
     <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -376,8 +377,8 @@
     <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\ru\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ru\vstest.console.resources.dll" />
     <file src="netcoreapp2.1\TestHost\datacollector.exe"	target="tools\netcoreapp2.1\TestHost\datacollector.exe" />
@@ -511,6 +512,7 @@
     <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
     <file src="netcoreapp2.1\zh-Hant\vstest.console.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\vstest.console.resources.dll" />

From 93467b26ffafd62af91a4b6d24ac45ba27e5fe4c Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Tue, 27 Aug 2019 19:35:19 +0530
Subject: [PATCH 18/20] unit tests refactored

---
 scripts/build/TestPlatform.Dependencies.props |   4 +-
 scripts/verify-nupkgs.ps1                     |   2 +-
 .../HtmlLoggerTests.cs                        | 288 +++++++++++-------
 .../TrxLoggerTests.cs                         |   4 -
 4 files changed, 184 insertions(+), 114 deletions(-)

diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index c9d3ebcd31..50026c9a5a 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -6,8 +6,8 @@
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
     <NETTestSdkPreviousVersion>15.5.0</NETTestSdkPreviousVersion>
 
-    <MSTestFrameworkVersion>1.3.1</MSTestFrameworkVersion>
-    <MSTestAdapterVersion>1.3.1</MSTestAdapterVersion>
+    <MSTestFrameworkVersion>1.4.0</MSTestFrameworkVersion>
+    <MSTestAdapterVersion>1.4.0</MSTestAdapterVersion>
     <MSTestAssertExtensionVersion>1.0.3-preview</MSTestAssertExtensionVersion>
     
     <XUnitFrameworkVersion>2.3.1</XUnitFrameworkVersion>
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 327f0cd050..b002ab1610 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -19,7 +19,7 @@ function Verify-Nuget-Packages($packageDirectory)
                      "Microsoft.TestPlatform.CLI" = 317;
                      "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
                      "Microsoft.TestPlatform.ObjectModel" = 62;
-                     "Microsoft.TestPlatform.Portable" = 498;
+                     "Microsoft.TestPlatform.Portable" = 502;
                      "Microsoft.TestPlatform.TestHost" = 140;
                      "Microsoft.TestPlatform.TranslationLayer" = 121}
 
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 8accef0dbf..8953117717 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -29,11 +29,11 @@ public class HtmlLoggerTests
         private static readonly string DefaultTestRunDirectory = Path.GetTempPath();
         private static readonly string DefaultLogFileNameParameterValue = "logfilevalue.html";
         private Mock<IFileHelper> mockFileHelper;
-        private Mock<XmlObjectSerializer> mockXmlSerializer ;
+        private Mock<XmlObjectSerializer> mockXmlSerializer;
         private Mock<IHtmlTransformer> mockHtmlTransformer;
 
         [TestInitialize]
-        public void Initialize()
+        public void TestInitialize()
         {
             this.events = new Mock<TestLoggerEvents>();
             this.mockFileHelper = new Mock<IFileHelper>();
@@ -48,6 +48,8 @@ public void Initialize()
             this.htmlLogger.Initialize(this.events.Object, this.parameters);
         }
 
+        #region Initialize Method
+
         [TestMethod]
         public void InitializeShouldThrowExceptionIfEventsIsNull()
         {
@@ -99,16 +101,27 @@ public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
             });
         }
 
+        #endregion
+
         [TestMethod]
         public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
         {
             const string message = "First message";
             var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
-            
+
             this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
- 
+
             var actualMessage = this.htmlLogger.TestRunDetails.RunLevelMessageInformational.First();
-            Assert.AreEqual(message, actualMessage);   
+            Assert.AreEqual(message, actualMessage);
+        }
+
+
+        [TestMethod]
+        public void TestCompleteHandlerShouldThrowExceptionIfParametersAreNull()
+        {
+            Dictionary<string, string> parameters = null;
+            var events = new Mock<TestLoggerEvents>();
+            Assert.ThrowsException<ArgumentNullException>(() => this.htmlLogger.Initialize(events.Object, parameters));
         }
 
         [TestMethod]
@@ -121,120 +134,165 @@ public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
             this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
             var testRunMessageEventArgs2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
             this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs2);
-            
+
             Assert.AreEqual(message, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.First());
             Assert.AreEqual(2, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.Count);
         }
 
         [TestMethod]
-        public void TestResultHandlerShouldKeepTrackOfSummary()
+        public void TestResultHandlerShouldKeepTrackOfFailedResult()
         {
-            var passTestCase1 = CreateTestCase("Pass1");
-            var passTestCase2 = CreateTestCase("Pass2");
             var failTestCase1 = CreateTestCase("Fail1");
-            var skipTestCase1 = CreateTestCase("Skip1");
 
-            var passResult1 = new ObjectModel.TestResult(passTestCase1) {Outcome = TestOutcome.Passed};
+            var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
 
-            var passResult2 = new ObjectModel.TestResult(passTestCase2) {Outcome = TestOutcome.Passed};
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
 
-            var failResult1 = new ObjectModel.TestResult(failTestCase1) {Outcome = TestOutcome.Failed};
+            Assert.AreEqual(this.htmlLogger.FailedTests, 1, "Failed Tests");
+        }
 
-            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) {Outcome = TestOutcome.Skipped};
+        [TestMethod]
+        public void TestResultHandlerShouldKeepTrackOfTotalResult()
+        {
+            var passTestCase1 = CreateTestCase("Pass1");
+            var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
+            
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+            Assert.AreEqual(this.htmlLogger.TotalTests, 1, "Total Tests");
+        }
 
+        [TestMethod]
+        public void TestResultHandlerShouldKeepTrackOfPassedResult()
+        {
+            var passTestCase2 = CreateTestCase("Pass2");       
+            var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
 
-            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
-            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
-            this.htmlLogger.TestResultHandler(new object(), fail1.Object);
-            this.htmlLogger.TestResultHandler(new object(), skip1.Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
 
-            Assert.AreEqual(this.htmlLogger.PassedTests, 2, "Passed Tests");
-            Assert.AreEqual(this.htmlLogger.FailedTests, 1, "Failed Tests");
-            Assert.AreEqual(this.htmlLogger.TotalTests, 4, "Total Tests");
+            Assert.AreEqual(this.htmlLogger.PassedTests, 1, "Passed Tests");
         }
 
         [TestMethod]
-        public void TestResultHandlerShouldSetDisplayNameIfNullProperly()
+        public void TestResultHandlerShouldKeepTrackOfSkippedResult()
+        {
+         
+            var skipTestCase1 = CreateTestCase("Skip1");
+            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
+
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
+
+            Assert.AreEqual(this.htmlLogger.SkippedTests, 1, "Skipped Tests");
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNull()
         {
             //this assert is for checking result display name equals to null
             var passTestCase1 = CreateTestCase("Pass1");
             var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
             {
-                DisplayName = null, TestCase = {FullyQualifiedName = "abc"}
+                DisplayName = null,
+                TestCase = { FullyQualifiedName = "abc" }
             };
 
+            this.htmlLogger.TestResultHandler(new object(),new Mock<TestResultEventArgs>(passTestResultExpected).Object);
 
-            var pass1 = new Mock<TestResultEventArgs>(passTestResultExpected);
-            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
+            Assert.AreEqual("abc", this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().DisplayName);
+        }
 
-            var passTestResultActual = new HtmlLogger.ObjectModel.TestResult
+        [TestMethod]
+        public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNotNull()
+        {
+            //this assert is for checking result display name not equals to null
+            var passTestCase1 = CreateTestCase("Pass1");
+            var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
             {
-                ResultOutcome = TestOutcome.Passed, DisplayName = "abc"
+                DisplayName = "def",
+                TestCase = { FullyQualifiedName = "abc" }
             };
 
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passTestResultExpected).Object);
 
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().DisplayName);
-       
-            
-            passTestResultExpected.DisplayName = "def";
-            passTestResultExpected.TestCase.FullyQualifiedName = "abc";
-
-            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
-
-            passTestResultActual.ResultOutcome = TestOutcome.Passed;
-            passTestResultActual.DisplayName = "def";
-
-            Assert.AreEqual(passTestResultActual.DisplayName, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Last().DisplayName);           
+            Assert.AreEqual("def", this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Last().DisplayName);
         }
 
         [TestMethod]
         public void TestResultHandlerShouldCreateTestResultProperly()
         {
-                var passTestCase = CreateTestCase("Pass1");
-                passTestCase.DisplayName = "abc";
-                passTestCase.FullyQualifiedName = "fully";
-                passTestCase.Source = "abc/def.dll";
+            var passTestCase = CreateTestCase("Pass1");
+            passTestCase.DisplayName = "abc";
+            passTestCase.FullyQualifiedName = "fully";
+            passTestCase.Source = "abc/def.dll";
+            TimeSpan ts1 = new TimeSpan(0, 0, 0, 1, 0);
 
             var passTestResultExpected = new ObjectModel.TestResult(passTestCase)
             {
                 DisplayName = "def",
                 ErrorMessage = "error message",
                 ErrorStackTrace = "Error stack trace",
-                Duration = TimeSpan.Zero
+                Duration = ts1
             };
 
             var eventArg = new Mock<TestResultEventArgs>(passTestResultExpected);
-
+            // Act
             this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
 
             var result = this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First();
-           
+
             Assert.AreEqual(result.DisplayName, "def");
             Assert.AreEqual(result.ErrorMessage, "error message");
             Assert.AreEqual(result.ErrorStackTrace, "Error stack trace");
             Assert.AreEqual(result.FullyQualifiedName, "fully");
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source, "abc/def.dll");
-            Assert.AreEqual(result.Duration, null);
+            Assert.AreEqual(result.Duration, "1s");
         }
 
         [TestMethod]
-        public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
+        public void GetFormattedDurationStringShouldGiveCorrectFormat()
         {
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            TestCase testCase2 = CreateTestCase("TestCase2");
+            TimeSpan ts1 = new TimeSpan(0, 0, 0, 0, 1);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts1), "1ms");
+
+            TimeSpan ts2 = new TimeSpan(0, 0, 0, 1, 0);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts2), "1s");
+
+            TimeSpan ts3 = new TimeSpan(0, 0, 1, 0, 1);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts3), "1m");
+;
+            TimeSpan ts4 = new TimeSpan(0, 1, 0, 2, 3);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts4), "1h");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            TimeSpan ts5 = new TimeSpan(0, 1, 2, 3, 4);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts5), "1h 2m");
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) {Outcome = TestOutcome.Passed};
+            TimeSpan ts6 = new TimeSpan(0, 0, 1, 2, 3);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts6), "1m 2s");
 
+            TimeSpan ts7 = new TimeSpan(0, 0, 0, 1, 3);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts7), "1s 3ms");
+
+            TimeSpan ts8 = new TimeSpan(2);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts8), "< 1ms");
+
+            TimeSpan ts10 = new TimeSpan(1, 0, 0, 1, 3);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts10), "1d 1s 3ms");
+
+            TimeSpan ts9 = new TimeSpan(0, 0, 0, 0, 0);
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts9), null);
+        }
+
+        [TestMethod]
+        public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
+        {
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            TestCase testCase2 = CreateTestCase("TestCase2");
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
             Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
 
+            // Act
             this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
             this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
@@ -245,42 +303,39 @@ public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
         public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
         {
             TestCase testCase1 = CreateTestCase("TestCase1");
-            TestCase testCase2 = CreateTestCase("TestCase2");
             testCase1.Source = "abc.dll";
-            testCase2.Source = "def.dll";
-
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) {Outcome = TestOutcome.Passed};
+            TestCase testCase2 = CreateTestCase("TestCase2");
+            testCase2.Source = "def.dll";
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
 
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.Count, 2);
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source, "abc.dll");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.Last().Source, "def.dll");
         }
 
         [TestMethod]
         public void TestResultHandlerShouldAddFailedResultToFailedResultListInTestResultCollection()
         {
             TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count,1);
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count, 1);
         }
 
         [TestMethod]
         public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
         {
-           TestCase testCase1 = CreateTestCase("TestCase1");
-           TestCase testCase2 = CreateTestCase("TestCase2");
-           TestCase testCase3 = CreateTestCase("TestCase3");
+            TestCase testCase1 = CreateTestCase("TestCase1");
+            TestCase testCase2 = CreateTestCase("TestCase2");
+            TestCase testCase3 = CreateTestCase("TestCase3");
 
             Guid parentExecutionId = Guid.NewGuid();
 
@@ -288,26 +343,21 @@ public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
             result1.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
             result1.SetPropertyValue(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
 
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, 1, "test handler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults,  "test handler is adding child result correctly");
+            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults, "test handler is adding child result correctly");
 
             var result2 = new ObjectModel.TestResult(testCase2);
             result2.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
             result2.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            var result3 = new ObjectModel.TestResult(testCase3) {Outcome = TestOutcome.Failed};
+            var result3 = new ObjectModel.TestResult(testCase3) { Outcome = TestOutcome.Failed };
             result3.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
             result3.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            var resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            var resultEventArg3 = new Mock<TestResultEventArgs>(result3);
-
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg3.Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result3).Object);
 
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, 1, "test handler is adding parent result correctly");
             Assert.AreEqual(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults.Count, 2, "test handler is adding child result correctly");
@@ -320,25 +370,15 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             TestCase passTestCase2 = CreateTestCase("Pass2");
             TestCase failTestCase1 = CreateTestCase("Fail1");
             TestCase skipTestCase1 = CreateTestCase("Skip1");
-
-            var passResult1 = new ObjectModel.TestResult(passTestCase1) {Outcome = TestOutcome.Passed};
-
-            var passResult2 = new ObjectModel.TestResult(passTestCase2) {Outcome = TestOutcome.Passed};
-
-            var failResult1 = new ObjectModel.TestResult(failTestCase1) {Outcome = TestOutcome.Failed};
-
-            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) {Outcome = TestOutcome.Skipped};
-
-            var pass1 = new Mock<TestResultEventArgs>(passResult1);
-            var pass2 = new Mock<TestResultEventArgs>(passResult2);
-            var fail1 = new Mock<TestResultEventArgs>(failResult1);
-            var skip1 = new Mock<TestResultEventArgs>(skipResult1);
-
-
-            this.htmlLogger.TestResultHandler(new object(), pass1.Object);
-            this.htmlLogger.TestResultHandler(new object(), pass2.Object);
-            this.htmlLogger.TestResultHandler(new object(), fail1.Object);
-            this.htmlLogger.TestResultHandler(new object(), skip1.Object);
+            var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
+            var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
+            var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
+            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
+     
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
+            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
 
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
                 {
@@ -351,16 +391,33 @@ public void TestCompleteHandlerShouldKeepTackOfSummary()
             Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassedTests, 2, "summary should keep track of passed tests");
             Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.SkippedTests, 1, "summary should keep track of passed tests");
             Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.PassPercentage, 50, "summary should keep track of passed tests");
-            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, null , "summary should keep track of passed tests");
+            Assert.AreEqual(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, null, "summary should keep track of passed tests");
+        }
+
+        [TestMethod]
+        public void TestCompleteHandlerShouldCreateCustumHtmlFileNameIfParameterDirectoryIsNull()
+        {
+            var parameters = new Dictionary<string, string>();
+            parameters[HtmlLoggerConstants.LogFileNameKey] = null;
+            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
+
+            var testCase1 = CreateTestCase("TestCase1");
+            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+
+            this.htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+            Assert.IsTrue(this.htmlLogger.HtmlFilePath.Contains("TestResult"));
         }
 
         [TestMethod]
         public void TestCompleteHandlerShouldCreateFileCorrectly()
         {
             var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
             var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-           
+
 
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
                 {
@@ -372,12 +429,29 @@ public void TestCompleteHandlerShouldCreateFileCorrectly()
             this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
         }
 
+        [TestMethod]
+        public void TestCompleteHandlerShouldDeleteFileCorrectly()
+        {
+            var testCase1 = CreateTestCase("TestCase1");
+            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+
+            this.mockFileHelper.Setup(x => x.Delete(It.IsAny<string>())).Callback<string>((x) =>
+            {
+            });
+
+            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+
+            this.mockFileHelper.Verify(x => x.Delete(It.IsAny<string>()), Times.Once);
+        }
+
 
         [TestMethod]
         public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         {
             var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
             var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
@@ -394,7 +468,7 @@ public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
         public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
         {
             var testCase1 = CreateTestCase("TestCase1") ?? throw new ArgumentNullException($"CreateTestCase(\"TestCase1\")");
-            var result1 = new ObjectModel.TestResult(testCase1) {Outcome = TestOutcome.Failed};
+            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
             var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
             this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
                 {
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
index 0eb5f6f1a4..96291ad49c 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
@@ -179,13 +179,11 @@ public void TestResultHandlerKeepingTheTrackOfPassedAndFailedTests()
             Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
             Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
 
-
             this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
             this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
             this.testableTrxLogger.TestResultHandler(new object(), fail1.Object);
             this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-
             Assert.AreEqual(this.testableTrxLogger.PassedTestCount, 2, "Passed Tests");
             Assert.AreEqual(this.testableTrxLogger.FailedTestCount, 1, "Failed Tests");
         }
@@ -215,13 +213,11 @@ public void TestResultHandlerKeepingTheTrackOfTotalTests()
             Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
             Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
 
-
             this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
             this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
             this.testableTrxLogger.TestResultHandler(new object(), fail1.Object);
             this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-
             Assert.AreEqual(this.testableTrxLogger.TotalTestCount, 4, "Passed Tests");
         }
 

From 35067d6f9d505c343475eafa2e05562489100495 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Tue, 27 Aug 2019 20:12:29 +0530
Subject: [PATCH 19/20] friend.cs added

---
 .../Friends.cs                                | 10 ++++
 .../HtmlLogger.cs                             | 54 +++++++++----------
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
new file mode 100644
index 0000000000..6b0b46c20b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Friends.cs
@@ -0,0 +1,10 @@
+// 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.Runtime.CompilerServices;
+
+#region Test Assemblies
+
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+#endregion
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index f67db56df1..c2fc82e52a 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -45,7 +45,7 @@ public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
         {
             this.fileHelper = fileHelper;
             this.htmlTransformer = htmlTransformer;
-            xmlSerializer = dataContractSerializer;
+            this.xmlSerializer = dataContractSerializer;
         }
 
         /// <summary>
@@ -99,6 +99,7 @@ public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
         /// </summary>
         public string HtmlFilePath { get; private set; }
 
+        /// <inheritdoc/>
         public void Initialize(TestLoggerEvents events, string testResultsDirPath)
         {
             if (events == null)
@@ -136,7 +137,7 @@ public void Initialize(TestLoggerEvents events, Dictionary<string, string> param
             }
 
             parametersDictionary = parameters;
-            Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
+            this.Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
         }
 
         /// <summary>
@@ -181,10 +182,10 @@ public void TestResultHandler(object sender, TestResultEventArgs e)
             {
                 DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName,
                 FullyQualifiedName = e.Result.TestCase.FullyQualifiedName,
-                Duration = GetFormattedDurationString(e.Result.Duration),
                 ErrorStackTrace = e.Result.ErrorStackTrace,
                 ErrorMessage = e.Result.ErrorMessage,
                 TestResultId = e.Result.TestCase.Id,
+                Duration = GetFormattedDurationString(e.Result.Duration),
                 ResultOutcome = e.Result.Outcome
             };
 
@@ -215,12 +216,8 @@ public void TestResultHandler(object sender, TestResultEventArgs e)
                 case TestOutcome.Skipped:
                     SkippedTests++;
                     break;
-                case TestOutcome.None:
-                    break;
-                case TestOutcome.NotFound:
-                    break;
                 default:
-                    throw new ArgumentOutOfRangeException();
+                    break;
             }
 
             Results.TryAdd(executionId, testResult);
@@ -243,12 +240,13 @@ public void TestResultHandler(object sender, TestResultEventArgs e)
 
         private void AddToParentResult(Guid parentExecutionId, ObjectModel.TestResult testResult)
         {
-            Results.TryGetValue(parentExecutionId, out var parentTestResult);
-
-            if (parentTestResult != null && parentTestResult.InnerTestResults == null)
-                parentTestResult.InnerTestResults = new List<ObjectModel.TestResult>();
+            if (Results.TryGetValue(parentExecutionId, out var parentTestResult))
+            {
+                if (parentTestResult.InnerTestResults == null)
+                    parentTestResult.InnerTestResults = new List<ObjectModel.TestResult>();
 
-            parentTestResult?.InnerTestResults.Add(testResult);
+                parentTestResult.InnerTestResults.Add(testResult);
+            }
         }
 
         /// <summary>
@@ -267,15 +265,11 @@ public void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                 PassPercentage = (PassedTests * 100) / TotalTests,
                 TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests),
             };
-
-            if (parametersDictionary != null)
+            var isLogFileNameParameterExists = parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey,
+                               out string logFileNameValue);
+            if (isLogFileNameParameterExists && !string.IsNullOrWhiteSpace(logFileNameValue))
             {
-                var isLogFileNameParameterExists = parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey,
-                    out string logFileNameValue);
-                if (isLogFileNameParameterExists && !string.IsNullOrWhiteSpace(logFileNameValue))
-                {
-                    HtmlFilePath = Path.Combine(TestResultsDirPath, logFileNameValue);
-                }
+                HtmlFilePath = Path.Combine(TestResultsDirPath, logFileNameValue);
             }
 
             PopulateHtmlFile();
@@ -325,16 +319,11 @@ private void PopulateHtmlFile()
 
         private string GetFilePath(string fileExtension, string fileName)
         {
-            if (fileExtension == null)
-            {
-                return null;
-            }
-
             var fullFileFormat = $".{fileExtension}";
             return Path.Combine(TestResultsDirPath, string.Concat("TestResult_", fileName, fullFileFormat));
         }
 
-        private static string FormatDateTimeForRunName(DateTime timeStamp)
+        private string FormatDateTimeForRunName(DateTime timeStamp)
         {
             return timeStamp.ToString("yyyyMMdd_HHmmss", DateTimeFormatInfo.InvariantInfo);
         }
@@ -344,7 +333,7 @@ private static string FormatDateTimeForRunName(DateTime timeStamp)
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private static Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+        private Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         {
             var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
                 property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
@@ -358,7 +347,7 @@ private static Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult tes
         /// </summary>
         /// <param name="testResult"></param>
         /// <returns></returns>
-        private static Guid GetExecutionId(TestObject testResult)
+        private Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
         {
             var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
                 property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
@@ -377,7 +366,7 @@ private static Guid GetExecutionId(TestObject testResult)
         /// </summary>
         /// <param name="duration"></param>
         /// <returns></returns>
-        private static string GetFormattedDurationString(TimeSpan duration)
+        internal string GetFormattedDurationString(TimeSpan duration)
         {
             if (duration == default(TimeSpan))
             {
@@ -385,6 +374,11 @@ private static string GetFormattedDurationString(TimeSpan duration)
             }
 
             var time = new List<string>();
+            if(duration.Days>0)
+            {
+                time.Add(duration.Days + "d");
+            }
+
             if (duration.Hours > 0)
             {
                 time.Add(duration.Hours + "h");

From 14e82eef989b415a6627efac7a34b8a225498de1 Mon Sep 17 00:00:00 2001
From: vineeth Hanumanthu <havineet@microsoft.com>
Date: Wed, 28 Aug 2019 15:16:51 +0530
Subject: [PATCH 20/20] Days in GetFormattedDurationString is fixed

---
 .../HtmlLogger.cs                             | 38 ++++++++++---------
 .../HtmlLoggerTests.cs                        |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index c2fc82e52a..650aba384c 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -374,33 +374,35 @@ internal string GetFormattedDurationString(TimeSpan duration)
             }
 
             var time = new List<string>();
-            if(duration.Days>0)
+            if (duration.Days > 0)
             {
-                time.Add(duration.Days + "d");
+                time.Add("> 1d");
             }
-
-            if (duration.Hours > 0)
-            {
-                time.Add(duration.Hours + "h");
-            }
-
-            if (duration.Minutes > 0)
+            else
             {
-                time.Add(duration.Minutes + "m");
-            }
+                if (duration.Hours > 0)
+                {
+                    time.Add(duration.Hours + "h");
+                }
 
-            if (duration.Hours == 0)
-            {
-                if (duration.Seconds > 0)
+                if (duration.Minutes > 0)
                 {
-                    time.Add(duration.Seconds + "s");
+                    time.Add(duration.Minutes + "m");
                 }
 
-                if (duration.Milliseconds > 0 && duration.Minutes == 0)
+                if (duration.Hours == 0)
                 {
-                    time.Add(duration.Milliseconds + "ms");
+                    if (duration.Seconds > 0)
+                    {
+                        time.Add(duration.Seconds + "s");
+                    }
+
+                    if (duration.Milliseconds > 0 && duration.Minutes == 0)
+                    {
+                        time.Add(duration.Milliseconds + "ms");
+                    }
                 }
-            }
+            }     
 
             return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
         }
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 8953117717..fe53dc7adc 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -276,7 +276,7 @@ public void GetFormattedDurationStringShouldGiveCorrectFormat()
             Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts8), "< 1ms");
 
             TimeSpan ts10 = new TimeSpan(1, 0, 0, 1, 3);
-            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts10), "1d 1s 3ms");
+            Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts10), "> 1d");
 
             TimeSpan ts9 = new TimeSpan(0, 0, 0, 0, 0);
             Assert.AreEqual(htmlLogger.GetFormattedDurationString(ts9), null);