Commit 241f253

@@ -1,15 +1,15 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly : AssemblyTitle("@assembly.title@")]
-[assembly : AssemblyDescription("@assembly.description@")]
-[assembly : AssemblyConfiguration("")]
-[assembly : AssemblyCompany("@assembly.company@")]
-[assembly : AssemblyProduct("@assembly.title@")]
-[assembly : AssemblyCopyright("Copyright © @assembly.company@ 2008")]
-[assembly : AssemblyTrademark("")]
-[assembly : AssemblyCulture("")]
-[assembly : ComVisible(false)]
-[assembly : Guid("89f1a34a-1375-4eeb-a250-86774c9448b0")]
-[assembly : AssemblyVersion("@assembly.version@")]
-[assembly : AssemblyFileVersion("@assembly.version@")]
\ No newline at end of file
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly : AssemblyTitle("${assembly.title}")]
+[assembly : AssemblyDescription("${assembly.description}")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("${assembly.company}")]
+[assembly : AssemblyProduct("${assembly.title}")]
+[assembly : AssemblyCopyright("Copyright © ${assembly.company} 2008")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
+[assembly : ComVisible(false)]
+[assembly : Guid("89f1a34a-1375-4eeb-a250-86774c9448b0")]
+[assembly : AssemblyVersion("${assembly.version}")]
+[assembly : AssemblyFileVersion("${assembly.version}")]
\ No newline at end of file

@@ -1,30 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <AppFileFullPath>D:\development\mokhan\gorilla.commons\build\installation\gorilla.commons.dll.application</AppFileFullPath>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <BootstrapperFile Include="Microsoft.Net.Framework.3.5">
-      <ProductName>.NET Framework 3.5</ProductName>
-    </BootstrapperFile>
-    <BootstrapperFile Include="Microsoft.Windows.Installer.3.1">
-      <ProductName>Windows Installer 3.1</ProductName>
-    </BootstrapperFile>
-  </ItemGroup>
-  
-  <Target Name="Bootstrapper">
-    <GenerateBootstrapper 
-		ApplicationFile="gorilla.commons.infrastructure.thirdparty.log4net.dll.application" 
-		ApplicationName="My Money by mOKhan.ca" 
-		ApplicationUrl="http://mokhan.ca/GorillaCommons/"
-		BootstrapperItems="@(BootstrapperFile)" 
-		ComponentsLocation="HomeSite" 
-		Culture="en"
-		FallbackCulture="en-US" 
-		CopyComponents="True" 
-		Validate="True" 
-		OutputPath="D:\development\mokhan\gorilla.commons\build\installation" />
-  </Target>
-  
-</Project>
\ No newline at end of file

@@ -1,30 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <AppFileFullPath>@deployment.manifest@</AppFileFullPath>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <BootstrapperFile Include="Microsoft.Net.Framework.3.5">
-      <ProductName>.NET Framework 3.5</ProductName>
-    </BootstrapperFile>
-    <BootstrapperFile Include="Microsoft.Windows.Installer.3.1">
-      <ProductName>Windows Installer 3.1</ProductName>
-    </BootstrapperFile>
-  </ItemGroup>
-  
-  <Target Name="Bootstrapper">
-    <GenerateBootstrapper 
-		ApplicationFile="@deployment.manifest.file.name@" 
-		ApplicationName="My Money by mOKhan.ca" 
-		ApplicationUrl="@deployment.url@"
-		BootstrapperItems="@(BootstrapperFile)" 
-		ComponentsLocation="HomeSite" 
-		Culture="en"
-		FallbackCulture="en-US" 
-		CopyComponents="True" 
-		Validate="True" 
-		OutputPath="@installation.dir@" />
-  </Target>
-  
-</Project>
\ No newline at end of file

@@ -67,7 +67,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="config\AssemblyInfo.cs.template" />
-    <None Include="config\bootStrap.xml.template" />
     <None Include="local.properties.xml.template" />
     <None Include="project.build" />
     <None Include="project.test.build" />

@@ -1,5 +1,5 @@
 <project name="local.properties">
-	<property name="debug" value="false" />
+	<property name="project.config" value="DEBUG" />
 	<property name="assembly.title" value="Gorilla.Commons" />
 	<property name="assembly.description" value="common libraries" />
 	<property name="assembly.company" value="http://mokhan.ca" />

@@ -8,12 +8,8 @@
 	
 	<property name="build.dir" value="${base.dir}\build" />
 	<property name="build.tools.dir" value="${build.dir}\tools" />
-	<property name="build.lib.dir" value="${build.dir}\lib" />
-	<property name="build.resources.dir" value="${build.dir}\resources" />
-	<property name="build.icons.dir" value="${build.resources.dir}\icons" />
 	<property name="build.config.dir" value="${build.dir}\config" />
 	<property name="build.compile.dir" value="${build.dir}\compile" />
-	<property name="build.artifacts.dir" value="${build.dir}\artifacts" />
 	
 	<property name="app.output" value="${project.name}.dll" />
 	
@@ -28,39 +24,16 @@
 		<mkdir dir="${build.compile.dir}" />
 	</target>
 	
-	<target name="app.compile" depends="init">
-		<csc output="${build.compile.dir}\${app.output}" debug="${debug}" target="library" win32icon="${build.icons.dir}\mokhan.ico" keyfile="${build.config.dir}\mokhan.snk">
-			<sources>
-				<include name="${product.dir}\**\*.cs" />
-				<include name="${build.config.dir}\**\*.cs" />
-				<exclude name="${product.dir}\**\AssemblyInfo.cs" />
-				<exclude name="${product.dir}\**\*Specs.cs" />
-			</sources>			
-			<references>
-				<include name="${build.lib.dir}\**\*.dll" />
-				<include name="${build.artifacts.dir}\**\*.dll" />
-			</references>
-			<resources dynamicprefix="true">
-				<include name="${product.dir}\**\*.resx" />
-			</resources>
-			<resources>
-				<include name="${build.lib.dir}\app\*.licenses" />
-			</resources>
-			<arg value="/nowin32manifest" />
-		</csc>
+	<target name="compile" depends="init">
+    <property name="msbuild.exe" value="${framework::get-framework-directory('net-4.0')}\msbuild.exe" />
+    <exec program="${msbuild.exe}" commandline='${base.dir}\solution.sln /t:Clean;Rebuild /p:Configuration=${project.config} /p:OutDir=${build.compile.dir}\ /p:Platform="Any CPU" /v:q' />
 	</target>
 
 	<target name="expand.template.file">
 		<copy file="${target}.template" tofile="${target}" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="log.level" value="${log.level}" />
-					<token key="assembly.title" value="${assembly.title}" />
-					<token key="assembly.description" value="${assembly.description}" />
-					<token key="assembly.company" value="${assembly.company}" />
-					<token key="assembly.version" value="${assembly.version}" />
-				</replacetokens>
-			</filterchain>
+      <filterchain>
+        <expandproperties />
+      </filterchain>
 		</copy>
 	</target>