Merge branch 'master' into postgre

Conflicts: packages/repositories.config product/roundhouse/infrastructure/filesystem/FileSystemAccess.cs
chucknorris · Nov 11, 2011 · 1abe28f · 1abe28f
2 parents 7a601cb + 87e54ed
commit 1abe28f
Show file tree

Hide file tree

Showing 229 changed files with 53,059 additions and 24,741 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+        <PackagesConfig>$(ProjectDir)packages.config</PackagesConfig>
+        <PackagesDir>$(SolutionDir)packages</PackagesDir>
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+        <PackageSources>""</PackageSources>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>
+
+        <!-- Commands -->
+        <RestoreCommand>"$(NuGetExePath)" install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
+        <BuildCommand>"$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true" />
+    </Target>
+</Project>
diff --git a/RoundhousE.snk b/RoundhousE.snk
diff --git a/Settings/UppercuT.config b/Settings/UppercuT.config
@@ -22,6 +22,7 @@
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.environment_files" value="environment.files" overwrite="false" />
   <property name="folder.file_server" value="file.server" overwrite="false" />
+  <property name="folder.program_files" value="${environment::get-folder-path('ProgramFiles')}" />
 
   <!-- FRAMEWORKS -->
   <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
@@ -49,7 +50,7 @@
   <property name="allow.partially_trusted_callers" value="false" overwrite="false" />
   <property name="sign.project_with_key" value="false" overwrite="false" />
   <!-- To use relative pathing your projects all need to be at the same level. -->
-  <property name="sign.key.use_relative_pathing" value="false" overwrite="false" />
+  <property name="sign.key.use_relative_pathing" value="true" overwrite="false" />
   <property name="sign.key.relative_path_from_projects" value="..${path.separator}..${path.separator}" overwrite="false" />
   <property name="obfuscate" value="false" overwrite="false" />
 
@@ -77,15 +78,19 @@
   <property name="app.ncover.tester" value="..${path.separator}..${path.separator}${folder.references}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" if="${test.framework=='mbunit2'}" />
   <property name="app.ncover.tester" value="${app.nunit.console}" overwrite="false" if="${test.framework=='nunit'}" />
   <property name="app.ncover.tester" value="${app.xunit.console}" overwrite="false" if="${test.framework=='xunit'}" />
-  <property name="app.ncover.tester" value="C:\Program Files (x86)\Gallio\bin\Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
-  <property name="app.ndepend" value="C:\Program Files\NDepend\NDepend.Console.exe" overwrite="false" />
-  <property name="app.moma" value="..\..\${folder.references}\MoMA\MoMA.exe" overwrite="false" />
-  <property name="app.nitriq" value="C:\Program Files (x86)\NimblePros\Nitriq Console + Pro\Nitriq.Console.exe" overwrite="false" />
-  <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat" overwrite="false" />
+  <property name="app.ncover.tester" value="${path::get-full-path(folder.program_files)}${path.separator}Gallio${path.separator}bin${path.separator}Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
+  <property name="app.ndepend" value="${path::get-full-path(folder.program_files)}${path.separator}NDepend${path.separator}NDepend.Console.exe" overwrite="false" />
+  <property name="app.metric" value="${path::get-full-path(folder.program_files)}${path.separator}Microsoft Visual Studio 10.0${path.separator}Team Tools${path.separator}Static Analysis Tools${path.separator}FxCop${path.separator}Metrics.exe" overwrite="false" />
+  <property name="app.moma" value="..${path.separator}..${path.separator}${folder.references}${path.separator}MoMA${path.separator}MoMA.exe" overwrite="false" />
+  <property name="app.nitriq" value="Nitriq.Console.exe" overwrite="false" />
+  <property name="app.xbuild" value="${path::get-full-path(folder.program_files)}${path.separator}Mono-2.8${path.separator}bin${path.separator}xbuild.bat" overwrite="false" />
   <property name="app.eazfuscator" value="..${path.separator}${folder.references}${path.separator}Eazfuscator.NET${path.separator}Eazfuscator.NET.exe" overwrite="false" />
   <property name="app.nuget" value="..${path.separator}${folder.references}${path.separator}NuGet${path.separator}NuGet.exe" overwrite="false" />
+  <property name="app.strongname" value="${path::get-full-path(folder.program_files)}${path.separator}Microsoft SDKs${path.separator}Windows${path.separator}v7.0A${path.separator}Bin${path.separator}sn.exe" overwrite="false" />
+
+  <property name="app.ruby" value="C:${path.separator}Ruby${path.separator}bin${path.separator}ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%${path.separator}System32${path.separator}WindowsPowerShell${path.separator}v1.0${path.separator}powershell.exe" overwrite="false" />  
 
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
   <property name="run.ilmerge" value="true" overwrite="false" />
 
 </project>
diff --git a/build.bat b/build.bat
@@ -8,11 +8,12 @@ if '%1' == '-?' goto usage
 if '%1' == '?' goto usage
 if '%1' == '/help' goto usage
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
 
-%NANT% /f:.\build\default.build -D:build.config.settings=%build.config.settings% %*
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\default.build -D:build.config.settings=%build.config.settings% %*
 
 if %ERRORLEVEL% NEQ 0 goto errors
 

diff --git a/build.custom/bdddoc.build b/build.custom/bdddoc.build
@@ -20,13 +20,13 @@
   <target name="go" depends="cleanup, run_bdddoc" description="Tests" />
 
   <target name="cleanup">
-    <echo message="Removing and adding ${dirs.bdddoc_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.bdddoc_results}."/>
     <delete dir="${dirs.bdddoc_results}" />
     <mkdir dir="${dirs.bdddoc_results}" />
   </target>
 
   <target name="run_bdddoc" depends="cleanup" description="Running BDDDoc">
-    <echo message="Running BDDDoc against ${dirs.build}\${folder.app.drop}\${test_assembly} ${test_attribute} ${files.bdddoc_results} ${dirs.test_results}\${file.test_results}.xml."/>
+    <echo level="Warning" message="Running BDDDoc against ${dirs.build}\${folder.app.drop}\${test_assembly} ${test_attribute} ${files.bdddoc_results} ${dirs.test_results}\${file.test_results}.xml."/>
      <exec program="${app.bdddoc}" > 
         <arg file="${dirs.build}\${folder.app.drop}\${test_assembly}"/> 
         <arg value="${test_attribute}"/> 
@@ -36,7 +36,7 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results at ${path::get-full-path(files.bdddoc_results)}."/>
+    <echo level="Warning" message="Opening results at ${path::get-full-path(files.bdddoc_results)}."/>
     <exec
       spawn="true"
       program="${environment::get-folder-path('ProgramFiles')}\Internet Explorer\iexplore.exe"

diff --git a/build.custom/compile.post.step b/build.custom/compile.post.step
@@ -25,7 +25,7 @@
   <target name="go" depends="copy_database_dlls_to_pub" />
 
   <target name="copy_database_dlls_to_pub">
-    <echo message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse'."/>
+    <echo level="Warning" message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse'."/>
     <copy todir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}">
         <include name="roundhouse.databases.*" />
@@ -34,7 +34,7 @@
         <include name="Mono.Security.dll" />
       </fileset>
     </copy>
-    <echo message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.console'."/>
+    <echo level="Warning" message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.console'."/>
     <copy todir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.console">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}">
         <include name="roundhouse.databases.*" />
@@ -43,7 +43,7 @@
 		<include name="Mono.Security.dll" />
       </fileset>
     </copy>
-    <echo message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.tasks'."/>
+    <echo level="Warning" message="Copying database dlls to '${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.tasks'."/>
     <copy todir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications${path.separator}roundhouse.tasks">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}">
         <include name="roundhouse.databases.*" />

diff --git a/build.custom/gemsPrepare.post.step b/build.custom/gemsPrepare.post.step
@@ -62,7 +62,7 @@
   </target>
 
   <target name="copy_notices_to_lib_folder">
-    <echo message="Packaging readme file to ${dirs.drop.gems}\lib."/>
+    <echo level="Warning" message="Packaging readme file to ${dirs.drop.gems}\lib."/>
     <copy file="${dirs.current}\..\README.markdown" tofile="${dirs.drop.gems}\docs\README" failonerror="false" />
 
     <echo message="Packaging other legal stuff to ${dirs.drop.gems}\lib."/>

diff --git a/build.custom/ilmerge.internalize.ignore.txt b/build.custom/ilmerge.internalize.ignore.txt
@@ -1,5 +1,4 @@
 roundhouse.databases.Database
 roundhouse.*
-FluentNHibernate.*
-NHibernate.*
+NHibernate.Cfg.MappingSchema.*
 StructureMap.InstanceBuilder
diff --git a/build.custom/ilmerge.post.build b/build.custom/ilmerge.post.build
@@ -15,18 +15,27 @@
   <property name="folder.deployment" value="deployment" overwrite="false" />
   <property name="dirs.deployment" value="${dirs.drop}\${folder.deployment}" />
   <property name="dirs.app.drop" value="${dirs.drop}\${folder.app.drop}" overwrite="false" />
+  <property name="file.key" value="${dirs.current}\${path.to.toplevel}\RoundhousE.snk" overwrite="false" />
 
   <target name="go" depends="copy_roundhouse_files_to_deploy_console, merge_the_dll, merge_the_msbuild" />
 
+  <target name="sign_merged_exe">
+    <al output="${dirs.app.drop}\console\rh.exe" target="exe">
+      <sources>
+        <include name="${dirs.app.drop}\console\rh.exe" />
+      </sources>
+    </al>
+  </target>
+
   <target name="copy_roundhouse_files_to_deploy_console">
-  <echo message="Removing original roundhouse assemblies from ${dirs.deployment}\console."/>
+  <echo level="Warning" message="Removing original roundhouse assemblies from ${dirs.deployment}\console."/>
     <delete>
       <fileset basedir="${dirs.drop}\sample\${folder.deployment}\console" >
         <include name="*.*" />
       </fileset>
     </delete>
 
-    <echo message="Copying roundhouse assemblies from '${dirs.app.drop}\console' to '${dirs.deployment}\console'."/>
+    <echo level="Warning" message="Copying roundhouse assemblies from '${dirs.app.drop}\console' to '${dirs.deployment}\console'."/>
     <copy todir="${dirs.drop}\sample\${folder.deployment}\console">
       <fileset basedir="${dirs.app.drop}\console">
         <include name="*.*" />

diff --git a/build.custom/ilmerge.pre.build b/build.custom/ilmerge.pre.build
@@ -21,8 +21,8 @@
 
   <target name="go" depends="set_environment_variables, clean_out_sql_dlls" />
 
-   <target name="set_environment_variables">
-     <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}\console" />
+  <target name="set_environment_variables">
+    <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}\console" />
     <property name="file.merge.name" value="rh.exe" />
     <property name="merge.target.type" value="exe" />
     <setenv name="uc.dirs.merge.from" value="${dirs.drop}\${folder.app.drop}\console"/>
@@ -31,7 +31,7 @@
   </target>
 
   <target name="clean_out_sql_dlls">
-    <echo message="Before merging - removing the Microsoft.SqlServer dlls from ${dirs.merge.from}."/>
+    <echo level="Warning" message="Before merging - removing the Microsoft.SqlServer dlls from ${dirs.merge.from}."/>
     <delete>
       <fileset basedir="${dirs.merge.from}" >
         <exclude name="${file.merge.name}" />

diff --git a/build.custom/ilmergeDLL.build b/build.custom/ilmergeDLL.build
@@ -22,6 +22,7 @@
   <!-- overwrite this property -->
   <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}\lib" />
   <property name="dirs.merge.to" value="${dirs.drop}\merge" overwrite="false" />
+  <property name="file.key" value="${dirs.current}\${path.to.toplevel}\RoundhousE.snk" overwrite="false" />
 
   <property name="file.internalize.ignore" value="ilmerge.internalize.ignore.txt" />
   <property name="path.file.internalize.ignore" value="${dirs.build_scripts_custom}\${file.internalize.ignore}" />
@@ -40,12 +41,12 @@
   <target name="prepare">
     <mkdir dir="${dirs.merge.log}" />
     <mkdir dir="${dirs.merge.from}" />
-
     <mkdir dir="${dirs.merge.to}" />
+    <property name="args.ilmerge" value="${args.ilmerge} /keyfile:${file.key}" if="${file::exists(file.key)}"/>
   </target>
 
   <target name="get_regular_dlls">
-    <echo message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
+    <echo level="Warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -72,8 +73,8 @@
   </target>
 
   <target name="run_ilmerge">
-    <echo message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}\${file.merge.name}. This will fail if all dependencies are not resolved."/>
-    <echo message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
+    <echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}\${file.merge.name}. This will fail if all dependencies are not resolved."/>
+    <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"
           workingdir="${dirs.merge.from}"
           commandline="${args.ilmerge}" />
@@ -88,7 +89,7 @@
   </target>
 
   <target name="remove_unneeded_assemblies">
-    <echo message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
+    <echo level="Warning" message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
     <delete>
       <fileset basedir="${dirs.merge.from}" >
         <exclude name="log4net.dll" />

diff --git a/build.custom/ilmergeMSBuild.build b/build.custom/ilmergeMSBuild.build
@@ -22,6 +22,7 @@
   <!-- overwrite this property -->
   <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}\msbuild" />
   <property name="dirs.merge.to" value="${dirs.drop}\merge" overwrite="false" />
+  <property name="file.key" value="${dirs.current}\${path.to.toplevel}\RoundhousE.snk" overwrite="false" />
 
   <property name="file.internalize.ignore" value="ilmerge.internalize.ignore.txt" />
   <property name="path.file.internalize.ignore" value="${dirs.build_scripts_custom}\${file.internalize.ignore}" />
@@ -40,12 +41,12 @@
   <target name="prepare">
     <mkdir dir="${dirs.merge.log}" />
     <mkdir dir="${dirs.merge.from}" />
-
     <mkdir dir="${dirs.merge.to}" />
+    <property name="args.ilmerge" value="${args.ilmerge} /keyfile:${file.key}" if="${file::exists(file.key)}"/>
   </target>
 
   <target name="get_regular_dlls">
-    <echo message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
+    <echo level="Warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -68,8 +69,8 @@
   </target>
 
   <target name="run_ilmerge">
-    <echo message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}\${file.merge.name}. This will fail if all dependencies are not resolved."/>
-    <echo message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
+    <echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}\${file.merge.name}. This will fail if all dependencies are not resolved."/>
+    <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"
           workingdir="${dirs.merge.from}"
           commandline="${args.ilmerge}" />
@@ -84,7 +85,7 @@
   </target>
 
   <target name="remove_unneeded_assemblies">
-    <echo message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
+    <echo level="Warning" message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
     <delete>
       <fileset basedir="${dirs.merge.from}" >
         <exclude name="log4net.dll" />

diff --git a/build.custom/nugetBuild.post.step b/build.custom/nugetBuild.post.step
@@ -48,7 +48,7 @@
           description="" />
 
   <target name="flatten_files">
-    <echo message="Bringing nupkg files up to '${dirs.drop.nuget}' directory" />
+    <echo level="Warning" message="Bringing nupkg files up to '${dirs.drop.nuget}' directory" />
     <copy todir="${dirs.drop.nuget}" flatten="true">
       <fileset basedir="${dirs.drop.nuget}">
         <include name="**/*.nupkg" />