Skip to content

Loading…

Prerelease #885

Merged
merged 2 commits into from

1 participant

@grumpydev
Custodians of the Super-Duper-Happy-Path member

Minor update to the build script to allow building of pre-release versions (main repo only)

@grumpydev grumpydev merged commit 2df1c00 into NancyFx:master
@grumpydev grumpydev deleted the grumpydev:Prerelease branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 3, 2013
  1. @grumpydev
  2. @grumpydev

    Fixed stupid bug :)

    grumpydev committed
Showing with 3 additions and 1 deletion.
  1. +2 −1 rakefile.rb
  2. +1 −0 src/SharedAssemblyInfo.cs
View
3 rakefile.rb
@@ -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)
View
1 src/SharedAssemblyInfo.cs
@@ -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")]
Something went wrong with that request. Please try again.