Raven subscription storage wireup

etishor · Jul 12, 2011 · 04a606a · 04a606a
1 parent 264ff08
commit 04a606a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/NanoMessageBus.sln.docstates b/src/NanoMessageBus.sln.docstates
diff --git a/...noMessageBus.SubscriptionStorage.Raven.Wireup/RavenSubscriptionStorageWireupExtensions.cs b/...noMessageBus.SubscriptionStorage.Raven.Wireup/RavenSubscriptionStorageWireupExtensions.cs
@@ -1,9 +1,10 @@
 
-namespace NanoMessageBus.SubscriptionStorage.Raven.Wireup
+namespace NanoMessageBus
 {
     using NanoMessageBus.Wireup;
     using global::Raven.Client;
     using global::Raven.Client.Document;
+    using NanoMessageBus.SubscriptionStorage.Raven;
 
     public static class RavenSubscriptionStorageWireupExtensions
     {

diff --git a/src/proj/NanoMessageBus.Wireup.Autofac/NanoMessageBus.Wireup.Autofac.csproj b/src/proj/NanoMessageBus.Wireup.Autofac/NanoMessageBus.Wireup.Autofac.csproj
@@ -66,7 +66,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
+    <Reference Include="Autofac" Condition="$(TargetFrameworkVersion) == 'v3.5'">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
       <HintPath>..\..\..\lib\Autofac\.NET 3.5\Autofac.dll</HintPath>
     </Reference>

diff --git a/...n.ProtocolBuffers.UnitTests/NanoMessageBus.Serialization.ProtocolBuffers.UnitTests.csproj b/...n.ProtocolBuffers.UnitTests/NanoMessageBus.Serialization.ProtocolBuffers.UnitTests.csproj
@@ -42,19 +42,24 @@
     <Compile Include="SimpleMessage.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\proj\NanoMessageBus.Serialization.NativeSerializers\NanoMessageBus.Serialization.NativeSerializers.csproj">
+    <Reference Include="NanoMessageBus (ILMerged)" Condition="'$(ILMerged)' == 'true'">
+      <HintPath>..\..\..\publish\bin\NanoMessageBus.dll</HintPath>
+    </Reference>
+
+
+    <ProjectReference Include="..\..\proj\NanoMessageBus.Serialization.NativeSerializers\NanoMessageBus.Serialization.NativeSerializers.csproj" Condition="'$(ILMerged)' != 'true'">
       <Project>{D40EACE0-49AB-46FC-9A0A-B56C7D59D328}</Project>
       <Name>NanoMessageBus.Serialization.NativeSerializers</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\proj\NanoMessageBus.Serialization.ProtocolBuffers\NanoMessageBus.Serialization.ProtocolBuffers.csproj">
       <Project>{BD0CBB4E-B1B4-4E53-8ECC-66CF0E73D78C}</Project>
       <Name>NanoMessageBus.Serialization.ProtocolBuffers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\proj\NanoMessageBus.Serialization\NanoMessageBus.Serialization.csproj">
+    <ProjectReference Include="..\..\proj\NanoMessageBus.Serialization\NanoMessageBus.Serialization.csproj" Condition="'$(ILMerged)' != 'true'">
       <Project>{2BFD260B-E68A-4A06-9E3C-EC02C460E145}</Project>
       <Name>NanoMessageBus.Serialization</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\proj\NanoMessageBus\NanoMessageBus.csproj">
+    <ProjectReference Include="..\..\proj\NanoMessageBus\NanoMessageBus.csproj" Condition="'$(ILMerged)' != 'true'">
       <Project>{A6D3AA0C-CEC9-47FF-80DF-B3F77D5B8E34}</Project>
       <Name>NanoMessageBus</Name>
     </ProjectReference>