Permalink
Browse files

Merge pull request #885 from grumpydev/Prerelease

Prerelease
  • Loading branch information...
grumpydev committed Jan 3, 2013
2 parents 6b2f1b1 + fc8c4a3 commit 2df1c00b80c2dd73934e374d005bcac826681b37
Showing with 3 additions and 1 deletion.
  1. +2 −1 rakefile.rb
  2. +1 −0 src/SharedAssemblyInfo.cs
View
@@ -209,7 +209,7 @@ def get_assembly_version(file)
File.open(file, 'r') do |file|
file.each_line do |line|
- result = /\[assembly: AssemblyVersion\(\"(.*?)\"\)\]/.match(line)
+ result = /\[assembly: AssemblyInformationalVersion\(\"(.*?)\"\)\]/.match(line)
return result[1] if !result.nil?
end
@@ -220,6 +220,7 @@ def get_assembly_version(file)
$nancy_version = get_assembly_version SHARED_ASSEMBLY_INFO
puts "Version: #{$nancy_version}"
+
#TODO:
#-----
# 8. Git info into shared assemby info (see fubumvc sample, also psake sample in mefcontrib)
@@ -6,6 +6,7 @@
[assembly: AssemblyProduct("Nancy")]
[assembly: AssemblyCopyright("Copyright (C) Andreas Hakansson, Steven Robbins and contributors")]
[assembly: AssemblyVersion("0.14.1")]
+[assembly: AssemblyInformationalVersion("0.14.1")]

0 comments on commit 2df1c00

Please sign in to comment.