moving core files to the core project

src/MessageVault.Core/MessageReader.cs

@@ -138,7 +138,7 @@ int cacheSize
 						}
 					}
 				}
-				catch (ForbiddenException ex) {
+				catch (ForbiddenException) {
 					throw;
 				}
 				catch (Exception ex) {

src/MessageVault.Core/MessageVault.Core.csproj

@@ -32,6 +32,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -44,6 +48,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppendResult.cs" />
+    <Compile Include="Cloud\CloudCheckpointReader.cs" />
+    <Compile Include="Cloud\CloudCheckpointWriter.cs" />
+    <Compile Include="Cloud\CloudPageReader.cs" />
+    <Compile Include="Cloud\CloudPageWriter.cs" />
+    <Compile Include="Cloud\CloudSetup.cs" />
+    <Compile Include="Cloud\Throw.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Crc32Algorithm.cs" />
     <Compile Include="Files\FileCheckpointReader.cs" />
@@ -72,10 +82,13 @@
     <Compile Include="PageReadStream.cs" />
     <Compile Include="Require.cs" />
     <Compile Include="Tests\MessageIdTests.cs" />
+    <Compile Include="Tests\MessageWriterTests.cs" />
     <Compile Include="Tests\PageReadStreamTests.cs" />
     <Compile Include="Tests\SyntheticFileTests.cs" />
     <Compile Include="Tests\SyntheticMemoryTests.cs" />
     <Compile Include="Tests\SyntheticTestBase.cs" />
+    <Compile Include="Tests\TestEnvironment.cs" />
+    <Compile Include="Tests\TransferFormatTests.cs" />
     <Compile Include="TransferFormat.cs" />
   </ItemGroup>
   <ItemGroup>

src/MessageVault/Tests/TransferFormatTests.cs → src/MessageVault.Core/Tests/TransferFormatTests.cs

@@ -1,9 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Threading;
-using MessageVault.Api;
 using MessageVault.Memory;
 using NUnit.Framework;
 
@@ -72,60 +69,4 @@ public sealed class TransferFormatTests {
 		}
 	}
 
-	[TestFixture]
-	public sealed class PageClientTests {
-
-
-
-
-		static byte[] GetBytes(int count) {
-
-			var b = new byte[count];
-
-			new Random().NextBytes(b);
-			return b;
-
-
-		}
-
-		[Test]
-		public void Roundtrip() {
-			Console.WriteLine("Starting...");
-			var client = new MemoryClient();
-			var passed = false;
-			var pager = new PagedClient(client, "test");
-
-			using (var s = new CancellationTokenSource(TimeSpan.FromSeconds(10))) {
-
-				var unpackedMessage = new UnpackedMessage(GetBytes(Constants.MaxKeySize),
-					GetBytes(Constants.MaxValueSize * 5 + 1));
-				Console.WriteLine("Pub...");
-				pager.Publish(new[] {
-
-					unpackedMessage
-
-
-
-				}, s.Token);
-				Console.WriteLine("Waiting...");
-
-				pager.ChaseEventsForever(s.Token, (id, subscription) => {
-					CollectionAssert.AreEqual(unpackedMessage.Value, id.Value);
-					CollectionAssert.AreEqual(unpackedMessage.Key, id.Key);
-					passed = true;
-					Console.WriteLine("Got it" + id);
-					s.Cancel();
-
-				});
-			}
-
-			if (!passed) {
-				Assert.Fail("Failed");
-			}
-
-
-
-		}
-	}
-
 }

src/MessageVault.Core/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
 </packages>

src/MessageVault/Api/CacheFetcher.cs

@@ -117,7 +117,6 @@ public sealed class ReadBulkResult {
 		public long AvailableCachePosition;
 		public long MaxOriginPosition;
 		public long CachedOriginPosition;
-
 		public bool ReadEndOfCacheBeforeItWasFlushed;
 		public IList<MessageHandlerClosure> Messages;
 

src/MessageVault/Api/CacheReader.cs

@@ -93,7 +93,6 @@ public sealed class CacheReader : IDisposable{
 					}
 					var frame = CacheStorage.Read(_reader);
 
-
 					handler(frame, currentPosition, maxPos);
 					// fix the position
 					result.ReadRecords += 1;

src/MessageVault/Files/FileClient.cs → src/MessageVault/FileClient.cs

@@ -3,8 +3,9 @@
 using System.IO;
 using System.Threading.Tasks;
 using MessageVault.Api;
+using MessageVault.Files;
 
-namespace MessageVault.Files {
+namespace MessageVault {
 
 	public sealed class FileClient : IClient 
 	{

src/MessageVault/Memory/MemoryClient.cs → src/MessageVault/MemoryClient.cs

@@ -3,9 +3,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MessageVault.Api;
+using MessageVault.Memory;
 using NUnit.Framework;
 
-namespace MessageVault.Memory {
+namespace MessageVault {
 
 	public sealed class MemoryClient : IClient {
 		sealed class InMemStream {

src/MessageVault/MessageVault.Client.csproj

@@ -49,9 +49,6 @@
     <Reference Include="Serilog">
       <HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
     </Reference>
-    <Reference Include="Serilog.FullNetFx">
-      <HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
@@ -64,22 +61,13 @@
     <Compile Include="Api\IClient.cs" />
     <Compile Include="Api\PagedClient.cs" />
     <Compile Include="Api\PostMessagesResponse.cs" />
-    <Compile Include="Cloud\Throw.cs" />
-    <Compile Include="Files\FileClient.cs" />
-    <Compile Include="Memory\MemoryClient.cs" />
-    <Compile Include="Cloud\CloudPageReader.cs" />
-    <Compile Include="Cloud\CloudSetup.cs" />
+    <Compile Include="FileClient.cs" />
+    <Compile Include="MemoryClient.cs" />
     <Compile Include="Api\CloudClient.cs" />
     <Compile Include="Api\GetStreamResponse.cs" />
-    <Compile Include="Cloud\CloudPageWriter.cs" />
-    <Compile Include="Cloud\CloudCheckpointWriter.cs" />
-    <Compile Include="Cloud\CloudCheckpointReader.cs" />
-    <Compile Include="Tests\TransferFormatTests.cs" />
-    <Compile Include="Tests\MessageWriterTests.cs" />
-    <Compile Include="Tests\TestEnvironment.cs" />
+    <Compile Include="Tests\PageClientTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/MessageVault/Tests/PageClientTests.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Threading;
+using MessageVault.Api;
+using NUnit.Framework;
+
+namespace MessageVault.Tests {
+
+	[TestFixture]
+	public sealed class PageClientTests {
+
+
+
+
+		static byte[] GetBytes(int count) {
+
+			var b = new byte[count];
+
+			new Random().NextBytes(b);
+			return b;
+
+
+		}
+
+		[Test]
+		public void Roundtrip() {
+			Console.WriteLine("Starting...");
+			var client = new MemoryClient();
+			var passed = false;
+			var pager = new PagedClient(client, "test");
+
+			using (var s = new CancellationTokenSource(TimeSpan.FromSeconds(10))) {
+
+				var unpackedMessage = new UnpackedMessage(GetBytes(Constants.MaxKeySize),
+					GetBytes(Constants.MaxValueSize * 5 + 1));
+				Console.WriteLine("Pub...");
+				pager.Publish(new[] {unpackedMessage}, s.Token);
+				Console.WriteLine("Waiting...");
+
+				pager.ChaseEventsForever(s.Token, (id, subscription) => {
+					CollectionAssert.AreEqual(unpackedMessage.Value, id.Value);
+					CollectionAssert.AreEqual(unpackedMessage.Key, id.Key);
+					passed = true;
+					Console.WriteLine("Got it" + id);
+					s.Cancel();
+
+				});
+			}
+
+			if (!passed) {
+				Assert.Fail("Failed");
+			}
+
+
+
+		}
+	}
+
+}