Merge pull request #1990 from Kampbell/poco-1.8.0

Poco 1.8.0

build.gradle

@@ -724,21 +724,6 @@ subprojects {
 	tasks.withType(RunTestExecutable) {
 		args test
 	}
-	task showCompilerOutput {
-	   doLast {
-	      FileTree tree = fileTree('gradle').include('**/output.txt')
-	      // Iterate over the contents of a tree
-	      tree.each {File file ->
-	          println 'Content of file ' + file + ':\n'
-	          println file.text
-	      }
-	   }
-	}
-/*
-  	tasks.withType(CppCompile) {
-		finalizedBy showCompilerOutput
-	}
-*/
 }
 task pocos() {
 		def Set<Task> tts = project.getTasksByName('poco', true)
@@ -802,7 +787,7 @@ task zipDoc(type: Zip) {
 def candle(VSYEAR, VERSION, target, os) {
 	return tasks.create("Candle-${VSYEAR}-${VERSION}-${target}", Exec) {
 		dependsOn ':pocos'
-		//dependsOn ':pocoDoc'
+		dependsOn ':pocoDoc'
 		executable "${WiXHome}/bin/Candle.exe"
 		workingDir "packaging/Windows/WiX"
 		args "-arch", "${target}"

packaging/Windows/NuGet/Pocoproject.Poco.vs140.nuspec

@@ -1,4 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE package  [
+<!ENTITY CHANGELOG SYSTEM "..\..\..\CHANGELOG">
+]>
 <package xmlns='http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd'>
     <metadata>
         <id>Pocoproject.Poco.vs140</id>
@@ -12,6 +15,9 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Modern, powerful open source C++ class libraries for building network- and internet-based applications that run on desktop, server, mobile and embedded systems.</description>
         <releaseNotes>
+        	<![CDATA[
+        		&CHANGELOG;
+        	]]>
 		</releaseNotes>
         <copyright>Copyright 2017</copyright>
         <tags>string filesystem thread date log event regex uri uuid cache native nativepackage sockets mime http ftp mail pop3 smtp html sax sax2 dom xml</tags>