Commit 3d37cc2

@@ -1,26 +1,27 @@
-<log4net>
-	<appender name='RollingFileAppender' type='log4net.Appender.RollingFileAppender'>
-		<file value='logs\log.txt' />
-		<appendToFile value='true' />
-		<rollingStyle value='Size' />
-		<maxSizeRollBackups value='10' />
-		<maximumFileSize value='100000KB' />
-		<staticLogFileName value='true' />
-		<layout type='log4net.Layout.PatternLayout'>
-			<conversionPattern value="%d %-5p %c - [%t] %m%n" />
-		</layout>
-	</appender>
-	<appender name="Console" type="log4net.Appender.ConsoleAppender">
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%d %-5p %c - [%t] %m%n" />
-		</layout>
-	</appender>
-	<root>
-		<level value='@log.level@' />
-		<appender-ref ref='RollingFileAppender' />			
-	</root>
-	<logger name="NHibernate" additivity="false">
-		<level value="ERROR" />
-		<appender-ref ref="RollingFileAppender" />
-	</logger>
+<log4net>
+	<appender name='RollingFileAppender' type='log4net.Appender.RollingFileAppender'>
+		<file value='logs\log.txt' />
+		<appendToFile value='true' />
+		<rollingStyle value='Size' />
+		<maxSizeRollBackups value='10' />
+		<maximumFileSize value='100000KB' />
+		<staticLogFileName value='true' />
+		<layout type='log4net.Layout.PatternLayout'>
+			<conversionPattern value="%d %-5p %c - [%t] %m%n" />
+		</layout>
+	</appender>
+	<appender name="Console" type="log4net.Appender.ConsoleAppender">
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%d %-5p %c - [%t] %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value='@log.level@' />
+		<appender-ref ref='RollingFileAppender' />			
+		<appender-ref ref='Console' />			
+	</root>
+	<logger name="NHibernate" additivity="false">
+		<level value="ERROR" />
+		<appender-ref ref="RollingFileAppender" />
+	</logger>
 </log4net>
\ No newline at end of file

@@ -28,9 +28,10 @@
 	</target>
 	
 	<target name="app.compile" depends="init">
-    <exec program="C:\WINDOWS\Microsoft.NET\Framework\v3.5\MSBuild.exe"
+	  <property name="msbuild.exe" value="${framework::get-framework-directory(framework::get-target-framework())}\msbuild.exe" />
+	  <exec program="${msbuild.exe}"
           workingdir="${base.dir}"
-          commandline="solution.sln /p:Configuration=Release;OutDir=${build.compile.dir}\ /t:Rebuild /nologo /m /v:q"
+          commandline="studio.sln /p:Configuration=Release;OutDir=${build.compile.dir}\ /t:Rebuild /nologo /m /v:q"
           />
 	</target>
 

@@ -6,14 +6,13 @@
   <target name="create.configs">
 		<property name="target" value="${log4net.config}" />
 		<call target="expand.template.file" />
-		<copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\client\boot\log4net.config.xml" />
-		<copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\client\presentation.windows\log4net.config.xml" />
-		<copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\presentation.windows.server\log4net.config.xml" />
+		<copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\client\client.ui\log4net.config.xml" />
+		<copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\client\server\log4net.config.xml" />
     
 		<property name="target" value="${assembly.config}" />
 		<call target="expand.template.file" />
-		<copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\boot\Properties\AssemblyInfo.cs" />
-		<copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\presentation.windows\Properties\AssemblyInfo.cs" />
+		<copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\client.ui\Properties\AssemblyInfo.cs" />
+		<copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\server\Properties\AssemblyInfo.cs" />
   </target>
 
 	<target name="deploy" depends="create.configs, app.compile" />

@@ -48,7 +48,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="client\presenters\AddFamilyMemberPresenterSpecs.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\client\client.ui\client.csproj">
@@ -56,6 +55,9 @@
       <Name>client %28client\client%29</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

@@ -79,5 +79,6 @@ Global
 		{6BDCB0C1-51E1-435A-93D8-CA02BF8E409C} = {099D479D-7BFC-428E-A897-9189C294C9C8}
 		{DD8FD29E-7424-415C-9BA3-7D9F6ECBA161} = {099D479D-7BFC-428E-A897-9189C294C9C8}
 		{04B70A19-AE24-490A-A1F3-868C56E21E29} = {842107F2-46AF-4FF8-BF8B-0907B3C4B6D6}
+		{B8505B10-85C7-45F4-B039-D364DD556D7D} = {842107F2-46AF-4FF8-BF8B-0907B3C4B6D6}
 	EndGlobalSection
 EndGlobal