Merge pull request #106 from Particular/release-7.0.0

Update master to latest release

.gitattributes

@@ -55,9 +55,11 @@
 *.fs text
 *.fsx text
 *.hs text
-
+*.targets text
 *.psm1 text
 *.ps1 text
+*.md text
+*.DotSettings text
 *.txt text eol=crlf
 *.bat text eol=crlf
 
@@ -71,6 +73,3 @@
 *.snk 	-text -diff
 *.cub 	-text -diff
 *.wixlib	-text -diff
-
-
-*.approved.* binary

.gitignore

@@ -2,29 +2,21 @@ 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
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
+tempstorage
 core-only
 Release
 Artifacts
@@ -36,3 +28,64 @@ _NCrunch_NServiceBus/*
 logs
 run-git.cmd
 src/Chocolatey/Build/*
+
+installer/[F|f]iles
+installer/[C|c]ustom[A|a]ctions
+installer/ServiceControl-cache
+
+# Created by https://www.gitignore.io
+
+### VisualStudio ###
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+.vs/
+
+# mac temp file ignore
+.DS_Store
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Roslyn cache directories
+*.ide/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+src/scaffolding.config
+
+# Approval tests temp file
+*.received.*
+
+# JetBrains Rider
+.idea/
+*.sln.iml

GitVersion.yml

@@ -0,0 +1,7 @@
+assembly-versioning-scheme: Major
+next-version: 7.0
+branches:
+  develop:
+    tag: alpha
+  releases?[/-]:
+    tag: rc

packaging/nuget/nservicebus.host.nuspec

@@ -4,22 +4,23 @@
     <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>
+    <authors>$authors$</authors>
+    <owners>$owners$</owners>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <requireLicenseAcceptance>$requireLicenseAcceptance$</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>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
     <dependencies>
-      <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
+      <dependency id="NServiceBus" version="[6.0.0, 7.0.0)" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\binaries\NServiceBus.Host.???" target="lib\net45" />
-    <file src="..\..\packaging\nuget\nservicebus.host\*.*" target="tools" />
+    <file src="..\..\binaries\NServiceBus.Host.???" target="lib\net452" />
+    <file src="..\..\packaging\nuget\nservicebus.host\install.ps1" target="tools\net452" />
+    <file src="..\..\packaging\nuget\nservicebus.host\EndpointConfig.cs.pp" target="content\net452" />
   </files>
 </package>

packaging/nuget/nservicebus.host/EndpointConfig.cs.pp

@@ -0,0 +1,23 @@
+
+namespace $rootnamespace$
+{
+    using NServiceBus;
+
+    public class EndpointConfig : IConfigureThisEndpoint
+    {
+        public void Customize(EndpointConfiguration endpointConfiguration)
+        {
+            //TODO: NServiceBus provides multiple durable storage options, including SQL Server, RavenDB, and Azure Storage Persistence.
+            // Refer to the documentation for more details on specific options.
+            endpointConfiguration.UsePersistence<PLEASE_SELECT_ONE>();
+
+            // NServiceBus will move messages that fail repeatedly to a separate "error" queue. We recommend
+            // that you start with a shared error queue for all your endpoints for easy integration with ServiceControl.
+            endpointConfiguration.SendFailedMessagesTo("error");
+
+            // NServiceBus will store a copy of each successfully process message in a separate "audit" queue. We recommend
+            // that you start with a shared audit queue for all your endpoints for easy integration with ServiceControl.
+            endpointConfiguration.AuditProcessedMessagesTo("audit");
+        }
+    }
+}

packaging/nuget/nservicebus.host/install.ps1

@@ -1,72 +1,19 @@
 param($installPath, $toolsPath, $package, $project)
 
 if(!$toolsPath){
-	$project = Get-Project
+    $project = Get-Project
 }
 
-function Get-ConfigureThisEndpointClass($elem) {
-
-    if ($elem.IsCodeType -and ($elem.Kind -eq [EnvDTE.vsCMElement]::vsCMElementClass)) {            
-        foreach ($e in $elem.ImplementedInterfaces) {
-            if ($e.FullName -eq "NServiceBus.IConfigureThisEndpoint") {
-                return $elem
-            }
-
-            return Get-ConfigureThisEndpointClass($e)
-
-        }
-    } 
-    elseif ($elem.Kind -eq [EnvDTE.vsCMElement]::vsCMElementNamespace) {
-        foreach ($e in $elem.Members) {
-            $temp = Get-ConfigureThisEndpointClass($e)
-            if($temp -ne $null) {
-
-                return $temp
-            }
+function Add-StartProgramIfNeeded {
+    [xml] $prjXml = Get-Content $project.FullName
+    foreach($PropertyGroup in $prjXml.project.ChildNodes)
+    {
+        if($PropertyGroup.StartAction -ne $null)
+        {
+            return
         }
     }
 
-    $null
-}
-
-function Test-HasConfigureThisEndpoint($project) {
-
-    foreach ($item in $project.ProjectItems) {
-		if ($projItem.Name -eq "EndpointConfig.cs") {
-			return $true
-		}
-
-		if (HasConfigureThisEndpoint($item)){
-			return $true
-		}
-    }
-
-    $false
-}
-
-function HasConfigureThisEndpoint($projItem) {
-	foreach ($codeElem in $projItem.FileCodeModel.CodeElements) {
-		$elem = Get-ConfigureThisEndpointClass($codeElem)
-		if($elem -ne $null) {
-			return $true
-		}
-	}
-
-	foreach ($item in $projItem.ProjectItems) {
-		return HasConfigureThisEndpoint($item)
-	}
-}
-
-function Add-StartProgramIfNeeded {
-	[xml] $prjXml = Get-Content $project.FullName
-	foreach($PropertyGroup in $prjXml.project.ChildNodes)
-	{
-		if($PropertyGroup.StartAction -ne $null)
-		{
-			return
-		}
-	}
-
     $exeName = "NServiceBus.Host"
 
     if($package.Id.Contains("Host32"))
@@ -76,49 +23,25 @@ function Add-StartProgramIfNeeded {
 
     $exeName += ".exe"
 
-	$propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
-	$startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
-	$propertyGroupElement.AppendChild($startActionElement) | Out-Null
-	$propertyGroupElement.StartAction = "Program"
-	$startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
-	$propertyGroupElement.AppendChild($startProgramElement) | Out-Null
-	$propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)$exeName"
-	$prjXml.project.AppendChild($propertyGroupElement) | Out-Null
-	$writerSettings = new-object System.Xml.XmlWriterSettings
-	$writerSettings.OmitXmlDeclaration = $false
-	$writerSettings.NewLineOnAttributes = $false
-	$writerSettings.Indent = $true
-	$projectFilePath = Resolve-Path -Path $project.FullName
-	$writer = [System.Xml.XmlWriter]::Create($projectFilePath, $writerSettings)
-	$prjXml.WriteTo($writer)
-	$writer.Flush()
-	$writer.Close()
-}
-
-function Add-ConfigSettingIfRequired {
-	Add-NServiceBusMessageForwardingInCaseOfFaultConfig $project.Name
-	Add-NServiceBusUnicastBusConfig $project.Name
-    Add-NServiceBusAuditConfig $project.Name
+    $propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
+    $startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
+    $propertyGroupElement.AppendChild($startActionElement) | Out-Null
+    $propertyGroupElement.StartAction = "Program"
+    $startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
+    $propertyGroupElement.AppendChild($startProgramElement) | Out-Null
+    $propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)$exeName"
+    $prjXml.project.AppendChild($propertyGroupElement) | Out-Null
+    $writerSettings = new-object System.Xml.XmlWriterSettings
+    $writerSettings.OmitXmlDeclaration = $false
+    $writerSettings.NewLineOnAttributes = $false
+    $writerSettings.Indent = $true
+    $projectFilePath = Resolve-Path -Path $project.FullName
+    $writer = [System.Xml.XmlWriter]::Create($projectFilePath, $writerSettings)
+    $prjXml.WriteTo($writer)
+    $writer.Flush()
+    $writer.Close()
 }
 
-function Add-EndpointConfigIfRequired {
-	$foundConfigureThisEndpoint = Test-HasConfigureThisEndpoint($project)
-
-	if($foundConfigureThisEndpoint -eq $false) {
-		$namespace = $project.Properties.Item("DefaultNamespace").Value
-
-		$projectDir = [System.IO.Path]::GetDirectoryName($project.FullName)
-		$endpoingConfigPath = [System.IO.Path]::Combine( $projectDir, "EndpointConfig.cs")
-		Get-Content  "$installPath\Tools\EndpointConfig.cs" | ForEach-Object { $_ -replace "rootnamespace", $namespace } | Set-Content ($endpoingConfigPath)
-
-		$project.ProjectItems.AddFromFile( $endpoingConfigPath )
-	}
-}
-
-Add-EndpointConfigIfRequired
-
-Add-ConfigSettingIfRequired
-
 $project.Save()
 
-Add-StartProgramIfNeeded
+Add-StartProgramIfNeeded

packaging/nuget/nservicebus.host32.nuspec

@@ -4,22 +4,23 @@
     <id>NServiceBus.Host32</id>
     <title>NServiceBus Host32</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>
+    <authors>$authors$</authors>
+    <owners>$owners$</owners>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <requireLicenseAcceptance>$requireLicenseAcceptance$</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>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
     <dependencies>
-      <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
+      <dependency id="NServiceBus" version="[6.0.0, 7.0.0)" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\binaries\NServiceBus.Host32.???" target="lib\net45" />
-	<file src="..\..\packaging\nuget\nservicebus.host\*.*" target="tools" />
+    <file src="..\..\binaries\NServiceBus.Host32.???" target="lib\net452" />
+    <file src="..\..\packaging\nuget\nservicebus.host\install.ps1" target="tools\net452" />
+    <file src="..\..\packaging\nuget\nservicebus.host\EndpointConfig.cs.pp" target="content\net452" />
   </files>
 </package>