diff --git a/UnsupportedBuildCoreOnly.bat b/UnsupportedBuildCoreOnly.bat
deleted file mode 100644
index 8869b8777b1..00000000000
--- a/UnsupportedBuildCoreOnly.bat
+++ /dev/null
@@ -1 +0,0 @@
-.\tools\nant\NAnt -D:include.dependencies=false
\ No newline at end of file
diff --git a/build-coreonly.bat b/build-coreonly.bat
new file mode 100644
index 00000000000..8d7648e17cd
--- /dev/null
+++ b/build-coreonly.bat
@@ -0,0 +1,3 @@
+powershell .\install-packages.ps1
+
+.\tools\nant\NAnt -D:include.dependencies=false %1
\ No newline at end of file
diff --git a/build-net3.5.bat b/build-net3.5.bat
index e787c567018..ffa5b4f68fb 100644
--- a/build-net3.5.bat
+++ b/build-net3.5.bat
@@ -1 +1,3 @@
-.\tools\nant\nant.exe -D:targetframework=net-3.5
\ No newline at end of file
+powershell .\install-packages.ps1
+
+.\tools\nant\nant.exe -D:targetframework=net-3.5 %1
\ No newline at end of file
diff --git a/build.bat b/build.bat
index fbb3ae46da9..9f78537d7dd 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1,2 @@
+powershell .\install-packages.ps1
.\tools\nant\nant %1
diff --git a/install-packages.ps1 b/install-packages.ps1
new file mode 100644
index 00000000000..d63ef023c28
--- /dev/null
+++ b/install-packages.ps1
@@ -0,0 +1,8 @@
+dir -recurse -include ('packages.config') |ForEach-Object {
+ $packageconfig = [io.path]::Combine($_.directory,$_.name)
+
+ write-host $packageconfig
+
+ .\tools\NuGet\NuGet.exe install $packageconfig -o packages
+}
+
diff --git a/nant.build b/nant.build
index b47b54f7dca..b67551bcb12 100644
--- a/nant.build
+++ b/nant.build
@@ -102,10 +102,6 @@
-
-
@@ -239,6 +235,7 @@
+
diff --git a/packages.config b/packages.config
deleted file mode 100644
index b23f44e0824..00000000000
--- a/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packages/repositories.config b/packages/repositories.config
new file mode 100644
index 00000000000..bcd462002d7
--- /dev/null
+++ b/packages/repositories.config
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/When_acking_an_existing_message.cs b/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/When_acking_an_existing_message.cs
index 1989d2ec1c8..30670dadd0f 100644
--- a/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/When_acking_an_existing_message.cs
+++ b/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/When_acking_an_existing_message.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.IO;
using System.Messaging;
+ using System.Threading;
using System.Transactions;
using NUnit.Framework;
using Persistence.Raven;
@@ -51,7 +52,6 @@ public void Should_mark_the_message_as_acked()
}
[Test]
- [Explicit("Until Ayende fixes the issue")]
public void Raven_dtc_bug()
{
new MessageQueue(QueueAddress, QueueAccessMode.ReceiveAndAdmin)
@@ -77,6 +77,7 @@ public void Raven_dtc_bug()
//when we complete raven commits it tx but the DTC tx is never commited and eventually times out
tx.Complete();
}
+ Thread.Sleep(1000);
Assert.AreEqual(1,new MessageQueue(QueueAddress, QueueAccessMode.ReceiveAndAdmin)
.GetAllMessages().Length);
diff --git a/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/in_the_raven_storage.cs b/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/in_the_raven_storage.cs
index 3c505416493..5252b55cde6 100644
--- a/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/in_the_raven_storage.cs
+++ b/src/gateway/NServiceBus.Gateway.Tests/Idempotency/Raven/in_the_raven_storage.cs
@@ -9,6 +9,7 @@
using NUnit.Framework;
using Persistence;
using Persistence.Raven;
+ using global::Raven.Client.Embedded;
public class in_the_raven_storage
{
@@ -18,11 +19,9 @@ public class in_the_raven_storage
[SetUp]
public void SetUp()
{
- store = new DocumentStore
- {
- Url = "http://localhost:8080",
- };
-
+ //store = new EmbeddableDocumentStore { RunInMemory = true };
+ store = new DocumentStore { Url = "http://localhost:8080" };
+
store.Initialize();
ravenPersister = new RavenDBPersistence(store);
@@ -40,6 +39,7 @@ protected bool Store(TestMessage message)
using (var msgStream = new MemoryStream(message.OriginalMessage))
{
var result = ravenPersister.InsertMessage(message.ClientId, message.TimeReceived, msgStream, message.Headers);
+
scope.Complete();
return result;
diff --git a/src/gateway/NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.csproj b/src/gateway/NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.csproj
index 8f9108bdb39..ae3dddde71e 100644
--- a/src/gateway/NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.csproj
+++ b/src/gateway/NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.csproj
@@ -31,9 +31,24 @@
4
-
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\AsyncCtpLibrary.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Esent.Interop.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\ICSharpCode.NRefactory.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Lucene.Net.dll
+
+
..\..\..\packages\Newtonsoft.Json.4.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\NLog.dll
+
..\..\..\build\output\NServiceBus.dll
@@ -75,15 +90,48 @@
..\..\..\tools\NUnit\nunit.framework.dll
-
- ..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Abstractions.dll
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Abstractions.dll
+
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Debug.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Client.Embedded.dll
+
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Lightweight.dll
-
- ..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Client.Lightweight.dll
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.MvcIntegration.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Database.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Http.dll
+
+
+ ..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Json.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Munin.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Storage.Esent.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Storage.Managed.dll
..\..\..\lib\rhino.mocks\Rhino.Mocks.dll
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Spatial.Net.dll
+
+
+ ..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\SpellChecker.Net.dll
+
@@ -125,6 +173,7 @@
Designer
+