Skip to content

Commit 657a70f

Browse files
committed
ignore Gemfile.lock
1 parent 851df5d commit 657a70f

File tree

3 files changed

+25
-43
lines changed

3 files changed

+25
-43
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ _ReSharper*
1616
*.ncrunchproject
1717
*.swp
1818
TestResult.xml
19+
Gemfile.lock
1920

2021
src/packages
2122
bin

Gemfile.lock

Lines changed: 0 additions & 19 deletions
This file was deleted.

RakeFile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ namespace :source do
6060
assemblyinfo :update_version do |info|
6161
info.output_file = 'src/CommonAssemblyInfo.cs'
6262

63-
commit_hash = `git log -1 --format="%H%"`
63+
commit_hash = `git log -1 --format="%H%"`
6464

6565
info.version = info.file_version = get_version
6666
info.company_name = 'http://fluentnhibernate.org'
6767
info.product_name = 'FluentNHibernate'
68-
info.description = commit_hash[0..(commit_hash.length - 3)]
68+
info.description = commit_hash[0..(commit_hash.length - 3)]
6969
info.copyright = "Copyright 2008-#{Time.new.year} James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved."
7070
info.namespaces = ['System.Security']
7171

@@ -77,22 +77,22 @@ namespace :source do
7777
end
7878

7979
desc 'Compile the source'
80-
msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msb,args|
80+
msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msbuild, args|
8181
args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
8282

8383
nh_version_precompiler_switch = 'NH' + args.nhibernate_version.gsub('.', '')
8484

8585
puts 'Precompiler switch: ' + nh_version_precompiler_switch
8686

87-
msb.properties = {
87+
msbuild.properties = {
8888
configuration: :Release,
8989
DefineConstants: nh_version_precompiler_switch,
9090
WarningLevel: 0
9191
}
92-
msb.targets [:Clean, :Build]
93-
msb.solution = SLN_PATH
94-
msb.verbosity = :minimal
95-
msb.parameters = ["/p:TargetFrameworkVersion=v4.0"]
92+
msbuild.targets [:Clean, :Build]
93+
msbuild.solution = SLN_PATH
94+
msbuild.verbosity = :minimal
95+
msbuild.parameters = ["/p:TargetFrameworkVersion=v4.0"]
9696
end
9797
end
9898

@@ -175,22 +175,22 @@ namespace :package do
175175

176176
task :nuspec do |nu|
177177
puts "Updating #{NUSPEC_PATH}"
178-
update_xml NUSPEC_PATH do |xml|
179-
# Override the version number in the nuspec file with the one from this rake file (set above)
180-
xml.root.elements["metadata/version"].text = get_version
181-
182-
xml.root.elements["metadata/dependencies/dependency[@id='NHibernate']"].attributes['version'] = '4.0'
183-
184-
xml.root.elements["metadata/authors"].text = "James Gregory and contributors"
185-
xml.root.elements["metadata/owners"].text = "jagregory, chester89"
186-
xml.root.elements["metadata/language"].text = "en-US"
187-
xml.root.elements["metadata/description"].text = "Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate."
188-
xml.root.elements["metadata/licenseUrl"].text = "http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt"
189-
xml.root.elements["metadata/projectUrl"].text = "http://fluentnhibernate.org"
190-
xml.root.elements["metadata/tags"].text = "orm dal nhibernate conventions"
191-
192-
xml.root.elements["files/file[contains(@src, 'bin\\Release\\FluentNHibernate.*')]"].attributes['target'] = 'lib\net40'
193-
end
178+
update_xml NUSPEC_PATH do |xml|
179+
# Override the version number in the nuspec file with the one from this rake file (set above)
180+
xml.root.elements["metadata/version"].text = get_version
181+
182+
xml.root.elements["metadata/dependencies/dependency[@id='NHibernate']"].attributes['version'] = '4.0'
183+
184+
xml.root.elements["metadata/authors"].text = "James Gregory and contributors"
185+
xml.root.elements["metadata/owners"].text = "jagregory, chester89"
186+
xml.root.elements["metadata/language"].text = "en-US"
187+
xml.root.elements["metadata/description"].text = "Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate."
188+
xml.root.elements["metadata/licenseUrl"].text = "http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt"
189+
xml.root.elements["metadata/projectUrl"].text = "http://fluentnhibernate.org"
190+
xml.root.elements["metadata/tags"].text = "orm dal nhibernate conventions"
191+
192+
xml.root.elements["files/file[contains(@src, 'bin\\Release\\FluentNHibernate.*')]"].attributes['target'] = 'lib\net40'
193+
end
194194
end
195195

196196
nugetpack :nupack do |nu|

0 commit comments

Comments
 (0)