pulled in latest master changes

Author: chester89

.gitignore

@@ -1,4 +1,3 @@
-
 **/*.suo
 **/*.user
 **/*.sln*
@@ -11,19 +10,19 @@ build
 
 *.DotSettings.user
 *.csproj.user
+src/packages
 
 *.resharper.user
-
 *.resharper
 
 *.suo
-
 *.cache
-
 *~
-
-*.swp
-TestResult.xml
+*ncrunch*
 *.ncrunchsolution
 *.ncrunchproject
-packages/
+*.swp
+TestResult.xml
+
+TestResult.xml
+build/

Build.bat

@@ -1 +1 @@
-rake
+rake

README.md

@@ -1,4 +1,4 @@
-<img src="http://fluentnhibernate.org/images/logo.png" alt="Fluent NHibernate - Fluent mapping for your model" />
+<img src="https://github.com/jagregory/fluent-nhibernate/blob/master/docs/logo.png" alt="Fluent NHibernate - Fluent mapping for your model" />
 =============================================
 
 Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate. *Get your fluent on.*
@@ -26,4 +26,4 @@ Fluent NHibernate wouldn't be possible without the time and effort of its contri
 
 Thanks goes to [Jeremy Miller](http://codebetter.com/blogs/jeremy.miller) for the original idea and implementation.
 
-Fluent NHibernate is &copy; 2008-2011 [James Gregory](http://jagregory.com) and contributors under the [BSD license](fluent-nhibernate/blob/master/LICENSE.txt)
+Fluent NHibernate is &copy; 2008-2013 [James Gregory](http://jagregory.com) and contributors under the [BSD license](fluent-nhibernate/blob/master/LICENSE.txt)

RakeFile

@@ -4,6 +4,28 @@ require './tools/albacore/nuspec_patch'
 
 NH_VERSION = '3.x'
 
+module Platform
+
+  def self.is_nix
+    !RUBY_PLATFORM.match("linux|darwin").nil?
+  end
+
+  def self.runtime(cmd)
+    command = cmd
+    if self.is_nix
+      runtime = (CLR_TOOLS_VERSION || "v4.0.30319")
+      command = "mono --runtime=#{runtime} #{cmd}"
+    end
+    command
+  end
+
+  def self.switch(arg)
+    sw = self.is_nix ? " -" : " /"
+    sw + arg
+  end
+
+end 
+
 def get_version
   ENV['BUILD_NUMBER'] || '1.3.0.0'
 end
@@ -12,12 +34,20 @@ task :default => 'build:all'
 
 namespace :ci do
   task :run_ci_build => [
+	'ripple',
     'build:all',
     'docs:build',
     'package:all',
   ]
 end
 
+namespace :ripple do
+	desc 'using ripple. yay!'
+    ripple = Platform.runtime("buildsupport/ripple.exe") 
+	args = "restore"
+	sh "#{ripple} #{args}"
+ end
+
 namespace :source do
   desc 'Update assembly info with latest version number'
   assemblyinfo :update_version do |asm|
@@ -26,7 +56,7 @@ namespace :source do
     asm.version = get_version
     asm.company_name = 'http://fluentnhibernate.org'
     asm.product_name = 'FluentNHibernate'
-    asm.copyright = 'Copyright 2008-2011 James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved.'
+    asm.copyright = 'Copyright 2008-2013 James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved.'
     asm.namespaces = ['System.Security']
     asm.custom_attributes :AllowPartiallyTrustedCallers => nil
 
@@ -35,16 +65,6 @@ namespace :source do
 
   task :nhibernate_version, :nhibernate_version do |t,args|
     args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
-    
-    raise "Unknown NHibernate version #{args.nhibernate_version} (check your tools/NHibernate folder)" unless File.directory? "tools/NHibernate/#{args.nhibernate_version}"
-    
-    # clear out existing selected nh version
-    files_to_delete = Dir["tools/NHibernate/*.*"].reject {|f| File.directory? f }
-    files_to_delete.each {|f| File.delete f }
-    
-    # copy specific nh version files to the main directory
-    files_to_copy = Dir["tools/NHibernate/#{args.nhibernate_version}/*.*"]
-    files_to_copy.each {|f| FileUtils.copy f, "tools/NHibernate/" }
   end
 
   desc 'Compile the source'
@@ -71,13 +91,13 @@ namespace :specs do
 
   desc 'Run MSpec specs'
   mspec :mspec do |mspec|
-    mspec.command = 'src/packages/Machine.Specifications.0.5.6.0/tools/mspec.exe'
+    mspec.command = 'src/packages/Machine.Specifications.0.5.15/tools/mspec.exe'
     mspec.assemblies 'src/FluentNHibernate.Specs/bin/Release/FluentNHibernate.Specs.dll'
   end
 
   desc 'Run NUnit tests'
   nunit :nunit do |nunit|
-    nunit.command = 'tools/nunit/nunit-console-x86.exe'
+    nunit.command = 'src/packages/NUnit.2.5.7.10213/Tools/nunit-console-x86.exe'
     nunit.assemblies 'src/FluentNHibernate.Testing/bin/Release/FluentNHibernate.Testing.dll'
   end
 end

buildsupport/BuildUtils.rb

@@ -0,0 +1,121 @@
+require 'erb'
+
+class NUnitRunner
+	include FileTest
+
+	def initialize(paths)
+		@sourceDir = paths.fetch(:source, 'source')
+		@resultsDir = paths.fetch(:results, 'results')
+		@compilePlatform = paths.fetch(:platform, '')
+		@compileTarget = paths.fetch(:compilemode, 'debug')
+	
+		@nunitExe = Nuget.tool("NUnit", "nunit-console#{(@compilePlatform.empty? ? '' : "-#{@compilePlatform}")}.exe") + Platform.switch("nothread")
+	end
+	
+	def executeTests(assemblies)
+		Dir.mkdir @resultsDir unless exists?(@resultsDir)
+		
+		assemblies.each do |assem|
+			file = File.expand_path("#{@sourceDir}/#{assem}/bin/#{@compileTarget}/#{assem}.dll")
+			sh Platform.runtime("#{@nunitExe} -xml=#{@resultsDir}/#{assem}-TestResults.xml \"#{file}\"")
+		end
+	end
+end
+
+class MSBuildRunner
+	def self.compile(attributes)
+		compileTarget = attributes.fetch(:compilemode, 'debug')
+	    solutionFile = attributes[:solutionfile]
+	    
+	    attributes[:projFile] = solutionFile
+	    attributes[:properties] ||= []
+	    attributes[:properties] << "Configuration=#{compileTarget}"
+	    attributes[:extraSwitches] = ["v:m", "t:rebuild"]
+		  attributes[:extraSwitches] << "maxcpucount:2" unless Platform.is_nix
+
+      self.runProjFile(attributes);
+	end
+	
+	def self.runProjFile(attributes)
+		version = attributes.fetch(:clrversion, 'v4.0.30319')
+		compileTarget = attributes.fetch(:compilemode, 'debug')
+	    projFile = attributes[:projFile]
+		
+    if Platform.is_nix
+      msbuildFile = `which xbuild`.chop
+      attributes[:properties] << "TargetFrameworkProfile="""""
+    else
+		  frameworkDir = File.join(ENV['windir'].dup, 'Microsoft.NET', 'Framework', version)
+		  msbuildFile = File.join(frameworkDir, 'msbuild.exe')
+   end
+
+    properties = attributes.fetch(:properties, [])
+		
+		switchesValue = ""
+		
+		properties.each do |prop|
+			switchesValue += " /property:#{prop}"
+		end	
+		
+		extraSwitches = attributes.fetch(:extraSwitches, [])	
+		
+		extraSwitches.each do |switch|
+			switchesValue += " /#{switch}"
+		end	
+		
+		targets = attributes.fetch(:targets, [])
+		targetsValue = ""
+		targets.each do |target|
+			targetsValue += " /t:#{target}"
+		end
+		
+		sh "#{msbuildFile} #{projFile} #{targetsValue} #{switchesValue}"
+	end
+end
+
+class AspNetCompilerRunner
+	def self.compile(attributes)
+		if Platform.is_nix
+      puts "Skipping AspNet compilation. Not supported by Mono."
+      return
+    end
+		webPhysDir = attributes.fetch(:webPhysDir, '')
+		webVirDir = attributes.fetch(:webVirDir, 'This_Value_Is_Not_Used')
+		
+		frameworkDir = File.join(ENV['windir'].dup, 'Microsoft.NET', 'Framework', 'v4.0.30319')
+		aspNetCompiler = File.join(frameworkDir, 'aspnet_compiler.exe')
+
+		sh "#{aspNetCompiler} -nologo -errorstack -c -p #{webPhysDir} -v #{webVirDir}"
+	end
+end
+
+class AsmInfoBuilder
+	attr_reader :buildnumber
+
+	def initialize(baseVersion, properties)
+		@properties = properties;
+		
+		@buildnumber = baseVersion + (ENV["CCNetLabel"].nil? ? '0' : ENV["CCNetLabel"].to_s)
+		@properties['Version'] = @properties['InformationalVersion'] = buildnumber;
+	end
+
+
+	
+	def write(file)
+		template = %q{
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+<% @properties.each {|k, v| %>
+[assembly: Assembly<%=k%>Attribute("<%=v%>")]
+<% } %>
+		}.gsub(/^    /, '')
+		  
+	  erb = ERB.new(template, 0, "%<>")
+	  
+	  File.open(file, 'w') do |file|
+		  file.puts erb.result(binding) 
+	  end
+	end
+end

buildsupport/FubuCore.dll

@@ -0,0 +1,38 @@
+load "#{File.dirname(__FILE__)}/platform.rb"
+class ILRepack
+
+  def initialize(attributes)
+
+    out = attributes.fetch(:out, '')
+    lib = attributes.fetch(:lib, nil)
+    target = attributes.fetch(:target, 'library')
+    targetplatform = attributes.fetch(:targetplatform, "v4")
+    internalize = attributes.fetch(:internalize, true)
+    debugsymbols = attributes.fetch(:debugsymbols, false)
+    union = attributes.fetch(:union, false)
+
+    params = []
+    params << "/out:#{out}"
+    params << "/lib:#{lib}" unless lib.nil?
+    params << "/target:#{target}" unless target.nil?
+    params << "/targetplatform:#{targetplatform}" unless targetplatform.nil?
+    params << "/internalize" if internalize
+    params << "/ndebug" unless debugsymbols
+    params << "/union" if union
+
+    merge_exe = "#{File.dirname(__FILE__)}/ILMerge.exe"
+    @cmd = "#{merge_exe} #{params.join(' ')}"
+  end
+
+  def merge(params)
+
+    if Platform.is_nix
+      puts "Merging is *currently* not supported on Mono. Skipping merge..."
+      return
+    end
+
+    src = params.fetch(:lib, '')
+    refs = params.fetch(:refs, []).map {|f| File.join(src, f)}
+    sh Platform.runtime("#{@cmd} #{refs.join(' ')}")
+  end
+end