Skip to content

Commit 02a7fdf

Browse files
andreasohlundandreasohlund
committed
Merge branch '3.3.0'
2 parents ffa83eb + 996f91b commit 02a7fdf

File tree

600 files changed

+168322
-6166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+168322
-6166
lines changed

‎.gitignore

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
build
2-
binaries
3-
obj
4-
bin
5-
.nu
6-
_ReSharper.*
7-
_UpgradeReport.*
8-
*.csproj.user
9-
*.resharper.user
10-
*.resharper
11-
*.suo
12-
*.cache
13-
*~
14-
*.swp
15-
*.user
16-
TestResult.xml
17-
results
18-
nuget
19-
CommonAssemblyInfo.cs
20-
lib/sqlite/System.Data.SQLite.dll
21-
*.orig
22-
Samples/DataBus/storage
23-
packages
24-
PrecompiledWeb
25-
core-only
26-
Release
27-
Artifacts
1+
build
2+
binaries
3+
obj
4+
bin
5+
.nu
6+
_ReSharper.*
7+
_UpgradeReport.*
8+
*.csproj.user
9+
*.resharper.user
10+
*.resharper
11+
*.suo
12+
*.cache
13+
*~
14+
*.swp
15+
*.user
16+
TestResult.xml
17+
results
18+
CommonAssemblyInfo.cs
19+
lib/sqlite/System.Data.SQLite.dll
20+
*.orig
21+
Samples/DataBus/storage
22+
packages
23+
PrecompiledWeb
24+
core-only
25+
Release
26+
Artifacts
27+
csx

‎MSI.ps1

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
properties {
2+
$ProductVersion = "4.0"
3+
$PatchVersion = "0"
4+
$VsixFilePath = if($env:VSIX_PATH -ne $null) { $env:VSIX_PATH } else { "C:\Projects" }
5+
$SignFile = if($env:SIGN_CER_PATH -ne $null) { $env:SIGN_CER_PATH } else { "" }
6+
}
7+
8+
$baseDir = Split-Path (Resolve-Path $MyInvocation.MyCommand.Path)
9+
$packageOutPutDir = "$baseDir\artifacts"
10+
$toolsDir = "$baseDir\tools"
11+
$buildWixPath = "$baseDir\build\wix\"
12+
13+
include $toolsDir\psake\buildutils.ps1
14+
15+
task default -depends Build, Sign
16+
17+
task Clean {
18+
if ( -Not (Test-Path $packageOutPutDir))
19+
{
20+
New-Item $packageOutPutDir -ItemType Directory | Out-Null
21+
} else {
22+
Remove-Item ($packageOutPutDir + '\*.msi')
23+
}
24+
}
25+
26+
task Init {
27+
28+
$sdkInstallRoot = Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1" "InstallationFolder"
29+
echo "skdpath" $sdkInstallRoot
30+
if($sdkInstallRoot -eq $null) {
31+
$sdkInstallRoot = Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" "InstallationFolder"
32+
}
33+
34+
$netfxInstallroot = ""
35+
$netfxInstallroot = Get-RegistryValue "HKLM:\SOFTWARE\Microsoft\.NETFramework\" "InstallRoot"
36+
37+
$netfxCurrent = $netfxInstallroot + "v4.0.30319"
38+
39+
$script:msBuild = $netfxCurrent + "\msbuild.exe"
40+
$script:signTool = $sdkInstallRoot + "Bin\signtool.exe"
41+
42+
echo ".Net 4.0 build requested - $script:msBuild"
43+
}
44+
45+
task Build -depends Clean, Init {
46+
exec { &$script:msBuild $baseDir\src\wix\WixSolution.sln /t:"Clean,Build" /p:OutDir="$buildWixPath" /p:Configuration=Release /p:ProductVersion="$ProductVersion.$PatchVersion" /p:VsixPath="$VsixFilePath" }
47+
copy $buildWixPath*.msi $packageOutPutDir\
48+
}
49+
50+
task Sign -depends Init {
51+
if($SignFile -ne "") {
52+
exec { &$script:signTool sign /f "$SignFile" /p "$env:SIGN_CER_PASSWORD" /d "NServiceBus Installer" /du "http://www.nservicebus.com" /q $packageOutPutDir\*.msi }
53+
}
54+
}

‎NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<package>
2+
<metadata>
3+
<id>NServiceBus.Autofac</id>
4+
<title>NServiceBus Autofac</title>
5+
<version>4.0.0-alpha0</version>
6+
<authors>NServiceBus Ltd</authors>
7+
<owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
8+
<licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
9+
<projectUrl>http://nservicebus.com/</projectUrl>
10+
<iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>The Autofac Container for the nservicebus</description>
13+
<releaseNotes>
14+
</releaseNotes>
15+
<copyright>Copyright (C) NServiceBus 2010-2012</copyright>
16+
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
17+
<dependencies>
18+
<dependency id="Autofac" version="2.6.1.841" />
19+
<dependency id="NServiceBus" version="4.0.0-alpha0" />
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="\binaries\containers\autofac\NServiceBus.ObjectBuilder.Autofac.???" target="lib\net40" />
24+
</files>
25+
</package>

‎NuGet/NServiceBus.Autofac/tools/install.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
param($installPath, $toolsPath, $package, $project)
2+
3+
Add-BindingRedirect

‎NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<package>
2+
<metadata>
3+
<id>NServiceBus.Azure</id>
4+
<title>NServiceBus Azure</title>
5+
<version>4.0.0-alpha0</version>
6+
<authors>NServiceBus Ltd</authors>
7+
<owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
8+
<licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
9+
<projectUrl>http://nservicebus.com/</projectUrl>
10+
<iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>Azure support for NServicebus</description>
13+
<releaseNotes>
14+
</releaseNotes>
15+
<copyright>Copyright (C) NServiceBus 2010-2012</copyright>
16+
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
17+
<dependencies>
18+
<dependency id="NServiceBus.NHibernate" version="4.0.0-alpha0" />
19+
<dependency id="WindowsAzure.Storage" version="1.7.0.0" />
20+
<dependency id="log4net" version="1.2.10" />
21+
</dependencies>
22+
</metadata>
23+
<files>
24+
<file src="\binaries\NServiceBus.Azure.???" target="lib\net40" />
25+
<file src="\lib\azure\Microsoft.WindowsAzure.Diagnostics.dll" target="lib\net40" />
26+
<file src="\lib\azure\Microsoft.WindowsAzure.ServiceRuntime.dll" target="lib\net40" />
27+
<file src="\lib\azure\Microsoft.ServiceBus.dll" target="lib\net40" />
28+
<file src="\lib\NHibernate.Drivers.Azure.TableStorage.dll" target="lib\net40" />
29+
</files>
30+
</package>

‎NuGet/NServiceBus.Azure/tools/install.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
param($installPath, $toolsPath, $package, $project)
2+
3+
Add-BindingRedirect

‎NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<package>
2+
<metadata>
3+
<id>NServiceBus.CastleWindsor</id>
4+
<title>NServiceBus CastleWindsor</title>
5+
<version>4.0.0-alpha0</version>
6+
<authors>NServiceBus Ltd</authors>
7+
<owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
8+
<licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
9+
<projectUrl>http://nservicebus.com/</projectUrl>
10+
<iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>The CastleWindsor Container for the nservicebus</description>
13+
<releaseNotes>
14+
</releaseNotes>
15+
<copyright>Copyright (C) NServiceBus 2010-2012</copyright>
16+
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
17+
<dependencies>
18+
<dependency id="Castle.Windsor" version="3.0.0.2001" />
19+
<dependency id="NServiceBus" version="4.0.0-alpha0" />
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="\binaries\containers\castle\NServiceBus.ObjectBuilder.CastleWindsor.???" target="lib\net40" />
24+
</files>
25+
</package>

‎NuGet/NServiceBus.CastleWindsor/tools/install.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
param($installPath, $toolsPath, $package, $project)
2+
3+
Add-BindingRedirect

‎NuGet/NServiceBus.Host/NServiceBus.Host.nuspec

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<package>
2+
<metadata>
3+
<id>NServiceBus.Host</id>
4+
<title>NServiceBus Host</title>
5+
<version>4.0.0-alpha0</version>
6+
<authors>NServiceBus Ltd</authors>
7+
<owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
8+
<licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
9+
<projectUrl>http://nservicebus.com/</projectUrl>
10+
<iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>The hosting template for the nservicebus, The most popular open-source service bus for .net</description>
13+
<releaseNotes>
14+
</releaseNotes>
15+
<copyright>Copyright (C) NServiceBus 2010-2012</copyright>
16+
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
17+
<dependencies>
18+
<dependency id="NServiceBus" version="4.0.0-alpha0" />
19+
</dependencies>
20+
</metadata>
21+
<files>
22+
<file src="\binaries\NServiceBus.Host.???" target="lib\net40" />
23+
</files>
24+
</package>

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace $rootnamespace$
2+
{
3+
using NServiceBus;
4+
5+
/*
6+
This class configures this endpoint as a Server. More information about how to configure the NServiceBus host
7+
can be found here: http://nservicebus.com/GenericHost.aspx
8+
*/
9+
public class EndpointConfig : IConfigureThisEndpoint, AsA_Server
10+
{
11+
}
12+
}

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<configSections>
4+
<section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
5+
</configSections>
6+
<MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
7+
</configuration>
8+

‎NuGet/NServiceBus.Host/tools/install.ps1

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
param($installPath, $toolsPath, $package, $project)
2+
3+
Add-BindingRedirect
4+
5+
$project.Save()
6+
7+
8+
[xml] $prjXml = Get-Content $project.FullName
9+
foreach($PropertyGroup in $prjXml.project.ChildNodes)
10+
{
11+
if($PropertyGroup.StartAction -ne $null)
12+
{
13+
Break
14+
}
15+
}
16+
17+
$propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
18+
$startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
19+
$propertyGroupElement.AppendChild($startActionElement)
20+
$propertyGroupElement.StartAction = "Program"
21+
$startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
22+
$propertyGroupElement.AppendChild($startProgramElement)
23+
$propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)NServiceBus.Host.exe"
24+
$prjXml.project.AppendChild($propertyGroupElement);
25+
$writerSettings = new-object System.Xml.XmlWriterSettings
26+
$writerSettings.OmitXmlDeclaration = $false
27+
$writerSettings.NewLineOnAttributes = $false
28+
$writerSettings.Indent = $true
29+
$projectFilePath = Resolve-Path -Path $project.FullName
30+
$writer = [System.Xml.XmlWriter]::Create($projectFilePath, $writerSettings)
31+
$prjXml.WriteTo($writer)
32+
$writer.Flush()
33+
$writer.Close()
34+

‎NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<package>
2+
<metadata>
3+
<id>NServiceBus.Host32</id>
4+
<title>NServiceBus Host32</title>
5+
<version>4.0.0-alpha0</version>
6+
<authors>NServiceBus Ltd</authors>
7+
<owners>Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al</owners>
8+
<licenseUrl>http://nservicebus.com/license.aspx</licenseUrl>
9+
<projectUrl>http://nservicebus.com/</projectUrl>
10+
<iconUrl>http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png</iconUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>The hosting template for the nservicebus, The most popular open-source service bus for .net</description>
13+
<releaseNotes>
14+
</releaseNotes>
15+
<copyright>Copyright (C) NServiceBus 2010-2012</copyright>
16+
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
17+
<dependencies>
18+
<dependency id="NServiceBus" version="4.0.0-alpha0" />
19+
</dependencies>
20+
</metadata>
21+
<files>
22+
<file src="\binaries\NServiceBus.Host32.???" target="lib\net40" />
23+
</files>
24+
</package>

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace $rootnamespace$
2+
{
3+
using NServiceBus;
4+
5+
/*
6+
This class configures this endpoint as a Server. More information about how to configure the NServiceBus host
7+
can be found here: http://nservicebus.com/GenericHost.aspx
8+
*/
9+
public class EndpointConfig : IConfigureThisEndpoint, AsA_Server
10+
{
11+
}
12+
}

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<configSections>
4+
<section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
5+
</configSections>
6+
<MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
7+
</configuration>
8+

‎NuGet/NServiceBus.Host32/tools/install.ps1

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
param($installPath, $toolsPath, $package, $project)
2+
3+
Add-BindingRedirect
4+
5+
$project.Save()
6+
7+
8+
[xml] $prjXml = Get-Content $project.FullName
9+
foreach($PropertyGroup in $prjXml.project.ChildNodes)
10+
{
11+
if($PropertyGroup.StartAction -ne $null)
12+
{
13+
Break
14+
}
15+
}
16+
17+
$propertyGroupElement = $prjXml.CreateElement("PropertyGroup", $prjXml.Project.GetAttribute("xmlns"));
18+
$startActionElement = $prjXml.CreateElement("StartAction", $prjXml.Project.GetAttribute("xmlns"));
19+
$propertyGroupElement.AppendChild($startActionElement)
20+
$propertyGroupElement.StartAction = "Program"
21+
$startProgramElement = $prjXml.CreateElement("StartProgram", $prjXml.Project.GetAttribute("xmlns"));
22+
$propertyGroupElement.AppendChild($startProgramElement)
23+
$propertyGroupElement.StartProgram = "`$(ProjectDir)`$(OutputPath)NServiceBus.Host.exe"
24+
$prjXml.project.AppendChild($propertyGroupElement);
25+
$writerSettings = new-object System.Xml.XmlWriterSettings
26+
$writerSettings.OmitXmlDeclaration = $false
27+
$writerSettings.NewLineOnAttributes = $false
28+
$writerSettings.Indent = $true
29+
$projectFilePath = Resolve-Path -Path $project.FullName
30+
$writer = [System.Xml.XmlWriter]::Create($projectFilePath, $writerSettings)
31+
$prjXml.WriteTo($writer)
32+
$writer.Flush()
33+
$writer.Close()
34+

0 commit comments

Comments
 (0)