Merge branch 'release-6.0.0'

.gitattributes

@@ -0,0 +1,76 @@
+# 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
+
+
+*.approved.* binary

.gitignore

@@ -0,0 +1,38 @@
+nugets
+deploy
+build32
+binaries
+obj
+bin
+*.vshost.*
+.nu
+_ReSharper.*
+_UpgradeReport.*
+*.csproj.user
+*.resharper.user
+*.resharper
+*.suo
+*.cache
+*~
+*.swp
+*.user
+TestResults
+TestResult.xml
+results
+CommonAssemblyInfo.cs
+lib/sqlite/System.Data.SQLite.dll
+*.orig
+Samples/DataBus/storage
+packages
+PrecompiledWeb
+core-only
+Release
+Artifacts
+LogFiles
+csx
+*.ncrunchproject
+*.ncrunchsolution
+_NCrunch_NServiceBus/*
+logs
+run-git.cmd
+src/Chocolatey/Build/*

GitVersionConfig.yaml

@@ -0,0 +1 @@
+assemblyVersioningScheme: Major

Octopus/DeploymentProcess.json

@@ -0,0 +1,88 @@
+{
+  "Steps": [
+    {
+      "Id": "b3339d4f-563f-49ac-b759-554619554f9d",
+      "Name": "Deploy",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": "tentacle"
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "f57466ee-18c3-4f89-9aa9-153814528a44",
+          "Name": "Deploy",
+          "ActionType": "Octopus.TentaclePackage",
+          "Environments": [],
+          "Properties": {
+            "Octopus.Action.Package.NuGetFeedId": "feeds-1",
+            "Octopus.Action.EnabledFeatures": "Octopus.Features.ConfigurationTransforms,Octopus.Features.ConfigurationVariables",
+            "Octopus.Action.Package.AutomaticallyRunConfigurationTransformationFiles": "False",
+            "Octopus.Action.Package.AutomaticallyUpdateAppSettingsAndConnectionStrings": "False",
+            "Octopus.Action.Package.DownloadOnTentacle": "False",
+            "Octopus.Action.Package.NuGetPackageId": "%PROJECT_NAME%.Deploy"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    },
+    {
+      "Id": "674e1a63-42cf-440e-83be-f80f58ef85a1",
+      "Name": "Notify of draft",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": "tentacle"
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "578efb8c-8303-4c1f-88a9-f3cee9e14e0a",
+          "Name": "Notify of draft",
+          "ActionType": "Octopus.Script",
+          "Environments": [
+            "Environments-65"
+          ],
+          "Properties": {
+            "Octopus.Action.Script.ScriptBody": "$message = if ($OctopusParameters['HipChatMessage']) { $OctopusParameters['HipChatMessage'] } else { \"(successful) %PROJECT_NAME% [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])  on $($OctopusParameters['Octopus.Machine.Name'])\" } \n#---------\n$apitoken = $OctopusParameters['HipChatAuthToken']\n$roomid = $OctopusParameters['HipChatRoomId']\n$from = $OctopusParameters['HipChatFrom']\n$colour = $OctopusParameters['HipChatColor']\n\nTry \n{\n\t#Do the HTTP POST to HipChat\n\t$post = \"auth_token=$apitoken&room_id=$roomid&from=$from&color=$colour&message=$message&notify=1&message_format=text\"\n\t$webRequest = [System.Net.WebRequest]::Create(\"https://api.hipchat.com/v1/rooms/message\")\n\t$webRequest.ContentType = \"application/x-www-form-urlencoded\"\n\t$postStr = [System.Text.Encoding]::UTF8.GetBytes($post)\n\t$webrequest.ContentLength = $postStr.Length\n\t$webRequest.Method = \"POST\"\n\t$requestStream = $webRequest.GetRequestStream()\n\t$requestStream.Write($postStr, 0,$postStr.length)\n\t$requestStream.Close()\n\t\n\t[System.Net.WebResponse] $resp = $webRequest.GetResponse();\n\t$rs = $resp.GetResponseStream();\n\t[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs;\n\t$sr.ReadToEnd();\t\t\t\t\t\n}\ncatch [Exception] {\n\t\"Woah!, wasn't expecting to get this exception. `r`n $_.Exception.ToString()\"\n}",
+            "Octopus.Action.Template.Id": "ActionTemplates-2",
+            "Octopus.Action.Template.Version": "0",
+            "HipChatFrom": "Octopus Deploy",
+            "HipChatColor": "green",
+            "HipChatRoomId": "#{HipChatEngineeringID}",
+            "HipChatAuthToken": "#{HipChatAPIV1}",
+            "HipChatMessage": "New draft release of %PROJECT_NAME% at https://github.com/Particular/%PROJECT_NAME%/releases"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    },
+    {
+      "Id": "b6145394-b751-4d2e-8a92-1b82f1a3fc9a",
+      "Name": "Verify draft",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": ""
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "737fa883-457b-4821-805a-ade60e58e181",
+          "Name": "Verify draft",
+          "ActionType": "Octopus.Manual",
+          "Environments": [
+            "Environments-65"
+          ],
+          "Properties": {
+            "Octopus.Action.Manual.ResponsibleTeamIds": "teams-everyone",
+            "Octopus.Action.Manual.Instructions": "Please verify the draft release notes of NuGetPackager at https://github.com/Particular/NuGetPackager/releases"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    }
+  ],
+  "Version" : "%VERSION%"
+}

Octopus/Project.json

@@ -0,0 +1,18 @@
+{
+  "IncludedLibraryVariableSetIds": [
+    "LibraryVariableSets-33",
+    "LibraryVariableSets-36",
+    "LibraryVariableSets-35",
+	"LibraryVariableSets-65",
+	"LibraryVariableSets-67"
+  ],
+  "DefaultToSkipIfAlreadyInstalled": false,
+  "VersioningStrategy": {
+    "DonorPackageStepId": null,
+    "Template": "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}"
+  },
+  "Name": "%OCTO_PROJECT_NAME%",
+  "Description": "",
+  "IsDisabled": false,
+  "ProjectGroupId": "ProjectGroups-99",
+}

packaging/nuget/nservicebus.host.nuspec

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>NServiceBus.Host</id>
+    <title>NServiceBus Host</title>
+    <version>$version$</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, John Simons</owners>
+    <licenseUrl>http://particular.net/LicenseAgreement</licenseUrl>
+    <projectUrl>http://particular.net/</projectUrl>
+    <iconUrl>http://s3.amazonaws.com/nuget.images/NServiceBus_32.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>The hosting template for the nservicebus, The most popular open-source service bus for .net</description>
+    <releaseNotes></releaseNotes>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\binaries\NServiceBus.Host.???" target="lib\net45" />
+    <file src="..\..\packaging\nuget\nservicebus.host\*.*" target="tools" />
+  </files>
+</package>

packaging/nuget/nservicebus.host/EndpointConfig.cs

@@ -0,0 +1,26 @@
+
+namespace rootnamespace
+{
+    using NServiceBus;
+
+    /*
+		This class configures this endpoint as a Server. More information about how to configure the NServiceBus host
+		can be found here: http://particular.net/articles/the-nservicebus-host
+	*/
+    public class EndpointConfig : IConfigureThisEndpoint
+    {
+        public void Customize(BusConfiguration configuration)
+        {
+            // NServiceBus provides the following durable storage options
+            // To use RavenDB, install-package NServiceBus.RavenDB and then use configuration.UsePersistence<RavenDBPersistence>();
+            // To use SQLServer, install-package NServiceBus.NHibernate and then use configuration.UsePersistence<NHibernatePersistence>();
+
+            // If you don't need a durable storage you can also use, configuration.UsePersistence<InMemoryPersistence>();
+            // more details on persistence can be found here: http://docs.particular.net/nservicebus/persistence-in-nservicebus
+
+            //Also note that you can mix and match storages to fit you specific needs. 
+            //http://docs.particular.net/nservicebus/persistence-order
+            configuration.UsePersistence<PLEASE_SELECT_ONE>();
+        }
+    }
+}