Merge branch 'develop' into release-1.0.0

Conflicts:
	ripple.config
	src/ServicePulse.Host/Hosting/Help.txt

Author: andreasohlund

.gitattributes

@@ -22,6 +22,8 @@
 *.pptx	-text -diff
 *.xap	-text -diff
 *.ico	-text -diff
+*.ttf	-text -diff
+*.otf	-text -diff
 
 *.cs text diff=csharp
 *.config text diff=csharp

buildsupport/PepitaPackage.dll

@@ -32,15 +32,16 @@
   <Target Name="Build" DependsOnTargets="Build" />
   <Target Name="ReBuild" DependsOnTargets="Build" />
   <UsingTask TaskName="GitFlowVersionTask.GetVersion" AssemblyFile="$(SolutionDir)..\buildsupport\GitFlowVersion\GitFlowVersionTask.dll" />
-  <UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(SolutionDir)..\buildsupport\PepitaPackage.dll" />
-  <UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(SolutionDir)..\buildsupport\MSBuild.Community.Tasks.dll" />
+  <UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(ProjectDir)PepitaPackage.dll" />
+  <UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(ProjectDir)MSBuild.Community.Tasks.dll" />
   <Target Name="Build">
     <GetVersion SolutionDirectory="$(SolutionDir)">
       <Output TaskParameter="SemVer" PropertyName="SemVer" />
       <Output TaskParameter="Stability" PropertyName="Stability" />
       <Output TaskParameter="MajorMinorPatch" PropertyName="MajorMinorPatch" />
       <Output TaskParameter="Stability" PropertyName="Stability" />
       <Output TaskParameter="PreReleasePartOne" PropertyName="PreReleasePartOne" />
+      <Output TaskParameter="NuGetVersion" PropertyName="NuGetVersion" />
     </GetVersion>
 
     <PropertyGroup Condition=" '$(Stability)' == 'Final' ">
@@ -69,5 +70,8 @@
     <FileUpdate Files="@(InstallFile)" Regex="{{ReleaseName}}" ReplacementText="$(ChocoVersion)" />
 
     <CreatePackageTask  NuGetBuildDirectory="$(ProjectDir)Build" Version="$(ChocoVersion)" TargetDir="$(SolutionDir)..\nugets" />
+    <FileUpdate Files="@(InstallFile)" Regex="SemVer" ReplacementText="$(SemVer)" />
+    <FileUpdate Files="@(InstallFile)" Regex="MajorMinorPatch" ReplacementText="$(MajorMinorPatch)" />
+    <CreatePackageTask NuGetBuildDirectory="$(ProjectDir)Build" Version="$(NuGetVersion)" TargetDir="$(SolutionDir)..\nugets" />
   </Target>
 </Project>

src/Chocolatey/Chocolatey.csproj

@@ -13,7 +13,6 @@
     <summary></summary>
     <tags>nservicebus particular chocolatey servicepulse</tags>
     <dependencies>
-      <dependency id="DotNet4.5" version="4.5.20120822"  />
     </dependencies>
   </metadata>
-</package>
+</package>

buildsupport/MSBuild.Community.Tasks.dll renamed to src/Chocolatey/MSBuild.Community.Tasks.dll

@@ -30,4 +30,4 @@ EXAMPLES:
 
    ServicePulse.Host.exe --uninstall --serviceName="MyServicePulse"
 
-   ServicePulse.Host.exe --extract --serviceControlUrl="http://localhost:8080/api"
+   ServicePulse.Host.exe --extract --serviceControlUrl="http://localhost:8080/api"