Merge branch 'release/1.0.0' into production

craigfowler · craigfowler · commit b09294cf1032 · 2017-03-19T22:27:09.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: csharp
+solution: CSF.Zpt.sln
+
+install:
+  - nuget restore CSF.Zpt.sln
+  - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
+
+script:
+  - xbuild /p:Configuration=Debug CSF.Zpt.sln
+  - mono "./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe" $(find ./Tests/ -type f -path "*/bin/Debug/*" -name "Test*.dll")
diff --git a/CSF.Zpt.Abstractions/CSF.Zpt.Abstractions.csproj b/CSF.Zpt.Abstractions/CSF.Zpt.Abstractions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.Abstractions</ProjectTitle>
     <ProjectDescription>Abstract types &amp; interfaces for ZPT-Sharp.</ProjectDescription>
     <PathToSolutionRoot>..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/CSF.Zpt.Cli/CSF.Zpt.Cli.csproj b/CSF.Zpt.Cli/CSF.Zpt.Cli.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>ZptBuilder</ProjectTitle>
     <ProjectDescription>Command-line utility for rendering ZPT documents</ProjectDescription>
     <PathToSolutionRoot>..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/CSF.Zpt.Log4net/CSF.Zpt.Log4net.csproj b/CSF.Zpt.Log4net/CSF.Zpt.Log4net.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.Log4Net</ProjectTitle>
     <ProjectDescription>Log4net Trace Listener</ProjectDescription>
     <PathToSolutionRoot>..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/CSF.Zpt.MVC5/CSF.Zpt.MVC5.csproj b/CSF.Zpt.MVC5/CSF.Zpt.MVC5.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.MVC5</ProjectTitle>
     <ProjectDescription>ASP.NET MVC5 integration for ZPT-Sharp</ProjectDescription>
     <PathToSolutionRoot>..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/CSF.Zpt.sln b/CSF.Zpt.sln
@@ -338,5 +338,6 @@ Global
 		$1.inheritsSet = VisualStudio
 		$1.inheritsScope = text/plain
 		$1.scope = text/plain
+		version = 1.0.0
 	EndGlobalSection
 EndGlobal
diff --git a/CSF.Zpt/CSF.Zpt.csproj b/CSF.Zpt/CSF.Zpt.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt</ProjectTitle>
     <ProjectDescription>Core ZPT-Sharp logic</ProjectDescription>
     <PathToSolutionRoot>..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/Deployment/CSF.Zpt.Deployment/CSF.Zpt.Deployment.csproj b/Deployment/CSF.Zpt.Deployment/CSF.Zpt.Deployment.csproj
@@ -9,6 +9,7 @@
     <AssemblyName>CSF.Zpt.Deployment</AssemblyName>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/Deployment/CSF.Zpt.DeploymentTasks/CSF.Zpt.DeploymentTasks.csproj b/Deployment/CSF.Zpt.DeploymentTasks/CSF.Zpt.DeploymentTasks.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>CSF.Zpt.DeploymentTasks</RootNamespace>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <AssemblyName>CSF.Zpt.DeploymentTasks</AssemblyName>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="..\..\Common\SolutionProperties.targets" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,7 +39,7 @@
       <HintPath>..\..\packages\CSF.IniDocuments.6.0.1\lib\net45\CSF.IniDocuments.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack">
-      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/Deployment/CSF.Zpt.DeploymentTasks/packages.config b/Deployment/CSF.Zpt.DeploymentTasks/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CSF.IniDocuments" version="6.0.1" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
 </packages>
diff --git a/Deployment/CSF.Zpt.Documentation/HelloWorld/HelloWorld.csproj b/Deployment/CSF.Zpt.Documentation/HelloWorld/HelloWorld.csproj
@@ -9,6 +9,7 @@
     <RootNamespace>ZptSample</RootNamespace>
     <AssemblyName>ZptSample</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Deployment/CSF.Zpt.Documentation/Website/Shared/general-page.html b/Deployment/CSF.Zpt.Documentation/Website/Shared/general-page.html
@@ -65,7 +65,7 @@ <h1>Main page title</h1>
                           releaseType options/releaseType;
                           versionString string:v${version}"
               tal:on-error="string:an unknown version">
-        <span tal:replace="versionString">v0.0.0</span><span tal:condition="releaseType"
+        <span tal:replace="versionString">v0.0.0</span><span tal:condition="csharp:!String.IsNullOrEmpty(releaseType)"
                                                              tal:replace="string:-$releaseType">-alpha</span>
       </strong>
     </p>
diff --git a/Deployment/CSF.Zpt.Documentation/Website/Website.csproj b/Deployment/CSF.Zpt.Documentation/Website/Website.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>Website</RootNamespace>
     <AssemblyName>Website</AssemblyName>
     <OutputType>Exe</OutputType>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
diff --git a/Deployment/CSF.Zpt.Documentation/Website/download.html b/Deployment/CSF.Zpt.Documentation/Website/download.html
@@ -40,12 +40,16 @@ <h1>Download ZPT-Sharp</h1>
 			<h2>The ZIP downloads</h2>
       <tal:block define="downloadBase string:https://github.com/csf-dev/ZPT-Sharp/releases/download;
                          version options/version;
-                         versionExtra string:(${options/releaseType});
+                         relType options/releaseType;
+                         stableVersion csharp:String.IsNullOrEmpty(relType);
                          versionString string:v${version}"
-                 on-error="structure string:&lt;p class=&quot;note&quot;&gt;There is presently no stable release, please visit the Github releases page to view unstable releases.&lt;/p&gt;">
+                 on-error="structure string:&lt;p class=&quot;note&quot;&gt;There are presently no releases available, please visit the Github releases page to view unstable releases.&lt;/p&gt;">
       <p>
         The following ZIP downloads are for the most recent release:
-        <strong><span tal:content="versionString">v0.0.0</span> <span tal:content="versionExtra | default">(release)</span></strong>.
+        <strong><span tal:content="versionString">v0.0.0</span>
+          <span tal:condition="not:stableVersion"
+                tal:content="string:(${options/releaseType})">(beta)</span>
+          <span tal:condition="stableVersion">(stable)</span></strong>.
       </p>
       <h3>ZPT-Sharp complete package</h3>
       <p>
diff --git a/Deployment/Utils/Utils.csproj b/Deployment/Utils/Utils.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>Utils</RootNamespace>
     <AssemblyName>Utils</AssemblyName>
     <OutputType>Exe</OutputType>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/CSF.Zpt.DocumentProviders.HtmlHAP.csproj b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/CSF.Zpt.DocumentProviders.HtmlHAP.csproj
@@ -14,6 +14,7 @@
     <ProjectTitle>CSF.Zpt.DocumentProviders.HtmlHAP</ProjectTitle>
     <ProjectDescription>Implementation of IZptDocumentProvider for HTML documents, using the HtmlAgilityPack</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
@@ -43,6 +44,7 @@
     <Compile Include="ZptHtmlElement.cs" />
     <Compile Include="HtmlZptDocumentProvider.cs" />
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="HtmlAgilityPackConfigurator.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\CSF.Zpt.Abstractions\CSF.Zpt.Abstractions.csproj">
@@ -56,11 +58,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="HtmlAgilityPack">
+      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Target Name="BeforeBuild">
     <CallTarget Targets="StampAssemblyInfo" />
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/CSF.Zpt.DocumentProviders.HtmlHAP.nuspec.pt b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/CSF.Zpt.DocumentProviders.HtmlHAP.nuspec.pt
@@ -18,7 +18,7 @@
       <dependency id="CSF.Zpt"
                   version="[0.0.0,1.0.0)"
                   tal:attributes="version string:[$fullVersion,${options/nextBreakingVersion})" />
-      <dependency id="HtmlAgilityPack" version="1.4.9" />
+      <dependency id="HtmlAgilityPack" version="1.4.9.5" />
     </dependencies>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Xml" />
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/HtmlAgilityPackConfigurator.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/HtmlAgilityPackConfigurator.cs
@@ -0,0 +1,36 @@
+﻿using System;
+using HtmlAgilityPack;
+
+namespace CSF.Zpt.DocumentProviders
+{
+  /// <summary>
+  /// A type which performs configuration upon the HTML Agility Pack (HAP) library, in order to fix
+  /// a few quirks which make it troublesome when working with valid HTML.
+  /// </summary>
+  /// <remarks>
+  /// <para>
+  /// Beware that these configurations involve manipulating static members of the <c>HtmlAgilityPack.HtmlNode</c> type,
+  /// and as such may interfere with other libraries which make use of the HAP in the same application domain.
+  /// </para>
+  /// </remarks>
+  public class HtmlAgilityPackConfigurator
+  {
+    /// <summary>
+    /// Perform the configuration.
+    /// </summary>
+    public void Configure()
+    {
+      // In HAP source code the form element is declared as such:
+      // ElementsFlags.Add("form", HtmlElementFlag.CanOverlap | HtmlElementFlag.Empty);
+      // However this means that form elements cannot have children in the DOM, which is problematic
+      // See #221
+      HtmlNode.ElementsFlags["form"] = HtmlElementFlag.CanOverlap;
+
+      // In the HAP source code the option element is declared as such:
+      // ElementsFlags.Add("option", HtmlElementFlag.Empty);
+      // But option elements may of course have contents (it's their display value) and so the whole
+      // flag can be removed.
+      HtmlNode.ElementsFlags.Remove("option");
+    }
+  }
+}
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlDocument.cs b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/ZptHtmlDocument.cs
@@ -191,6 +191,21 @@ public ZptHtmlDocument(HtmlDocument document,
       _sourceFile = sourceFile;
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="T:CSF.Zpt.DocumentProviders.ZptHtmlDocument"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Beware that this method constructs a new instance of <see cref="HtmlAgilityPackConfigurator"/> and executes its
+    /// <see cref="HtmlAgilityPackConfigurator.Configure"/> method, thus influencing the standard operation of the HTML
+    /// agility pack.
+    /// </para>
+    /// </remarks>
+    static ZptHtmlDocument()
+    {
+      new HtmlAgilityPackConfigurator().Configure();
+    }
+
     #endregion
   }
 }
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/packages.config b/DocumentProviders/CSF.Zpt.DocumentProviders.HtmlHAP/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="MSBuild.Extension.Pack" version="1.8.0" targetFramework="net45" />
 </packages>
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/CSF.Zpt.DocumentProviders.XmlLegacy.csproj b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLegacy/CSF.Zpt.DocumentProviders.XmlLegacy.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.DocumentProviders.XmlLegacy</ProjectTitle>
     <ProjectDescription>Implementation of IZptDocumentProvider for XML documents, using System.Xml.XmlDocument</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/CSF.Zpt.DocumentProviders.XmlLinq.csproj b/DocumentProviders/CSF.Zpt.DocumentProviders.XmlLinq/CSF.Zpt.DocumentProviders.XmlLinq.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.DocumentProviders.XmlLinq</ProjectTitle>
     <ProjectDescription>Implementation of IZptDocumentProvider for XML documents, using System.Xml.Linq.XDocument</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/CSF.Zpt.ExpressionEvaluators.CSharpExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/CSF.Zpt.ExpressionEvaluators.CSharpExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.CSharpExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'csharp' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpFramework/CSF.Zpt.ExpressionEvaluators.CSharpFramework.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpFramework/CSF.Zpt.ExpressionEvaluators.CSharpFramework.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.CSharpFramework</ProjectTitle>
     <ProjectDescription>Assembly for types which must be referenced by the generated CSharp expression types.</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.LoadExpressions/CSF.Zpt.ExpressionEvaluators.LoadExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.LoadExpressions/CSF.Zpt.ExpressionEvaluators.LoadExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.LoadExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'load' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.NotExpressions/CSF.Zpt.ExpressionEvaluators.NotExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.NotExpressions/CSF.Zpt.ExpressionEvaluators.NotExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.NotExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'not' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PathExpressions/CSF.Zpt.ExpressionEvaluators.PathExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PathExpressions/CSF.Zpt.ExpressionEvaluators.PathExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.PathExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'path' and 'local' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PythonExpressions/CSF.Zpt.ExpressionEvaluators.PythonExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.PythonExpressions/CSF.Zpt.ExpressionEvaluators.PythonExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.PythonExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'python' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.StringExpressions/CSF.Zpt.ExpressionEvaluators.StringExpressions.csproj b/ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.StringExpressions/CSF.Zpt.ExpressionEvaluators.StringExpressions.csproj
@@ -11,6 +11,7 @@
     <ProjectTitle>CSF.Zpt.ExpressionEvaluators.StringExpressions</ProjectTitle>
     <ProjectDescription>Implementation of IExpressionEvaluator for 'string' expressions</ProjectDescription>
     <PathToSolutionRoot>..\..</PathToSolutionRoot>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <Import Project="$(PathToSolutionRoot)\Common\SolutionProperties.targets" />
   <Import Project="$(PathToSolutionRoot)\Deployment\CSF.Zpt.DeploymentTasks\CSF.Zpt.DeploymentTasks.targets" />
diff --git a/README.md b/README.md
@@ -16,12 +16,12 @@ Information specific to **running the unit/integration tests** is available in t
 [UNIT_TESTS.md]: https://github.com/csf-dev/ZPT-Sharp/blob/master/UNIT_TESTS.md
 
 ## Current status
-The current status is that - as of `v0.9.0` - the project has reached **release candidate 1**.
-As of the `v0.9.0` release date, there are no planned code changes to the project 
-There is good coverage of the project via integration tests and it has been used for some time now to build its own documentation website.
+Stable version `v1.0.0` has been released!  Thankyou to anybody who helped test the various release candidates.
 
-Evaluation & exploration of the project are welcome, along with feedback and suggestions for improvement.
-Please report any bugs to [Github's issue tracker] if you find them.
+**[Current CI build status](https://github.com/csf-dev/ZPT-Sharp/blob/master/.travis.yml)** : [![Build Status](https://travis-ci.org/csf-dev/ZPT-Sharp.svg?branch=master)](https://travis-ci.org/csf-dev/ZPT-Sharp)
+
+Whilst a stable is now available, future enhancements and development are planned.
+Please report any suggestions, feature requests or bugs you find to [Github's issue tracker].
 
 [Github's issue tracker]: https://github.com/csf-dev/ZPT-Sharp/issues
 
@@ -30,8 +30,8 @@ ZPT-Sharp is packaged and ready for download and installation.
 The recommended mechanism is to install one of the available [ZPT-Sharp NuGet bundles].
 There is also a [downloadable ZIP package] available.
 
-[ZPT-Sharp NuGet packages]: http://csf-dev.github.io/ZPT-Sharp/nuget-packages.html
-[downloadable Zip packages]: http://csf-dev.github.io/ZPT-Sharp/download.html
+[ZPT-Sharp NuGet bundles]: http://csf-dev.github.io/ZPT-Sharp/nuget-packages.html
+[downloadable ZIP package]: http://csf-dev.github.io/ZPT-Sharp/download.html
 
 ---
 
diff --git a/Tests/CSF.Zpt.TestUtils/CSF.Zpt.TestUtils.csproj b/Tests/CSF.Zpt.TestUtils/CSF.Zpt.TestUtils.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>CSF.Zpt.TestUtils</RootNamespace>
     <AssemblyName>CSF.Zpt.TestUtils</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Tests/Test.CSF.Zpt.Abstractions/Test.CSF.Zpt.Abstractions.csproj b/Tests/Test.CSF.Zpt.Abstractions/Test.CSF.Zpt.Abstractions.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>Test.CSF.Zpt.Abstractions</RootNamespace>
     <AssemblyName>Test.CSF.Zpt.Abstractions</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Tests/Test.CSF.Zpt.Cli/Test.CSF.Zpt.Cli.csproj b/Tests/Test.CSF.Zpt.Cli/Test.CSF.Zpt.Cli.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>Test.CSF.Zpt.Cli</RootNamespace>
     <AssemblyName>Test.CSF.Zpt.Cli</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>1.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Tests/Test.CSF.Zpt.DocumentProviders.HtmlHAP/Test.CSF.Zpt.DocumentProviders.HtmlHAP.csproj b/Tests/Test.CSF.Zpt.DocumentProviders.HtmlHAP/Test.CSF.Zpt.DocumentProviders.HtmlHAP.csproj
diff --git a/Tests/Test.CSF.Zpt.DocumentProviders.HtmlHAP/packages.config b/Tests/Test.CSF.Zpt.DocumentProviders.HtmlHAP/packages.config
diff --git a/Tests/Test.CSF.Zpt.DocumentProviders.XmlLegacy/Test.CSF.Zpt.DocumentProviders.XmlLegacy.csproj b/Tests/Test.CSF.Zpt.DocumentProviders.XmlLegacy/Test.CSF.Zpt.DocumentProviders.XmlLegacy.csproj
diff --git a/Tests/Test.CSF.Zpt.ExpressionEvaluators.CSharpExpressions/Test.CSF.Zpt.ExpressionEvaluators.CSharpExpressions.csproj b/Tests/Test.CSF.Zpt.ExpressionEvaluators.CSharpExpressions/Test.CSF.Zpt.ExpressionEvaluators.CSharpExpressions.csproj
diff --git a/Tests/Test.CSF.Zpt.ExpressionEvaluators.NotExpressions/Test.CSF.Zpt.ExpressionEvaluators.NotExpressions.csproj b/Tests/Test.CSF.Zpt.ExpressionEvaluators.NotExpressions/Test.CSF.Zpt.ExpressionEvaluators.NotExpressions.csproj
diff --git a/Tests/Test.CSF.Zpt.ExpressionEvaluators.PathExpressions/Test.CSF.Zpt.ExpressionEvaluators.PathExpressions.csproj b/Tests/Test.CSF.Zpt.ExpressionEvaluators.PathExpressions/Test.CSF.Zpt.ExpressionEvaluators.PathExpressions.csproj
diff --git a/Tests/Test.CSF.Zpt.ExpressionEvaluators.PythonExpressions/Test.CSF.Zpt.ExpressionEvaluators.PythonExpressions.csproj b/Tests/Test.CSF.Zpt.ExpressionEvaluators.PythonExpressions/Test.CSF.Zpt.ExpressionEvaluators.PythonExpressions.csproj
diff --git a/Tests/Test.CSF.Zpt.ExpressionEvaluators.StringExpressions/Test.CSF.Zpt.ExpressionEvaluators.StringExpressions.csproj b/Tests/Test.CSF.Zpt.ExpressionEvaluators.StringExpressions/Test.CSF.Zpt.ExpressionEvaluators.StringExpressions.csproj
diff --git a/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/ExpectedOutputs/issue-221_form_test.html b/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/ExpectedOutputs/issue-221_form_test.html
diff --git a/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/SourceDocuments/issue-221_form_test.html b/Tests/Test.CSF.Zpt.Integration/Test data/ZptIntegrationTests/SourceDocuments/issue-221_form_test.html
diff --git a/Tests/Test.CSF.Zpt.Integration/Test.CSF.Zpt.Integration.csproj b/Tests/Test.CSF.Zpt.Integration/Test.CSF.Zpt.Integration.csproj
diff --git a/Tests/Test.CSF.Zpt/Test.CSF.Zpt.csproj b/Tests/Test.CSF.Zpt/Test.CSF.Zpt.csproj
diff --git a/version.ini b/version.ini
