improvements from 4.0 branch

Author: chester89

Gemfile.lock

@@ -7,7 +7,6 @@ PROPS = 'src/CommonAssemblyInfo.cs'
 SLN = 'src/FluentNHibernate.sln'
 CONFIG = 'config.json'
 NUSPEC = 'src/FluentNHibernate.nuspec'
-CLR_TOOLS_VERSION = "v4.0.30319"
 
 module Platform
 
@@ -33,16 +32,14 @@ module Platform
     JSON.parse(File.read(CONFIG))
   end
 
-  def self.update_config_version(arg)
-    current = self.config
-    current['assembly_info']['version'] = current['nuspec']['version'] = arg
-    File.write(CONFIG, JSON.pretty_generate(current.to_json))
-  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'] || Platform.config['default_version_number']
 end
@@ -60,18 +57,17 @@ namespace :ripple do
     args = "restore"
     sh "#{ripple} #{args}"
   end
+  task :run_ci_build => ['ripple:restore', 'build:all', 'docs:build', 'package:all' ]
 end
 
 namespace :source do
   desc 'Update assembly info with latest version number'
   assemblyinfo :update_version do |info|
     info.output_file = PROPS
-  
-    commit_hash = `git log -1 --format="%H%"`
 
     info.title = Platform.config['assembly_info']['title']
-    info.version = info.file_version = get_version
-    info.informational_version = Platform.config['version']
+    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)]
@@ -109,7 +105,7 @@ namespace :source do
   msbuild :msbuild, [:nhibernate_version] => :nhibernate_version do |msbuild, args|   
     msbuild.properties = {
       configuration: :Release,
-      DefineConstants: args[:nhibernate_version],
+      DefineConstants: nh_version_precompiler_switch,
       WarningLevel: 0
     }
     msbuild.targets [:Clean, :Build]
@@ -159,12 +155,23 @@ namespace :docs do
 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 do |task|
-    current_version = Platform.config['assembly_info']['version']
-    sh "git add -A"
-    sh "git commit -m \"Updated version to #{current_version}\""
-    sh "git tag \"v#{current_version}\""
+  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
 
@@ -258,7 +265,7 @@ namespace :package do
   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)

RakeFile

@@ -11,7 +11,6 @@
     <AssemblyName>FluentNHibernate.Specs</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <MapFileExtensions>true</MapFileExtensions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

buildsupport/ripple.rb

@@ -53,20 +53,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.mocks, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="pnunit.framework, Version=1.0.3865.21394, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.5.7.10213\lib\pnunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data.SQLite">
-      <HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.DLL</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Data" />