Commit 36ef466

mo khan <mo@mokhan.ca>
2010-07-11 00:28:16
fixed references to libraries in project files.
main
1 parent de27795
Changed files (7)
build
Build.csproj
project.build
project.test.build
product
client
client.ui
client.csproj
common
common.csproj
commons
infrastructure.thirdparty
infrastructure.thirdparty.csproj
infrastructure.thirdparty.log4net
infrastructure.thirdparty.log4net.csproj
build/Build.csproj
@@ -74,7 +74,9 @@
     <None Include="project.build" />
     <None Include="project.deploy.build" />
     <None Include="project.install.build" />
-    <None Include="project.test.build" />
+    <None Include="project.test.build">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="tools\psake\build_utilities.ps1" />
     <None Include="tools\psake\psake.ps1" />
   </ItemGroup>
build/project.build
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="momoney">	
 	<property name="project.name" value="${project::get-name()}" />
-  <property name="nant.settings.currentframework" value="net-3.5" />
+  <!--<property name="nant.settings.currentframework" value="net-4.0" />-->
 
 	<property name="base.dir" value="${directory::get-parent-directory(project::get-base-directory())}" />
 	<property name="product.dir" value="${base.dir}\product" />
@@ -28,7 +28,8 @@
 	</target>
 	
 	<target name="app.compile" depends="init">
-	  <property name="msbuild.exe" value="${framework::get-framework-directory(framework::get-target-framework())}\msbuild.exe" />
+	  <!--<property name="msbuild.exe" value="${framework::get-framework-directory(framework::get-target-framework())}\msbuild.exe" />-->
+	  <property name="msbuild.exe" value="c:\windows\microsoft.net\framework\v4.0.30319\msbuild.exe" />
 	  <exec program="${msbuild.exe}"
           workingdir="${base.dir}"
           commandline="studio.sln /p:Configuration=Release;OutDir=${build.compile.dir}\ /t:Rebuild /nologo /m /v:q"
build/project.test.build
@@ -2,7 +2,8 @@
 <project name="project.test">
 	<property name="test.output" value="tests.dll" />
 	<!--<property name="xunit.cons.exe" value="${build.tools.dir}\gallio\gallio.echo.exe" />-->
-	<property name="xunit.cons.exe" value="${build.tools.dir}\nunit\nunit-console.exe" />
+	<!--<property name="xunit.cons.exe" value="${build.tools.dir}\nunit\nunit-console.exe" />-->
+	<property name="xunit.cons.exe" value="${build.tools.dir}\nunit\machine.specifications.consolerunner.exe" />
 
 	<target name="run.test" depends="app.compile">
 		<exec program="${xunit.cons.exe}" workingdir="${build.compile.dir}" commandline="${xunit.arguments}" />
@@ -10,7 +11,8 @@
 
 	<target name="test">
 		<!--<property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:text /rd:${build.compile.dir}" />-->
-		<property name="xunit.arguments" value="${build.compile.dir}/${test.output}" />
+		<!--<property name="xunit.arguments" value="${build.compile.dir}/${test.output}" />-->
+		<property name="xunit.arguments" value=" --html ${build.compile.dir} ${build.compile.dir}/${test.output} " />
 		<call target="run.test" />
 	</target>
product/client/client.ui/client.csproj
@@ -72,10 +72,6 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\sqlite\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
product/client/common/common.csproj
@@ -57,25 +57,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\thirdparty\automapper\AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Db4objects.Db4o, Version=7.5.57.11498, Culture=neutral, PublicKeyToken=6199cd4f203aa8eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\lib\app\db40\Db4objects.Db4o.dll</HintPath>
-    </Reference>
-    <Reference Include="Esent.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b93b4ad6c4b80595, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\thirdparty\rhino.queues\Esent.Interop.dll</HintPath>
-    </Reference>
-    <Reference Include="FluentNHibernate, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8aa435e3cb308880, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\lib\app\nhibernate\FluentNHibernate.dll</HintPath>
-    </Reference>
     <Reference Include="protobuf-net, Version=1.0.0.282, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\spiking\spiking.rq\external\proto-buf.net\protobuf-net.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\proto-buf.net\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Queues, Version=1.2.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\spiking\spiking.rq\external\rhino.queues\Rhino.Queues.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\rhino.queues\Rhino.Queues.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -111,10 +99,6 @@
     <Compile Include="ServiceBus.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\client\service.infrastructure\service.infrastructure.csproj">
-      <Project>{81412692-F3EE-4FBF-A7C7-69454DD1BD46}</Project>
-      <Name>service.infrastructure</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\commons\infrastructure\infrastructure.csproj">
       <Project>{AA5EEED9-4531-45F7-AFCD-AD9717D2E405}</Project>
       <Name>infrastructure</Name>
product/commons/infrastructure.thirdparty/infrastructure.thirdparty.csproj
@@ -63,19 +63,15 @@
     </Reference>
     <Reference Include="Castle.DynamicProxy2, Version=2.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\castle\Castle.DynamicProxy2.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\castle\Castle.DynamicProxy2.dll</HintPath>
     </Reference>
     <Reference Include="Castle.MicroKernel, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\castle\Castle.MicroKernel.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\castle\Castle.MicroKernel.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Windsor, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\castle\Castle.Windsor.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\log4net\log4net.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\castle\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
product/commons/infrastructure.thirdparty.log4net/infrastructure.thirdparty.log4net.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\build\lib\app\log4net\log4net.dll</HintPath>
+      <HintPath>..\..\..\thirdparty\log4net\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">