Merge branch 'Roemer-feature/XmlImprovements' into develop

Author: devlead

src/Cake.Common.Tests/Cake.Common.Tests.csproj

@@ -44,4 +44,22 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Properties\Resources2.resx">
+      <Generator></Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

src/Cake.Common.Tests/Fixtures/XmlPokeFixture.cs

@@ -55,7 +55,7 @@ public string PokeString(string xml, string xpath, string value)
 
         public bool TestIsValue(string xpath, string value)
         {
-            var xmlString = new StreamReader(FileSystem.GetFile(XmlPath).OpenRead()).ReadToEnd();
+            var xmlString = GetFullXml();
             return TestIsValue(xmlString, xpath, value);
         }
 
@@ -81,7 +81,7 @@ public bool TestIsValue(string xml, string xpath, string value)
 
         public bool TestIsRemoved(string xpath)
         {
-            var xmlString = new StreamReader(FileSystem.GetFile(XmlPath).OpenRead()).ReadToEnd();
+            var xmlString = GetFullXml();
             return TestIsRemoved(xmlString, xpath);
         }
 
@@ -105,6 +105,11 @@ public bool TestIsRemoved(string xml, string xpath)
             }
         }
 
+        private string GetFullXml()
+        {
+            return new StreamReader(FileSystem.GetFile(XmlPath).OpenRead()).ReadToEnd();
+        }
+
         /// <summary>
         /// Gets a XmlReaderSettings from a XmlPokeSettings
         /// </summary>