Merge pull request #281 from chester89/migrateTo40

Migration to .NET 4.0 and NHibernate v4

Author: chester89

.gitignore

@@ -1,17 +1,10 @@
 **/*.suo
 **/*.user
 **/*.sln*
-bin
-obj
 _ReSharper*
-dist
-output
-build
 
 *.DotSettings.user
 *.csproj.user
-src/packages
-
 *.resharper.user
 *.resharper
 
@@ -23,7 +16,14 @@ src/packages
 *.ncrunchproject
 *.swp
 TestResult.xml
+Gemfile.lock
 
-TestResult.xml
-build/
-*.nupkg
+src/packages
+bin
+obj
+dist
+output
+build
+*.nupkg
+logs/
+src/CommonAssemblyInfo.cs

.svn-authors

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'albacore'
+source 'https://rubygems.org' 
+gem 'rake', '~>10.3.2'
+gem 'albacore', '1.0.0.rc2'

Gemfile

@@ -1,8 +1,12 @@
 require 'fileutils'
+require 'rexml/document'
+require 'json'
 require 'albacore'
-require './tools/albacore/nuspec_patch'
 
-NH_VERSION = '3.x'
+PROPS = 'src/CommonAssemblyInfo.cs'
+SLN = 'src/FluentNHibernate.sln'
+CONFIG = 'config.json'
+NUSPEC = 'src/FluentNHibernate.nuspec'
 
 module Platform
 
@@ -24,62 +28,76 @@ module Platform
     sw + arg
   end
 
+  def self.config
+    JSON.parse(File.read(CONFIG))
+  end
+
 end 
 
+NH_VERSION = Platform.config['build']['nh_precompiler_switch']
+
+# Albacore.configure do |config|
+  # config.log_level = :verbose
+# end
+
 def get_version
-  ENV['BUILD_NUMBER'] || '1.3.0.0'
+  ENV['BUILD_NUMBER'] || Platform.config['default_version_number']
 end
 
-task :default => 'build:all'
+task :default => ['ripple:restore', 'source:update_version', 'build:all']
 
 namespace :ci do
-  task :run_ci_build => [
-    'build:all',
-    'docs:build',
-    'package:all',
-  ]
+  task :run_ci_build => ['ripple:restore', 'build:all', 'docs:build', 'package:all' ]
 end
 
 namespace :ripple do
-  ripple = Platform.runtime("buildsupport/ripple.exe") 
-  args = "restore"
-  sh "#{ripple} #{args}"
+	desc 'Restores NuGet package binaries'
+	task :restore do |cmd|
+	  ripple = Platform.runtime("buildsupport/ripple.exe") 
+	  args = "restore"
+	  sh "#{ripple} #{args}"
+	end
 end
 
 namespace :source do
   desc 'Update assembly info with latest version number'
-  assemblyinfo :update_version do |asm|
-    asm.output_file = 'src/CommonAssemblyInfo.cs'
+  assemblyinfo :update_version do |info|
+    info.output_file = PROPS
+    commit_hash = `git log -1 --format="%H%"`
 
-    asm.version = get_version
-    asm.company_name = 'http://fluentnhibernate.org'
-    asm.product_name = 'FluentNHibernate'
-    asm.copyright = "Copyright 2008-#{Time.new.year} James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved."
-    asm.namespaces = ['System.Security']
-    asm.custom_attributes :AllowPartiallyTrustedCallers => nil
+    info.title = Platform.config['assembly_info']['title']
+    info.version = get_version
+    info.informational_version = Platform.config['assembly_info']['version']
+    info.company_name = 'http://fluentnhibernate.org'
+    info.product_name = 'FluentNHibernate'
+    info.description = commit_hash[0..(commit_hash.length - 3)]
+    info.copyright = "Copyright 2008-#{Time.new.year} James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved."
+    info.namespaces = ['System.Security']
 
-    puts "The build number is #{asm.version}"
+    puts "The new version is #{info.version}"
   end
 
   task :nhibernate_version, :nhibernate_version do |t,args|
     args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
   end
 
   desc 'Compile the source'
-  msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msb,args|
+  msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msbuild, args|
     args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
 
     nh_version_precompiler_switch = 'NH' +  args.nhibernate_version.gsub('.', '')
 
-    puts nh_version_precompiler_switch
+    puts 'Precompiler switch: ' + nh_version_precompiler_switch
 
-    msb.properties = {
+    msbuild.properties = {
       configuration: :Release,
       DefineConstants: nh_version_precompiler_switch,
-      WarningLevel: 0,
+      WarningLevel: 0
     }
-    msb.targets [:Clean, :Build]
-    msb.solution = 'src/FluentNHibernate.sln'
+    msbuild.targets [:Clean, :Build]
+    msbuild.solution = SLN
+    msbuild.verbosity = :minimal
+    msbuild.parameters = ["/p:TargetFrameworkVersion=#{Platform.config['build']['msbuild_runtime']}"]
   end
 end
 
@@ -89,14 +107,15 @@ namespace :specs do
 
   desc 'Run MSpec specs'
   mspec :mspec do |mspec|
-    mspec.command = 'src/packages/Machine.Specifications.0.5.15/tools/mspec.exe'
-    mspec.assemblies 'src/FluentNHibernate.Specs/bin/Release/FluentNHibernate.Specs.dll'
+    mspec.command = "src/packages/Machine.Specifications.0.5.15/tools/mspec#{Platform.config['tests']['mspec_exec_suffix']}.exe"
+    mspec.assemblies = [ 'src/FluentNHibernate.Specs/bin/Release/FluentNHibernate.Specs.dll' ]
   end
 
   desc 'Run NUnit tests'
   nunit :nunit do |nunit|
     nunit.command = 'src/packages/NUnit.2.5.7.10213/Tools/nunit-console-x86.exe'
-    nunit.assemblies 'src/FluentNHibernate.Testing/bin/Release/FluentNHibernate.Testing.dll'
+    nunit.assemblies = [ 'src/FluentNHibernate.Testing/bin/Release/FluentNHibernate.Testing.dll' ]
+    nunit.parameters = [ "/framework:#{Platform.config['tests']['nunit_framework_runtime']}" ]
   end
 end
 
@@ -117,7 +136,28 @@ namespace :docs do
   desc 'Create API docs'
   docu :build do |d|
     d.command = 'tools/docu/docu.exe'
-    d.assemblies 'build/FluentNHibernate.dll'
+    d.assemblies = [ 'build/FluentNHibernate.dll' ]
+  end
+end
+
+namespace :git do
+  desc "Tags the current release"
+  task :tag, :assembly_info do |asm, args|
+      args.with_defaults(:assembly_info => Platform.config['assembly_info']['version'])
+
+      sh "git tag \"v#{args.version}\""
+  end
+
+  desc "Updates the version and tags the release"
+  task :prep_release, :assembly_info do |task, args|
+    if !args.version.nil?
+      task(:update_version).invoke(args.version)
+
+      sh "git add #{CONFIG} #{NUSPEC}"
+      sh "git commit -m \"Updated version to #{args.version}\""
+
+      task(:tag).invoke(args.version)
+    end
   end
 end
 
@@ -159,39 +199,62 @@ namespace :package do
     zip.output_path = 'dist'
   end
 
-  nuspec do |nu|
-    nu.id = 'FluentNHibernate'
-    nu.version = get_version()
-    nu.authors = 'James Gregory and contributors'
-    nu.description = 'Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.'
-    nu.title = 'Fluent NHibernate'
-    nu.language = 'en-US'
-    nu.licenseUrl = 'http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt'
-    nu.projectUrl = 'http://fluentnhibernate.org'
-    nu.dependency 'NHibernate', '[3.3.1.4000,4.0)'
-    nu.working_directory = 'build'
-    nu.output_file = 'fluentnhibernate.nuspec'
-    nu.file 'FluentNHibernate.dll', 'lib'
-    nu.file 'FluentNHibernate.xml', 'lib'
-    nu.tags = 'orm dal nhibernate conventions'
-  end
-
-  nugetpack do |nu|
+  task :nuspec do |nu|
+      config = Platform.config['nuspec']
+
+      puts "Updating #{NUSPEC}"
+      update_xml NUSPEC do |xml|
+          xml.root.elements["metadata/id"].text = config['id']
+          xml.root.elements["metadata/title"].text = config['title']
+          xml.root.elements["metadata/version"].text = config['version']
+          
+          xml.root.elements["metadata/dependencies/dependency[@id='NHibernate']"].attributes['version'] = config['nhibernate_version_interval']
+    
+          xml.root.elements["metadata/authors"].text = "James Gregory and contributors"
+          xml.root.elements["metadata/owners"].text = "jagregory, chester89"
+          xml.root.elements["metadata/language"].text = "en-US"
+          xml.root.elements["metadata/description"].text = "Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate."
+          xml.root.elements["metadata/licenseUrl"].text = "http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt"
+          xml.root.elements["metadata/projectUrl"].text = "http://fluentnhibernate.org"
+          xml.root.elements["metadata/tags"].text = "orm dal nhibernate conventions"
+
+          xml.root.elements["files/file[contains(@src, 'bin\\Release\\FluentNHibernate.*')]"].attributes['target'] = "lib\\#{config['binaries_folder']}"
+      end  
+  end
+  
+  nugetpack :nupack do |nu|
     nu.command = 'tools/nuget/NuGet.exe'
-    nu.nuspec = 'build/fluentnhibernate.nuspec'
-    nu.base_folder = 'build'
+    nu.nuspec = NUSPEC
+    nu.base_folder = 'Release'
     nu.output = 'dist'
   end
 
   desc 'Create nuget spec and package'
-  task :nuget => [:nuspec, :nugetpack]
+  task :nuget => [:nuspec, :nupack]
 
   desc 'Package everything (src, bin, docs, nuget)'
   task :all => [:source, :binaries, :docs, :nuget]
 end
 
+def update_xml(xml_path)
+    #Open up the xml file
+    xml_file = File.new(xml_path)
+    xml = REXML::Document.new xml_file
+ 
+    #Allow caller to make the changes
+    yield xml
+ 
+    xml_file.close
+         
+    #Save the changes
+    xml_file = File.open(xml_path, "w")
+    formatter = REXML::Formatters::Default.new(5)
+    formatter.write(xml, xml_file)
+    xml_file.close 
+end
+
 task :sln do
   Thread.new do
-    system "devenv src/FluentNHibernate.sln"
+    system "devenv #{SLN}"
   end
-end
+end