Merge branch 'release/1.1.0' into production

csf-dev · Jun 28, 2018 · 5c672d6 · 5c672d6
2 parents ac0cc67 + 6864259
commit 5c672d6
Show file tree

Hide file tree

Showing 81 changed files with 783 additions and 404 deletions.
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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
diff --git a/CSF.Zpt.Log4net/app.config.install.xdt b/CSF.Zpt.Log4net/app.config.install.xdt
@@ -75,7 +75,7 @@
     </switches>
     <sharedListeners>
       <add name="ZptLog4netListener"
-           type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+           type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
            xdt:Transform="InsertIfMissing"
            xdt:Locator="Match(name)">
         <filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>

diff --git a/CSF.Zpt.Log4net/web.config.install.xdt b/CSF.Zpt.Log4net/web.config.install.xdt
@@ -75,7 +75,7 @@
     </switches>
     <sharedListeners>
       <add name="ZptLog4netListener"
-           type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+           type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
            xdt:Transform="InsertIfMissing"
            xdt:Locator="Match(name)">
         <filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
diff --git a/CSF.Zpt.sln b/CSF.Zpt.sln
@@ -104,6 +104,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ScreenplayReportPro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ProfilingApp", "Tests\CSF.Zpt.ProfilingApp\CSF.Zpt.ProfilingApp.csproj", "{E187D1D5-CB19-4B93-8950-E53852EC99A8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ExpressionEvaluators.PipeExpressions", "ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\CSF.Zpt.ExpressionEvaluators.PipeExpressions.csproj", "{3D708232-9C80-49E6-A163-33CC7505B890}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -321,6 +323,12 @@ Global
 		{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Deploy|Any CPU.Build.0 = Release|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
+		{3D708232-9C80-49E6-A163-33CC7505B890}.Deploy|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BFD834D4-5724-4425-BCB3-6DEE6B03F743} = {F1251A40-9526-48DC-A665-F9AEB972AC33}
@@ -354,6 +362,7 @@ Global
 		{22FABC32-0558-486B-9430-EE2E6F4B67D0} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
 		{697959B1-57CC-48A2-B2E6-E7E15D5B387D} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
 		{E187D1D5-CB19-4B93-8950-E53852EC99A8} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
+		{3D708232-9C80-49E6-A163-33CC7505B890} = {F2830FC9-EFCE-4DE8-8B24-2196A4F820BC}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.5")]
diff --git a/CSF.Zpt/PluginConfigurationSection.cs b/CSF.Zpt/PluginConfigurationSection.cs
@@ -2,10 +2,8 @@
 using System.Configuration;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using CSF.Configuration;
-using System.IO;
-using CSF.IO;
+using System.Diagnostics;
 
 namespace CSF.Zpt
 {
@@ -135,6 +133,11 @@ public string GetDefaultExpressionEvaluatorTypeName()
     /// <returns>The default/singleton instance.</returns>
     public static IPluginConfiguration GetDefault()
     {
+      ZptConstants.TraceSource.TraceEvent(TraceEventType.Verbose,
+                                          0,
+                                          $"Getting plugin configuration from a {nameof(ConfigurationReader)}");
+      WriteStackTraceToDebug();
+
       if(_singleton == null)
       {
         var reader = new ConfigurationReader();
@@ -144,6 +147,14 @@ public static IPluginConfiguration GetDefault()
       return _singleton?? new EmptyPluginConfiguration();
     }
 
+    [Conditional("DEBUG")]
+    static void WriteStackTraceToDebug()
+    {
+      ZptConstants.TraceSource.TraceEvent(TraceEventType.Verbose,
+                                          0,
+                                          Environment.StackTrace);
+    }
+
     #endregion
   }
 }

diff --git a/CSF.Zpt/app.config.install.xdt b/CSF.Zpt/app.config.install.xdt
@@ -10,7 +10,7 @@
     <sectionGroup name="CSF" xdt:Locator="Match(name)">
       <sectionGroup name="Zpt" xdt:Transform="Remove" xdt:Locator="Match(name)" />
       <sectionGroup name="Zpt" xdt:Transform="Insert">
-          <section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
+          <section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
       </sectionGroup>
     </sectionGroup>
   </configSections>

diff --git a/CSF.Zpt/web.config.install.xdt b/CSF.Zpt/web.config.install.xdt
@@ -10,7 +10,7 @@
     <sectionGroup name="CSF" xdt:Locator="Match(name)">
       <sectionGroup name="Zpt" xdt:Transform="Remove" xdt:Locator="Match(name)" />
       <sectionGroup name="Zpt" xdt:Transform="Insert">
-          <section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
+          <section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
       </sectionGroup>
     </sectionGroup>
   </configSections>

diff --git a/Deployment/CSF.Zpt.Deployment/CSF.Zpt.Deployment.csproj b/Deployment/CSF.Zpt.Deployment/CSF.Zpt.Deployment.csproj
@@ -81,6 +81,10 @@
       <Project>{9B4DF12E-6E04-4C25-AD16-58434C18DE8A}</Project>
       <Name>CSF.Zpt.MVC5</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\CSF.Zpt.ExpressionEvaluators.PipeExpressions.csproj">
+      <Project>{3D708232-9C80-49E6-A163-33CC7505B890}</Project>
+      <Name>CSF.Zpt.ExpressionEvaluators.PipeExpressions</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Zpt-Sharp-API.nuspec" />

diff --git a/Deployment/CSF.Zpt.Deployment/Zpt-Sharp-MVC5.nuspec.pt b/Deployment/CSF.Zpt.Deployment/Zpt-Sharp-MVC5.nuspec.pt
@@ -23,4 +23,5 @@
                   tal:attributes="version string:[$fullVersion,${options/nextBreakingVersion})" />
     </dependencies>
   </metadata>
+  <files></files>
 </package>
diff --git a/Deployment/CSF.Zpt.Deployment/Zpt-Sharp-ZptBuilder.nuspec.pt b/Deployment/CSF.Zpt.Deployment/Zpt-Sharp-ZptBuilder.nuspec.pt
@@ -23,4 +23,5 @@
                   tal:attributes="version string:[$fullVersion,${options/nextBreakingVersion})" />
     </dependencies>
   </metadata>
+  <files></files>
 </package>
diff --git a/Deployment/CSF.Zpt.DeploymentTasks/CSF.Zpt.DeploymentTasks.targets b/Deployment/CSF.Zpt.DeploymentTasks/CSF.Zpt.DeploymentTasks.targets
@@ -228,6 +228,7 @@
       <NuspecFile Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PythonExpressions\CSF.Zpt.ExpressionEvaluators.PythonExpressions.nuspec" />
       <NuspecFile Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.StringExpressions\CSF.Zpt.ExpressionEvaluators.StringExpressions.nuspec" />
       <NuspecFile Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.LoadExpressions\CSF.Zpt.ExpressionEvaluators.LoadExpressions.nuspec" />
+      <NuspecFile Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\CSF.Zpt.ExpressionEvaluators.PipeExpressions.nuspec" />
     </ItemGroup>
     <ItemGroup>
       <CopyrightYear Include="$([System.DateTime]::Now.ToString(yyyy))" />
@@ -261,6 +262,7 @@
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\DocumentProviders\CSF.Zpt.DocumentProviders.XmlLegacy\bin\Release\CSF.Zpt.DocumentProviders.XmlLegacy.dll" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\DocumentProviders\CSF.Zpt.DocumentProviders.XmlLinq\bin\Release\CSF.Zpt.DocumentProviders.XmlLinq.dll" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.NotExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.NotExpressions.dll" />
+      <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.PipeExpressions.dll" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PathExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.PathExpressions.dll" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.StringExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.StringExpressions.dll" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.CSharpExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.dll" />
@@ -281,6 +283,7 @@
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\DocumentProviders\CSF.Zpt.DocumentProviders.XmlLegacy\bin\Release\CSF.Zpt.DocumentProviders.XmlLegacy.xml" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\DocumentProviders\CSF.Zpt.DocumentProviders.XmlLinq\bin\Release\CSF.Zpt.DocumentProviders.XmlLinq.xml" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.NotExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.NotExpressions.xml" />
+      <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.PipeExpressions.xml" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PathExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.PathExpressions.xml" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.StringExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.StringExpressions.xml" />
       <ZptSharpCompleteZipFiles Include="$(PathToSolutionRoot)\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.CSharpExpressions\bin\Release\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.xml" />

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlElement.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlElement.cs
@@ -366,7 +366,8 @@ public override void SetAttribute(ZptNamespace attributeNamespace, string name,
       }
 
       var formattedName = GetNameWithPrefix(attributeNamespace, name);
-      this.Node.SetAttributeValue(formattedName, value);
+      var sanitisedValue = HtmlEntity.Entitize(value, true, true);
+      this.Node.SetAttributeValue(formattedName, sanitisedValue);
     }
 
     /// <summary>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/app.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/app.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/app.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/app.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/web.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/web.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/web.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/web.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/app.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/app.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/app.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/app.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/web.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/web.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/web.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/web.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLegacy, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/app.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/app.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/app.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/app.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/web.config.install.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/web.config.install.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="InsertIfMissing"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/web.config.uninstall.xdt b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/web.config.uninstall.xdt
@@ -4,7 +4,7 @@
     <Zpt>
       <PluginConfigurationSection>
         <PluginAssemblies>
-          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
+          <Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
                     xdt:Transform="Remove"
                     xdt:Locator="Match(Name)" />
         </PluginAssemblies>

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.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.1")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.6")]