Merge pull request #315 from tonyhallett/escape_file_in_xml

escape file path in ms runsettings

Author: tonyhallett

SharedProject/Core/MsTestPlatform/CodeCoverage/RunSettingsTemplate.cs

@@ -8,7 +8,6 @@
 
 namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
 {
-
     [Export(typeof(IRunSettingsTemplate))]
     internal class RunSettingsTemplate : IRunSettingsTemplate
     {
@@ -221,11 +220,21 @@ private XElement GetMsDataCollectorCodeCoverageElement(XDocument templateDocumen
             return msDataCollector.GetStrictDescendant("Configuration/CodeCoverage");
         }
 
+        // hacky.  due to tests
+        private string SafeFilePathEscape(string path)
+        {
+            if (path == null)
+            {
+                return null;
+            }
+            return XmlFileEscaper.Escape(path);
+        }
+
         public string Replace(string templatedXml, IRunSettingsTemplateReplacements replacements)
         {
             return templatedXml
-                .Replace(replacementLookups.ResultsDirectory, replacements.ResultsDirectory)
-                .Replace(replacementLookups.TestAdapter, replacements.TestAdapter)
+                .Replace(replacementLookups.ResultsDirectory, SafeFilePathEscape(replacements.ResultsDirectory))
+                .Replace(replacementLookups.TestAdapter, SafeFilePathEscape(replacements.TestAdapter))
                 .Replace(replacementLookups.Enabled, replacements.Enabled)
                 .Replace(replacementLookups.ModulePathsExclude, replacements.ModulePathsExclude)
                 .Replace(replacementLookups.ModulePathsInclude, replacements.ModulePathsInclude)

SharedProject/Core/Utilities/XmlFileEscaper.cs

@@ -0,0 +1,10 @@
+namespace FineCodeCoverage.Core.Utilities
+{
+    internal static class XmlFileEscaper
+    {
+        public static string Escape(string filePath)
+        {
+            return filePath.Replace("&", "&").Replace("'", "'");
+        }
+    }
+}

SharedProject/SharedProject.projitems

@@ -163,6 +163,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\LinqToXmlUtil.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\Tryer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\VsThreading\IThreadHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\XmlFileEscaper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\ZipFileWrapper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Impl\CoverageColour\GlyphMargin\RefreshCoverageGlyphsMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Impl\CoverageColour\MarginBase\CoverageLineTaggerBase.cs" />