Merge branch 'release/1.0.5' into production

craigfowler · craigfowler · commit 109199cd152f · 2018-02-19T19:43:29.000Z
diff --git a/CSF.Zpt.Abstractions/AssemblyInfo.cs b/CSF.Zpt.Abstractions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/CSF.Zpt.Cli/AssemblyInfo.cs b/CSF.Zpt.Cli/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/CSF.Zpt.Log4net/AssemblyInfo.cs b/CSF.Zpt.Log4net/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/CSF.Zpt.MVC5/AssemblyInfo.cs b/CSF.Zpt.MVC5/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/CSF.Zpt/AssemblyInfo.cs b/CSF.Zpt/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/AssemblyInfo.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlElement.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlElement.cs
@@ -656,7 +656,8 @@ private bool IsInNamespace(ZptNamespace nSpace, HtmlNode node)
 
       if(nSpace.Prefix != null)
       {
-        output = node.Name.StartsWith(String.Concat(nSpace.Prefix, PREFIX_SEPARATOR));
+        output = node.Name.StartsWith(String.Concat(nSpace.Prefix, PREFIX_SEPARATOR),
+                                      StringComparison.InvariantCultureIgnoreCase);
       }
       else
       {
@@ -692,7 +693,7 @@ private HtmlNode[] Import(string text, bool treatAsHtml, bool treatAsCData = fal
 
       HtmlNode[] output;
 
-      if(treatAsHtml && treatAsCData)
+      if(treatAsCData && !treatAsHtml)
       {
         output = new HtmlNode[] { this.Node.OwnerDocument.CreateTextNode(text) };
       }
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/AssemblyInfo.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/AssemblyInfo.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpFramework/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpFramework/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.LoadExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.LoadExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.NotExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.NotExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PathExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PathExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PythonExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PythonExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.StringExpressions/AssemblyInfo.cs b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.StringExpressions/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 [assembly: AssemblyProduct("CSF.Zpt")]
 [assembly: AssemblyCopyright("CSF Software Limited et al")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.1")]
diff --git a/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/SourceDocuments/GarbageMarkupInJavascript.html b/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/SourceDocuments/GarbageMarkupInJavascript.html
@@ -1,6 +1,6 @@
 ﻿<html>
-<script tal:content="structure jQuery"></script>
-<script tal:content="structure simpleScript"></script>
+<script tal:content="jQuery"></script>
+<script tal:content="simpleScript"></script>
 <body>
 <p>This test reproduces the second part of issue https://github.com/csf-dev/ZPT-Sharp/issues/232</p>
 </body>
diff --git a/version.ini b/version.ini
@@ -1,2 +1,2 @@
-semantic_version = 1.0.4
-build_number = 1
+semantic_version = 1.0.5
+build_number = 0

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,8 @@ private bool IsInNamespace(ZptNamespace nSpace, HtmlNode node)`
`656`	`656`
`657`	`657`	`if(nSpace.Prefix != null)`
`658`	`658`	`{`
`659`		`- output = node.Name.StartsWith(String.Concat(nSpace.Prefix, PREFIX_SEPARATOR));`
	`659`	`+ output = node.Name.StartsWith(String.Concat(nSpace.Prefix, PREFIX_SEPARATOR),`
	`660`	`+ StringComparison.InvariantCultureIgnoreCase);`
`660`	`661`	`}`
`661`	`662`	`else`
`662`	`663`	`{`
`@@ -692,7 +693,7 @@ private HtmlNode[] Import(string text, bool treatAsHtml, bool treatAsCData = fal`
`692`	`693`
`693`	`694`	`HtmlNode[] output;`
`694`	`695`
`695`		`- if(treatAsHtml && treatAsCData)`
	`696`	`+ if(treatAsCData && !treatAsHtml)`
`696`	`697`	`{`
`697`	`698`	`output = new HtmlNode[] { this.Node.OwnerDocument.CreateTextNode(text) };`
`698`	`699`	`}`