Merge pull request #311 from tonyhallett/ms-runsettings-exception-handler

Ms runsettings exception handler

Author: tonyhallett

SharedProject/Core/MsTestPlatform/CodeCoverage/MsTemplateReplacementException.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Xml;
+
+namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
+{
+    public class MsTemplateReplacementException : Exception
+    {
+        private XmlException innerException;
+        private string replacedRunSettingsTemplate;
+        public MsTemplateReplacementException(XmlException innerException, string replacedRunSettingsTemplate)
+        {
+            this.innerException = innerException;
+            this.replacedRunSettingsTemplate = replacedRunSettingsTemplate;
+        }
+
+        public override string ToString()
+        {
+            return $@"${innerException} 
+Replaced template :
+${replacedRunSettingsTemplate}
+";
+        }
+
+    }
+}

SharedProject/Core/MsTestPlatform/CodeCoverage/RunSettingsTemplate.cs

@@ -2,11 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
 namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
 {
+
     [Export(typeof(IRunSettingsTemplate))]
     internal class RunSettingsTemplate : IRunSettingsTemplate
     {
@@ -186,7 +188,14 @@ bool isNetFramework
 
         private string AddRecommendedYouDoNotChangeElementsIfNotProvided(string replacedRunSettingsTemplate, bool isNetFramework)
         {
-            var templateDocument = XDocument.Parse(replacedRunSettingsTemplate);
+            XDocument templateDocument = null;
+            try
+            {
+                templateDocument = XDocument.Parse(replacedRunSettingsTemplate);
+            }catch(XmlException exc)
+            {
+                throw new MsTemplateReplacementException(exc, replacedRunSettingsTemplate);
+            }
             var msDataCollectorCodeCoverageElement = GetMsDataCollectorCodeCoverageElement(templateDocument);
             if (msDataCollectorCodeCoverageElement != null)
             {

SharedProject/SharedProject.projitems

@@ -87,6 +87,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Model\SettingsMerger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Model\VsBuildFCCSettingsProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\ITemplatedRunSettingsService.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\MsTemplateReplacementException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\RunSettingsTemplate.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\CustomRunSettingsTemplateProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\IRunSettingsTemplate.cs" />