Merge branch 'release-1.0.0'

Author: andreasohlund

.gitattributes

@@ -0,0 +1,73 @@
+# Auto detect text files and perform CRLF normalization
+* text=auto eol=crlf
+
+# Standard to msysgit
+*.doc	diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.exe	-text -diff
+*.jpg  	-text -diff
+*.png 	-text -diff
+*.gif 	-text -diff
+*.dll 	-text -diff
+*.pdb 	-text -diff
+*.pptx	-text -diff
+*.xap	-text -diff
+*.ico	-text -diff
+*.ttf	-text -diff
+*.otf	-text -diff
+
+*.cs text diff=csharp
+*.config text diff=csharp
+*.xml text diff=csharp
+*.vb text
+*.c text
+*.cpp text
+*.cxx text
+*.h text
+*.hxx text
+*.py text
+*.rb text
+*.java text
+*.html text
+*.htm text
+*.css text
+*.scss text
+*.sass text
+*.less text
+*.js text
+*.lisp text
+*.clj text
+*.sql text
+*.php text
+*.lua text
+*.m text
+*.asm text
+*.erl text
+*.fs text
+*.fsx text
+*.hs text
+
+*.psm1 text
+*.ps1 text
+*.txt text eol=crlf
+*.bat text eol=crlf
+
+# Custom for Visual Studio
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union 
+*.sln text eol=crlf merge=union
+*.suo 	-text -diff
+*.snk 	-text -diff
+*.cub 	-text -diff
+*.wixlib	-text -diff

.gitignore

@@ -1,108 +1,38 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
+nugets
+build32
+binaries
+obj
+bin
+*.vshost.*
+.nu
+_ReSharper.*
+_UpgradeReport.*
+*.csproj.user
+*.resharper.user
+*.resharper
 *.suo
+*.cache
+*~
+*.swp
 *.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-x64/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.log
-*.vspscc
-*.vssscc
-.builds
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder 
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Publish Web Output
-*.Publish.xml
-
-# NuGet Packages Directory
+TestResults
+TestResult.xml
+results
+CommonAssemblyInfo.cs
+lib/sqlite/System.Data.SQLite.dll
+*.orig
+Samples/DataBus/storage
 packages
-
-# Windows Azure Build Output
+PrecompiledWeb
+core-only
+Release
+Artifacts
+LogFiles
 csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
+*.ncrunchproject
+*.ncrunchsolution
+_NCrunch_NServiceBus/*
+logs
+run-git.cmd
+src/Chocolatey/Build/*
+App_Packages

README.md

@@ -1,2 +1,3 @@
 ServicePulse
 ============
+ 

buildsupport/FubuCore.dll

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
+  </PropertyGroup>
+
+  <UsingTask
+      TaskName="GitFlowVersionTask.UpdateAssemblyInfo"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+  <UsingTask
+      TaskName="GitFlowVersionTask.WriteVersionInfoToBuildLog"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+
+    <Target Name="UpdateAssemblyInfo"
+            BeforeTargets="CoreCompile">
+      <WriteVersionInfoToBuildLog
+        SolutionDirectory="$(SolutionDir)"
+        />
+        <UpdateAssemblyInfo 
+          SolutionDirectory="$(SolutionDir)"
+          AssemblyName="$(AssemblyName)" 
+          ProjectFile="$(ProjectPath)" 
+          SignAssembly="$(SignAssembly)"
+          CompileFiles ="@(Compile)">
+          <Output 
+            TaskParameter="AssemblyInfoTempFilePath" 
+            PropertyName="AssemblyInfoTempFilePath" />
+        </UpdateAssemblyInfo>
+
+        <ItemGroup>
+            <Compile Include="$(AssemblyInfoTempFilePath)" />
+        </ItemGroup>
+    </Target>
+
+  <!--Support for ncrunch-->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.exe" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
+  </ItemGroup>
+
+
+</Project>
+
+