Merge branch 'release-1.1.0'

Particular · Nov 15, 2013 · 24d287b · 24d287b
2 parents 95ae156 + 4d11c56
commit 24d287b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/ripple.config b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Name>NServiceBus.SqlServer</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>
@@ -37,15 +37,13 @@
     <Dependency Name="Ninject" Version="3.0.1.10" Mode="Fixed" />
     <Dependency Name="Ninject.Extensions.ContextPreservation" Version="3.0.0.8" Mode="Fixed" />
     <Dependency Name="Ninject.Extensions.NamedScope" Version="3.0.0.5" Mode="Fixed" />
-    <Dependency Name="NServiceBus" Version="4.1.0" Mode="Float" />
+    <Dependency Name="NServiceBus" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.AcceptanceTesting" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.Autofac" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.CastleWindsor" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Host" Version="4.1.0" Mode="Float" />
+    <Dependency Name="NServiceBus.Host" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.Interfaces" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Interfaces" Version="4.1.0" Mode="Float" />
     <Dependency Name="NServiceBus.NHibernate" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.NHibernate" Version="4.1.0" Mode="Float" />
     <Dependency Name="NServiceBus.Ninject" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.Spring" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.StructureMap" Version="4.2.0" Mode="Float" />

diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/ripple.dependencies.config b/src/NServiceBus.SqlServer.AcceptanceTests/ripple.dependencies.config
@@ -15,3 +15,5 @@ Spring.Core
 structuremap
 Unity
 Unity.Interception
+NServiceBus
+NServiceBus.Interfaces
diff --git a/src/NServiceBus.SqlServer/ripple.dependencies.config b/src/NServiceBus.SqlServer/ripple.dependencies.config
@@ -0,0 +1,2 @@
+NServiceBus
+NServiceBus.Interfaces