Merge branch '3.3.0'

.gitignore

@@ -1,27 +1,27 @@
-build
-binaries
-obj
-bin
-.nu
-_ReSharper.*
-_UpgradeReport.*
-*.csproj.user
-*.resharper.user
-*.resharper
-*.suo
-*.cache
-*~
-*.swp
-*.user
-TestResult.xml
-results
-nuget
-CommonAssemblyInfo.cs
-lib/sqlite/System.Data.SQLite.dll
-*.orig
-Samples/DataBus/storage
-packages
-PrecompiledWeb
-core-only
-Release
-Artifacts
+build
+binaries
+obj
+bin
+.nu
+_ReSharper.*
+_UpgradeReport.*
+*.csproj.user
+*.resharper.user
+*.resharper
+*.suo
+*.cache
+*~
+*.swp
+*.user
+TestResult.xml
+results
+CommonAssemblyInfo.cs
+lib/sqlite/System.Data.SQLite.dll
+*.orig
+Samples/DataBus/storage
+packages
+PrecompiledWeb
+core-only
+Release
+Artifacts
+csx

MSI.ps1

@@ -0,0 +1,54 @@
+properties {
+	$ProductVersion = "4.0"
+	$PatchVersion = "0"
+	$VsixFilePath = if($env:VSIX_PATH -ne $null) { $env:VSIX_PATH } else { "C:\Projects" }
+	$SignFile = if($env:SIGN_CER_PATH -ne $null) { $env:SIGN_CER_PATH } else { "" }
+}
+
+$baseDir = Split-Path (Resolve-Path $MyInvocation.MyCommand.Path)
+$packageOutPutDir = "$baseDir\artifacts"
+$toolsDir = "$baseDir\tools"
+$buildWixPath = "$baseDir\build\wix\"
+
+include $toolsDir\psake\buildutils.ps1
+
+task default -depends Build, Sign
+
+task Clean { 
+	if ( -Not (Test-Path $packageOutPutDir))
+	{
+		New-Item $packageOutPutDir -ItemType Directory | Out-Null
+	} else {
+		Remove-Item ($packageOutPutDir + '\*.msi')
+	}
+}
+
+task Init {
+
+		$sdkInstallRoot = Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1" "InstallationFolder"
+        echo "skdpath" $sdkInstallRoot
+		if($sdkInstallRoot -eq $null) {
+			$sdkInstallRoot = Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" "InstallationFolder"
+		}
+
+		$netfxInstallroot = "" 
+		$netfxInstallroot =	Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\.NETFramework\" "InstallRoot" 
+
+		$netfxCurrent = $netfxInstallroot + "v4.0.30319"
+
+		$script:msBuild = $netfxCurrent + "\msbuild.exe"
+		$script:signTool = $sdkInstallRoot + "Bin\signtool.exe"
+
+		echo ".Net 4.0 build requested - $script:msBuild" 
+}
+
+task Build -depends Clean, Init {
+	exec { &$script:msBuild $baseDir\src\wix\WixSolution.sln /t:"Clean,Build" /p:OutDir="$buildWixPath" /p:Configuration=Release /p:ProductVersion="$ProductVersion.$PatchVersion" /p:VsixPath="$VsixFilePath" }
+	copy $buildWixPath*.msi $packageOutPutDir\
+}
+
+task Sign -depends Init {
+	if($SignFile -ne "") {
+		exec { &$script:signTool sign /f "$SignFile" /p "$env:SIGN_CER_PASSWORD" /d "NServiceBus Installer" /du "http://www.nservicebus.com" /q  $packageOutPutDir\*.msi }
+	}
+}

NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec

@@ -0,0 +1,25 @@
+<package>
+  <metadata>
+    <id>NServiceBus.Autofac</id>
+    <title>NServiceBus Autofac</title>
+    <version>4.0.0-alpha0</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
+    <licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
+    <projectUrl>http://nservicebus.com/</projectUrl>
+    <iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>The Autofac Container for the nservicebus</description>
+    <releaseNotes>
+    </releaseNotes>
+    <copyright>Copyright (C) NServiceBus 2010-2012</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="Autofac" version="2.6.1.841" />
+      <dependency id="NServiceBus" version="4.0.0-alpha0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="\binaries\containers\autofac\NServiceBus.ObjectBuilder.Autofac.???" target="lib\net40" />
+  </files>
+</package>

NuGet/NServiceBus.Autofac/tools/install.ps1

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+
+Add-BindingRedirect

NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec

@@ -0,0 +1,30 @@
+<package>
+  <metadata>
+    <id>NServiceBus.Azure</id>
+    <title>NServiceBus Azure</title>
+    <version>4.0.0-alpha0</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
+    <licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
+    <projectUrl>http://nservicebus.com/</projectUrl>
+    <iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Azure support for NServicebus</description>
+    <releaseNotes>
+    </releaseNotes>
+    <copyright>Copyright (C) NServiceBus 2010-2012</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="NServiceBus.NHibernate" version="4.0.0-alpha0" />
+      <dependency id="WindowsAzure.Storage" version="1.7.0.0" />
+      <dependency id="log4net" version="1.2.10" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="\binaries\NServiceBus.Azure.???" target="lib\net40" />
+    <file src="\lib\azure\Microsoft.WindowsAzure.Diagnostics.dll" target="lib\net40" />
+    <file src="\lib\azure\Microsoft.WindowsAzure.ServiceRuntime.dll" target="lib\net40" />
+    <file src="\lib\azure\Microsoft.ServiceBus.dll" target="lib\net40" />
+    <file src="\lib\NHibernate.Drivers.Azure.TableStorage.dll" target="lib\net40" />
+  </files>
+</package>

NuGet/NServiceBus.Azure/tools/install.ps1

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+
+Add-BindingRedirect

NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec

@@ -0,0 +1,25 @@
+<package>
+  <metadata>
+    <id>NServiceBus.CastleWindsor</id>
+    <title>NServiceBus CastleWindsor</title>
+    <version>4.0.0-alpha0</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
+    <licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
+    <projectUrl>http://nservicebus.com/</projectUrl>
+    <iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>The CastleWindsor Container for the nservicebus</description>
+    <releaseNotes>
+    </releaseNotes>
+    <copyright>Copyright (C) NServiceBus 2010-2012</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="Castle.Windsor" version="3.0.0.2001" />
+      <dependency id="NServiceBus" version="4.0.0-alpha0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="\binaries\containers\castle\NServiceBus.ObjectBuilder.CastleWindsor.???" target="lib\net40" />
+  </files>
+</package>

NuGet/NServiceBus.CastleWindsor/tools/install.ps1

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+
+Add-BindingRedirect

NuGet/NServiceBus.Host/NServiceBus.Host.nuspec

@@ -0,0 +1,24 @@
+<package>
+  <metadata>
+    <id>NServiceBus.Host</id>
+    <title>NServiceBus Host</title>
+    <version>4.0.0-alpha0</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
+    <licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
+    <projectUrl>http://nservicebus.com/</projectUrl>
+    <iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.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 (C) NServiceBus 2010-2012</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="NServiceBus" version="4.0.0-alpha0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="\binaries\NServiceBus.Host.???" target="lib\net40" />
+  </files>
+</package>

NuGet/NServiceBus.Host/content/EndpointConfig.cs.pp

@@ -0,0 +1,12 @@
+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://nservicebus.com/GenericHost.aspx
+	*/
+	public class EndpointConfig : IConfigureThisEndpoint, AsA_Server
+    {
+    }
+}

NuGet/NServiceBus.Host/content/app.config.transform

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
+   </configSections>
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
+</configuration>
+

NuGet/NServiceBus.Host/tools/install.ps1

@@ -0,0 +1,34 @@
+param($installPath, $toolsPath, $package, $project)
+
+	Add-BindingRedirect	
+
+    $project.Save()
+
+
+	[xml] $prjXml = Get-Content $project.FullName
+	foreach($PropertyGroup in $prjXml.project.ChildNodes)
+	{
+	  if($PropertyGroup.StartAction -ne $null)
+	  {
+	  	Break
+	  }
+	}
+
+	$propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
+	$startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
+	$propertyGroupElement.AppendChild($startActionElement)
+	$propertyGroupElement.StartAction = "Program"
+	$startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
+	$propertyGroupElement.AppendChild($startProgramElement)
+	$propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)NServiceBus.Host.exe"
+	$prjXml.project.AppendChild($propertyGroupElement);
+	$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()
+

NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec

@@ -0,0 +1,24 @@
+<package>
+  <metadata>
+    <id>NServiceBus.Host32</id>
+    <title>NServiceBus Host32</title>
+    <version>4.0.0-alpha0</version>
+    <authors>NServiceBus Ltd</authors>
+    <owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
+    <licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
+    <projectUrl>http://nservicebus.com/</projectUrl>
+    <iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.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 (C) NServiceBus 2010-2012</copyright>
+    <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
+    <dependencies>
+      <dependency id="NServiceBus" version="4.0.0-alpha0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="\binaries\NServiceBus.Host32.???" target="lib\net40" />
+  </files>
+</package>

NuGet/NServiceBus.Host32/content/EndpointConfig.cs.pp

@@ -0,0 +1,12 @@
+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://nservicebus.com/GenericHost.aspx
+	*/
+	public class EndpointConfig : IConfigureThisEndpoint, AsA_Server
+    {
+    }
+}

NuGet/NServiceBus.Host32/content/app.config.transform

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
+   </configSections>
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
+</configuration>
+

NuGet/NServiceBus.Host32/tools/install.ps1

@@ -0,0 +1,34 @@
+param($installPath, $toolsPath, $package, $project)
+
+	Add-BindingRedirect
+
+    $project.Save()
+
+
+	[xml] $prjXml = Get-Content $project.FullName
+	foreach($PropertyGroup in $prjXml.project.ChildNodes)
+	{
+	  if($PropertyGroup.StartAction -ne $null)
+	  {
+	  	Break
+	  }
+	}
+
+	$propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
+	$startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
+	$propertyGroupElement.AppendChild($startActionElement)
+	$propertyGroupElement.StartAction = "Program"
+	$startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
+	$propertyGroupElement.AppendChild($startProgramElement)
+	$propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)NServiceBus.Host.exe"
+	$prjXml.project.AppendChild($propertyGroupElement);
+	$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()
+